diff --git a/package.json b/package.json
index 80eb50f30..be972b538 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "start": "vue-cli-service serve --open",
-    "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
+    "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve --open",
     "build": "vue-cli-service build --mode production",
     "test": "vue-cli-service build --mode staging",
     "local": "vue-cli-service build --mode",
diff --git a/src/App.vue b/src/App.vue
index 6dd38ea7a..1bc2274ca 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,8 @@
 <template>
   <div id="app">
     <router-view />
-    <deomon-topic ref="deomonTopic" />
+    <deomon-list ref="deomonList" @enterQcode="qcodeEntry" />
+    <qcode ref="qcode" />
     <div v-show="loading" class="AppAll">
       <img v-if="project === 'login' || project === 'design'" :src="jlFavicon" class="CompanyIcon">
       <img :src="loadingImg" style="width: 100%; height: 100%;">
@@ -23,17 +24,19 @@
 import { getToken, getUserIdKey } from '@/utils/auth';
 import { getSessionStorage } from '@/utils/auth';
 import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
-import DeomonTopic from '@/views/demonstration/deomonTopic';
 import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import LoadingImg from '@/assets/loading.gif';
 import AppLoading from '@/assets/appLoading.png';
 import { openIndexedDB } from '@/utils/indexedDb';
 import Favicon from '@/assets/icon/favicon.png';
+import DeomonList from '@/views/demonstration/deomonList/index';
+import Qcode from '@/layout/components/Qcode.vue';
 
 export default {
     name: 'App',
     components: {
-        DeomonTopic
+        DeomonList,
+        Qcode
     },
     mixins: [
         WindowResizeHandler
@@ -48,16 +51,6 @@ export default {
         };
     },
     watch: {
-        '$store.state.socket.simulationInvite': function (val) {
-            if (val.creator) {
-                this.subscribeMessage(val);
-            }
-        },
-        '$store.state.socket.roomInvite': function (val) {
-            if (val.creator) {
-                this.subscribeMessage(val);
-            }
-        },
         '$store.state.socket.beLogoutCount': async function(val) {
             if (this.$store.state.socket.loggedOutMsg.token === getToken()) {
                 this.$store.dispatch('disconnect').then(()=>{
@@ -78,6 +71,11 @@ export default {
         },
         '$store.state.app.animationsCloseCount': function(val) {
             this.loading = false;
+        },
+        '$route': function(val) {
+            if (val.path == '/display/demon' && val.query.client == 'diagramEdit') { // 运行图编制
+                this.loading = false;
+            }
         }
     },
     created() {
@@ -98,7 +96,7 @@ export default {
             if (this.$route.path.includes('trainingDesign') || this.$route.path.includes('trainingPreview')) {
                 if (e.key == getUserIdKey('nextNew')) {
                     const operate = JSON.parse(e.newValue);
-                    this.$store.dispatch('training/nextNew', operate);
+                    this.$store.dispatch('trainingNew/next', operate);
                 }
             }
 
@@ -111,6 +109,12 @@ export default {
         this.$store.dispatch('subscribe_un', {});
     },
     methods: {
+        quickEntry() {
+            this.$refs.deomonList.doShow();
+        },
+        qcodeEntry() {
+            this.$refs.qcode.doShow();
+        },
         resizeHandler() {
             this.$store.dispatch('app/resize', { width: this._clientWidth, height: this._clientHeight });
         },
@@ -118,15 +122,6 @@ export default {
             window.document.oncontextmenu = function () {
                 return false;
             };
-        },
-        subscribeMessage(res) {
-            if (this.$refs.deomonTopic && !window.location.href.includes('trainroom')) {
-                if (!(getSessionStorage('project').includes('design'))) {
-                    this.$refs.deomonTopic.doShow(res);
-                }
-                this.$store.dispatch('socket/setSimulationInvite');
-                this.$store.dispatch('socket/setRoomInvite');
-            }
         }
     }
 };
diff --git a/src/api/authorityTransfer.js b/src/api/authorityTransfer.js
new file mode 100644
index 000000000..5972ccd7f
--- /dev/null
+++ b/src/api/authorityTransfer.js
@@ -0,0 +1,53 @@
+
+import request from '@/utils/request';
+
+/** 创建权限分发*/
+export function createDistribute(data) {
+    return request({
+        url: `/api/v3/permission/distribute/create`,
+        method: 'post',
+        data
+    });
+}
+
+/** 分页获取权限分发列表*/
+export function getDistributeList(data) {
+    return request({
+        url: `/api/v3/permission/distribute/paging`,
+        method: 'post',
+        data
+    });
+}
+
+// /** 设置权限分发立即失效*/
+// export function setDistributeInvalidate(pdId) {
+//     return request({
+//         url: `/api/v2/permission/distribute/${pdId}/invalidate`,
+//         method: 'put'
+//     });
+// }
+
+/** 获取权限分发明细*/
+export function getDistributeDetail(disId) {
+    return request({
+        url: `/api/v3/permission/distribute/list/distribute/${disId}`,
+        method: 'get'
+    });
+}
+
+/** 从权限分发，直接分发给指定主体*/
+export function setDistributeToSubject(pdId, subjectType, subjectId) {
+    return request({
+        url: `/api/v3/permission/distribute/${pdId}/to/${subjectType}/${subjectId}`,
+        method: 'post'
+    });
+}
+
+/** 生成分发二维码*/
+export function getDistributeQrCode(pdId) {
+    return request({
+        url: `/api/v3/permission/distribute/${pdId}/qrCode`,
+        method: 'get'
+    });
+}
+
diff --git a/src/api/disStation.js b/src/api/disStation.js
index 06e66e04a..8f6602d2b 100644
--- a/src/api/disStation.js
+++ b/src/api/disStation.js
@@ -24,10 +24,17 @@ export function deleteDisStation(mapId, code) {
     });
 }
 // 获取调度台逻辑数据
-export function getDisStationList(mapId, data) {
+export function getDisStationListPaged(mapId, data) {
     return request({
         url: `/api/draftMap/${mapId}/disStation/page`,
         method: 'post',
         data
     });
 }
+/** 查询调度台列表 */
+export function getDisStationList(mapId) {
+    return request({
+        url: `api/draftMap/${mapId}/disStation/list`,
+        method: 'get'
+    });
+}
diff --git a/src/api/functionManage.js b/src/api/functionManage.js
new file mode 100644
index 000000000..d4dd185c7
--- /dev/null
+++ b/src/api/functionManage.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request';
+
+// 分页查询权限功能的基本信息
+export function getAbilityPage(data) {
+    return request({
+        url: `/api/v2/permission/system/ability/page`,
+        method: 'post',
+        data
+    });
+}
+
+// 自动生成
+export function autoCreate() {
+    return request({
+        url: `/api/v2/permission/system/ability/autoCreate`,
+        method: 'get'
+    });
+}
+
+// 获取所有功能
+export function getAllAbility() {
+    return request({
+        url: `/api/v2/permission/system/ability/list`,
+        method: 'get'
+    });
+}
diff --git a/src/api/jlmap3d/assets3d.js b/src/api/jlmap3d/assets3d.js
index 96d40a2cf..f1bdeed3e 100644
--- a/src/api/jlmap3d/assets3d.js
+++ b/src/api/jlmap3d/assets3d.js
@@ -4,7 +4,9 @@ const publicPath = process.env.VUE_APP_PRO == 'local' ? '' : '/cbtc';
 
 export const JL3D_LOCAL_STATIC = publicPath+"/static";
 const BASE_UPLOAD_API = store.state.user.uploadUrl;
-export const BASE_ASSET_API = store.state.user.resourcesUrl;
+// export const BASE_ASSET_API = store.state.user.resourcesUrl;
+export const BASE_ASSET_API = store.state.user.ossUrl;
+
 // console.log(JL3D_LOCAL_STATIC);
 // console.log(BASE_UPLOAD_API);
 // console.log(BASE_ASSET_API);
diff --git a/src/api/jlmap3d/load3ddata.js b/src/api/jlmap3d/load3ddata.js
index 2c753adb1..ff67d4df9 100644
--- a/src/api/jlmap3d/load3ddata.js
+++ b/src/api/jlmap3d/load3ddata.js
@@ -2,85 +2,85 @@ import request from '@/utils/request';
 
 /** 根据皮肤获取地图版本信息*/
 export function getPublishMapVersion(id) {
-	return request({
-		url: `/api/map/${id}/version`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/map/${id}/version`,
+        method: 'get'
+    });
 }
 
 /** 根据皮肤获取发布地图详细内容*/
 export function getPublishMapDetail(id) {
-	const datad = request({
-		url: `/api/map/${id}/graphData`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/map/${id}/graphData`,
+        method: 'get'
+    });
+    return datad.then();
 }
 
 /** 根据地图id获取地图信息*/
 export function getPublishMapInfo(mapId) {
-	return request({
-		url: `/api/map/${mapId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/map/${mapId}`,
+        method: 'get'
+    });
 }
 
 /** 获取草稿地图详细内容*/
 export function getMapDetail(id) {
-	return request({
-		url: `/api/mapBuild/${id}/mapDataDetail`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/mapBuild/${id}/mapDataDetail`,
+        method: 'get'
+    });
 }
 
 /** 创建地图3d数据*/
 export function set3dMapData(data) {
-	return request({
-		url: `/api/mapBuild/3dMapData`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/mapBuild/3dMapData`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 通过地图id获取地图3d数据*/
 export function get3dMapData(mapId) {
-	return request({
-		url: `/api/mapBuild/3dMapData/${mapId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/mapBuild/3dMapData/${mapId}`,
+        method: 'get'
+    });
 }
 
 /** 更新地图3d数据*/
 export function update3dMapData(data) {
-	return request({
-		url: `/api/mapBuild/3dMapData/${data.id}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/mapBuild/3dMapData/${data.id}`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 获取模型资源列表*/
 export function loadmap3dModel() {
-	return request({
-		url: `/api/map3dModel/all`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/map3dModel/all`,
+        method: 'get'
+    });
 }
 export function getPublish3dMapDetail(id) {
-	const datad = request({
-		url: `/api/map/${id}/3dMapData`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/map/${id}/3dMapData`,
+        method: 'get'
+    });
+    return datad.then();
 }
 
 /** 录制托管*/
-export function tuoguan3ddrive(group,data) {
-	return request({
-		url: `/api/scriptSimulation/${group}/trust`,
-		method: 'put',
-		data: data
-	});
+export function tuoguan3ddrive(group, data) {
+    return request({
+        url: `/api/scriptSimulation/${group}/trust`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 三维设备故障钩锁操作*/
@@ -101,33 +101,33 @@ export function saveStationManagerData(data) {
     });
 }
 // 更新数据
-export function updateStationManagerData(id,data) {
-	return request({
-		url: `/api/pfp/${id}`,
-		method: 'put',
-		data: data
-	});
+export function updateStationManagerData(id, data) {
+    return request({
+        url: `/api/pfp/${id}`,
+        method: 'put',
+        data: data
+    });
 }
 // 查询数据列表
 export function getStationManagerDataList() {
-	const datad = request({
-		url: `/api/pfp/list`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/pfp/list`,
+        method: 'get'
+    });
+    return datad.then();
 }
 // 查询数据
 export function getStationManagerData(id) {
-	const datad = request({
-		url: `/api/pfp/${id}`,
-		method: 'get'
-	});
-	return datad.then();
+    const datad = request({
+        url: `/api/pfp/${id}`,
+        method: 'get'
+    });
+    return datad.then();
 }
 // 删除数据
 export function deleteStationManagerData(id) {
-	return request({
-		url: `/api/pfp/${id}`,
-		method: 'delete',
-	});
+    return request({
+        url: `/api/pfp/${id}`,
+        method: 'delete'
+    });
 }
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 43b77599c..8fc96dde9 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -182,7 +182,7 @@ export function localImportMap(data) {
         url: '/api/map/local/import',
         method: 'post',
         data: data
-    });
+    });  
 }
 
 /** 根据group获取排序的车站列表（包含车辆段/停车场） */
@@ -285,3 +285,25 @@ export function allSimulationCheck() {
         method: 'get'
     });
 }
+/** 根据地图查询仿真成员 */
+export function querySimulationMemberByMapId(id) {
+    return request({
+        url: `/api/map/${id}/memberMap`,
+        method: 'get'
+    });
+}
+
+/** 根据地图查询车站(含车辆段停车场) */
+export function querySimulationStationsByMapId(id) {
+    return request({
+        url: `/api/map/${id}/stations`,
+        method: 'get'
+    });
+}
+/** 根据用户查询地图列表 */
+export function queryMapListByUser() {
+    return request({
+        url: `/api/map/list/online/ofUser`,
+        method: 'get'
+    });
+}
diff --git a/src/api/jmap/training.js b/src/api/jmap/training.js
index a721b0a3d..8d2c8339d 100644
--- a/src/api/jmap/training.js
+++ b/src/api/jmap/training.js
@@ -190,18 +190,28 @@ export function publishTrainingDelete(data) {
         data
     });
 }
-/** 根据mapId查所有的已发布单操实训的基础信息 */
-export function getPublishSingleList(mapId) {
+/** 查全部组织已发布实训的基础信息 */
+export function getAllPublishTrainingList(params) {
     return request({
-        url: `/api/v2/training/published/${mapId}/singles`,
-        method: 'get'
+        url: `/api/v2/training/published/list`,
+        method: 'get',
+        params
     });
 }
-/** 根据mapId查所有的已发布场景实训的基础信息 */
-export function getPublishScenesList(mapId) {
+/** 查询组织已发布实训的基础信息 */
+export function getPublishTrainingListInOrg(data) {
     return request({
-        url: `/api/v2/training/published/${mapId}/scenes`,
-        method: 'get'
+        url: `/api/v2/training/published/infos`,
+        method: 'post',
+        data
+    });
+}
+/** 查询组织已发布的实训列表 */
+export function getManageTrainingListInOrg(data) {
+    return request({
+        url: `/api/v2/training/published/manage/infos`,
+        method: 'post',
+        data
     });
 }
 /** 根据实训id查该已发布实训的所有信息 */
@@ -234,10 +244,11 @@ export function startTraining(group, params) {
     });
 }
 /** 结束实训 */
-export function endTraining(group) {
+export function endTraining(group, data) {
     return request({
         url: `/api/training2Simulation/${group}/finish`,
-        method: 'put'
+        method: 'put',
+        data
     });
 }
 /** 实训完成步骤 */
diff --git a/src/api/login.js b/src/api/login.js
index ee13e3772..ce4f7564e 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -93,3 +93,23 @@ export function getLoginInfo(token) {
         }
     });
 }
+
+/**
+ * 获取用户所属组织列表
+ */
+export function getOrgList() {
+    return request({
+        url: '/api/orgProject/list',
+        method: 'get'
+    })
+}
+
+/**
+ * 登入组织
+ */
+export function selectOrgnization(orgId) {
+    return request({
+        url: `/api/orgProject/signIn/${orgId}`,
+        method: 'put'
+    })
+}
diff --git a/src/api/management/exam.js b/src/api/management/exam.js
index aa15746f0..5691838ae 100644
--- a/src/api/management/exam.js
+++ b/src/api/management/exam.js
@@ -95,7 +95,7 @@ export function updateExamRule(data) {
     return request({
         url: `/api/exam/update/rules`,
         method: 'put',
-        data:data
+        data: data
     });
 }
 /** 检查并更新【规则数据异常】状态 */
@@ -106,9 +106,241 @@ export function checkAndUpdateAbnormal(mapId) {
     });
 }
 /** 重新生成考试规则 */
-export function regenerateRule (mapId) {
+export function regenerateRule(mapId) {
     return request({
         url: `/api/exam/regenerateRules/${mapId}`,
         method: 'put'
     });
 }
+
+/**
+ * ============================================================================
+ * ============================================================================
+ * ============================= 以下为新版试卷的接口 ============================
+ * ============================================================================
+ * ============================================================================
+ */
+
+/**
+ * LIST -
+ * 根据试卷蓝图名称简介分页查找某个组织的试卷蓝图
+ * @param {Object} data
+ * @param {Number} data.orgId 组织ID
+ * @param {String} data.name 试卷蓝图名称
+ * @param {String} data.profile 试卷蓝图简介
+ * @param {Number} data.findState 状态: (All(1)-所有,Editing(2)-正在编辑的,CanUse(3)-可以用于生成试卷的,Locked(4)-封存,Used(5)-已经被使用过)
+ * @param {Number} data.orderBy 排序依据: (1--创建时间 2--更新时间 3--名称；默认值为1)
+ */
+export function getPapaerListOfOrg({ orgId, ...data }) {
+    return request({
+        url: `/api/v2/paper/composition/find/page/for/${orgId}`,
+        method: 'POST',
+        data
+    });
+}
+
+export function getAllPapaerListOfOrg({ ...data }) {
+    // 全部组织
+    return request({
+        url: `/api/v2/paper/composition/manage/paging`,
+        method: 'POST',
+        data
+    });
+}
+
+/**
+ * 创建试卷蓝图
+ * @param {Object} data
+ * @param {Number} data.orgId 组织ID
+ * @param {String} data.name 试卷蓝图名称
+ * @param {String} data.profile 简介
+ * @param {String} data.startTime 启用起始时间
+ * @param {String} data.endTime 启用截止时间
+ * @param {Number} data.validDuration 考试时长
+ * @param {String} data.passScore 及格分
+ * @param {String} data.fullScore 满分
+ * @param {Object} data.ruleList 规则列表
+ * @param {Object} data.ruleList.id 规则id
+ * @param {Object} data.ruleList.pcId 试卷蓝图ID
+ * @param {Object} data.ruleList.type 试题类型
+ * @param {Object} data.ruleList.subtype 规则类型
+ * @param {Object} data.ruleList.tags 标签
+ * @param {Object} data.ruleList.amount 数量
+ * @param {Object} data.ruleList.score 每题分值
+ */
+export function createPaper(data) {
+    return request({
+        url: `/api/v2/paper/composition/${data.orgId}`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 修改试卷蓝图基本信息
+ * @param {Object} data
+ * @param {Number} data.id 试卷蓝图ID
+ * @param {Number} data.orgId 组织ID
+ * @param {String} data.name 试卷蓝图名称
+ * @param {String} data.profile 简介
+ * @param {String} data.startTime 启用起始时间
+ * @param {String} data.endTime 启用截止时间
+ * @param {Number} data.validDuration 考试时长
+ * @param {String} data.passScore 及格分
+ * @param {String} data.fullScore 满分
+ * @param {Object} data.ruleList 规则列表
+ * @param {Object} data.ruleList.id 规则id
+ * @param {Object} data.ruleList.pcId 试卷蓝图ID
+ * @param {Object} data.ruleList.type 试题类型
+ * @param {Object} data.ruleList.subtype 规则类型
+ * @param {Object} data.ruleList.tags 标签
+ * @param {Object} data.ruleList.amount 数量
+ * @param {Object} data.ruleList.score 每题分值
+ */
+export function editPaper(data) {
+    return request({
+        url: `/api/v2/paper/composition`,
+        method: 'PUT',
+        data
+    });
+}
+
+/** 获取试卷完整的蓝图，包括规则
+ * @param {Number} pcId 试卷蓝图ID
+ */
+export function getPaperDetail(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}`,
+        method: 'GET'
+    });
+}
+
+/** 查询组织下各类型题的数量
+ * @param {Object} data
+ * @param {Number} data.orgId
+ * @param {Number} data.subtype
+ * @param {Array<String>} data.tags
+ */
+export function getQuestionAmount(data) {
+    return request({
+        url: `/api/v2/paper/${data.orgId}/question/count`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 试卷蓝图封存
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function lockPaper(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}/lock`,
+        method: 'PUT'
+    });
+}
+
+/** 试卷蓝图
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function invalidPaper(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}/invalid`,
+        method: 'PUT'
+    });
+}
+
+/** 试卷蓝图删除
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function deletePaper(pcId) {
+    return request({
+        url: `/api/v2/paper/composition/${pcId}`,
+        method: 'DELETE'
+    });
+}
+
+/** 根据试卷蓝图生成用户的试卷
+ * @param {Number} pcId 试卷蓝图Id
+ */
+export function generateExam(pcId) {
+    return request({
+        url: `/api/v2/paper/${pcId}`,
+        method: 'POST'
+    });
+}
+
+/** 删除用户试卷 */
+export function deleteUserExam(param) {
+    return request({
+        url: `/api/v2/paper/user/${puId}`,
+        method: 'method'
+    });
+}
+
+/** 获取用户试卷完整信息
+ * @param {Number} puId 用户试卷Id
+ */
+export function getUserExamInfo(puId) {
+    return request({
+        url: `/api/v2/paper/user/${puId}`,
+        method: 'GET'
+    });
+}
+
+/** 加载用户试卷试题 */
+export function loadQuestion({ type, questionId, puId }) {
+    return request({
+        url: `/api/v2/paper/user/question/${type}/${questionId}/${puId}`,
+        method: 'GET'
+    });
+}
+
+/** 提交答案
+ * @param {Object} data
+ * @param {Number} data.puId 用户试卷id
+ * @param {Number} data.pqId 用户试卷试题id
+ * @param {Number} data.type 试题类型
+ * @param {Number} data.subType 试题子类型
+ * @param {Number} data.answer 答案(理论题)
+ * @param {Boolean} data.trainingSuccess 是否完成(实训题)
+ */
+export function submitAnswer(data) {
+    return request({
+        url: `/api/v2/paper/user/question/answer`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 交卷
+ * @param {Number} puId 用户试卷id
+ */
+export function submitPaper(puId) {
+    return request({
+        url: `/api/v2/paper/user/${puId}/submit`,
+        method: 'POST'
+    });
+}
+
+/**
+ * 根据mapId查询蓝图的基本信息
+ */
+export function queryPaperList(data) {
+    return request({
+        url: `/api/v2/paper/composition/find/list`,
+        method: 'POST',
+        data
+    });
+}
+/**
+*	获取标签分类
+ * @param {Number} ordId 组织id
+ * @param {Number} groupType 1-理论题 2-实训题
+ * @param {Number} subType 1-选择题 2-多选题 3-判断题 4-单操 5-场景
+*/
+export function queryTagList(data) {
+    return request({
+        url: `/api/v2/paper/question/label`,
+        method: 'POST',
+        data
+    });
+}
diff --git a/src/api/management/fileManage.js b/src/api/management/fileManage.js
new file mode 100644
index 000000000..9e6ec1fa2
--- /dev/null
+++ b/src/api/management/fileManage.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request.js'
+
+/** 获取文件列表 */
+export function getFileList(params) {
+	return request({
+		url: `/api/minio/file/list`,
+		method: 'get',
+		params,
+	})
+}
+
+/** 检查资源是否已存在 */
+export function checkIsExist(params) {
+	return request({
+		url: `/api/minio/checkIsExist`,
+		method: 'get',
+		params,
+	})
+}
+
+/** 保存文件 */
+export function saveFileInfo(data) {
+	return request({
+		url: `/api/minio/file/save`,
+		method: 'post',
+		data,
+	})
+}
+
+/** 更新文件标题 */
+export function updateFileTitle(data) {
+	return request({
+		url: `/api/minio/file/update`,
+		method: 'put',
+		data,
+	})
+}
+
+/** 删除文件 */
+export function deleteFile(id) {
+	return request({
+		url: `api/minio/file/del/${id}`,
+		method: 'delete',
+	})
+}
diff --git a/src/api/management/user.js b/src/api/management/user.js
index 6de390470..ce58557c0 100644
--- a/src/api/management/user.js
+++ b/src/api/management/user.js
@@ -17,6 +17,32 @@ export function getUserList(params) {
     });
 }
 
+/** 查询所有用户列表*/
+export function getManageUserList(params) {
+    return request({
+        url: `/api/manage/user/list`,
+        method: 'get',
+        params: params
+    });
+}
+
+/** 根据用户查询用户角色列表*/
+export function getUserRolesList(uid) {
+    return request({
+        url: `/api/manage/${uid}/roles`,
+        method: 'get'
+    });
+}
+
+/** 绑定用户角色*/
+export function getBindUserRoles(data) {
+    return request({
+        url: `/api/manage/bind/org`,
+        method: 'post',
+        data
+    });
+}
+
 /** 模糊查询用户 昵称、名称、手机号*/
 export function getDimUserList(params) {
     return request({
@@ -269,3 +295,31 @@ export function sendEmailVfcode(params) {
         params
     });
 }
+
+/** 新注册接口 */
+export function registerUserNew(data) {
+    return request({
+        url: `/api/userinfo/register2`,
+        method: 'post',
+        data
+    });
+}
+
+// 手机号是否已经注册
+export function isExistMobile(params) {
+    return request({
+        url: `/api/userinfo/isExist/mobile`,
+        method: 'get',
+        params
+    });
+}
+
+// 手机号是否已经注册
+export function isExistEmail(params) {
+    return request({
+        url: `/api/userinfo/isExist/email`,
+        method: 'get',
+        params
+    });
+}
+
diff --git a/src/api/management/userexam.js b/src/api/management/userexam.js
index a72980272..bdd2a4025 100644
--- a/src/api/management/userexam.js
+++ b/src/api/management/userexam.js
@@ -1,19 +1,19 @@
-import request from '@/utils/request';
+import request from '@/utils/request'
 
 /** 获取用户试题列表*/
 export function generateExamList(examId) {
     return request({
         url: `/api/userExam/${examId}/generate`,
-        method: 'get'
-    });
+        method: 'get',
+    })
 }
 
 /** 刷新考题列表*/
 export function refreshExamList(userExamId) {
     return request({
         url: `/api/userExam/${userExamId}`,
-        method: 'get'
-    });
+        method: 'get',
+    })
 }
 
 /** 提交一个考题*/
@@ -21,17 +21,16 @@ export function finishOneExamQuestion(data) {
     return request({
         url: '/api/userExam/finish',
         method: 'put',
-        data: data
-    });
+        data: data,
+    })
 }
 
 /** 考试完成提交*/
 export function submitExam(examId) {
     return request({
         url: `/api/userExam/${examId}/submit`,
-        method: 'put'
-    });
-
+        method: 'put',
+    })
 }
 
 /** 获取用户考试列表*/
@@ -39,40 +38,41 @@ export function getPublishExam(data) {
     return request({
         url: `/api/userExam/list`,
         method: 'get',
-        params: data
-    });
+        params: data,
+    })
 }
 
 /** 删除用户考试*/
 export function delPublishExam(id) {
     return request({
         url: `/api/userExam/${id}`,
-        method: 'delete'
-    });
+        method: 'delete',
+    })
 }
 
 export function updateExam(data) {
     return request({
         url: `/api/userExam/${data.id}`,
         method: 'put',
-        data: data
-    });
+        data: data,
+    })
 }
 /** 获取班级考试成绩列表 */
-export function getClassGradeList(examId, params) {
+export function getClassGradeList(params) {
     return request({
-        url: `/api/userExam/paged/orgUser/${params.orgId}/${examId}`,
+        url: `/api/v2/paper/user/page`,
         method: 'get',
-        params
-    });
+        params,
+    })
 }
 
 /** 查询组织学生单次考试成绩曲线 */
 export function getClassGradeStatistic(orgId, examId) {
     return request({
-        url: `/api/userExam/curve/${orgId}/${examId}`,
-        method: 'get'
-    });
+        url: `/api/v2/paper/user/curve`,
+        params: { pcId: examId, orgId },
+        method: 'get',
+    })
 }
 
 /** 查询组织学生单次考试成绩曲线 */
@@ -80,29 +80,29 @@ export function getStuGradeStatistic(userId) {
     return request({
         url: `/api/userExam/curve/${userId}`,
         method: 'get',
-    });
+    })
 }
 
 /** 个人仿真数据统计 */
 export function getSimulationTimeChart(mapId) {
     return request({
         url: `/api/stats/simulation/${mapId}/stats`,
-        method: 'get'
-    });
+        method: 'get',
+    })
 }
 
 // 课程内实训数据统计
 export function getLessonTimeChart(id) {
-	return request({
-		url: `/api/stats/lesson/${id}/stats`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/stats/lesson/${id}/stats`,
+        method: 'get',
+    })
 }
 
 // 课程列表
 export function getLessonList() {
     return request({
         url: '/api/stats/lesson/list',
-        method: 'get'
-    });
+        method: 'get',
+    })
 }
diff --git a/src/api/permissionManage.js b/src/api/permissionManage.js
new file mode 100644
index 000000000..035366c4a
--- /dev/null
+++ b/src/api/permissionManage.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+
+// 创建权限
+export function createPermission(data) {
+    return request({
+        url: `/api/v2/permission/create`,
+        method: 'post',
+        data
+    });
+}
+
+// 权限修改
+export function updatePermission(data) {
+    return request({
+        url: `/api/v2/permission/update`,
+        method: 'put',
+        data
+    });
+}
+
+// 分页获取权限
+export function getPermissionPage(data) {
+    return request({
+        url: `/api/v2/permission/find/page`,
+        method: 'post',
+        data
+    });
+}
diff --git a/src/api/project.js b/src/api/project.js
index ff15b0c58..3b9fc32cb 100644
--- a/src/api/project.js
+++ b/src/api/project.js
@@ -61,10 +61,10 @@ export function setLwConfig(id, data) {
         data: data
     });
 }
-/** 查询所有的某类型设备 */
-export function getDevicesByType(type) {
+/** 查询某个项目下的所有的某类型设备 */
+export function getDevicesByType(project, type) {
     return request({
-        url: `/api/device/${type}/all`,
+        url: `/api/device/${project}/${type}/all`,
         method: 'get'
     });
 }
diff --git a/src/api/projectConfig.js b/src/api/projectConfig.js
new file mode 100644
index 000000000..edf17857f
--- /dev/null
+++ b/src/api/projectConfig.js
@@ -0,0 +1,187 @@
+import request from '@/utils/request';
+
+/** 后端项目配置分页 */
+export function getBackProjectConfigByPage(params) {
+    return request({
+        url: `/api/project/page`,
+        method: 'get',
+        params
+    });
+}
+
+/** 全量后端项目配置 */
+export function getAllBackProjectConfig() {
+    return request({
+        url: `/api/project/all`,
+        method: 'get'
+    });
+}
+
+/** 主键获取后端项目配置 */
+export function getBackProjectConfigById(id) {
+    return request({
+        url: `/api/project/${id}`,
+        method: 'get'
+    });
+}
+
+/** 通过code获取后端项目配置 */
+export function getBackProjectConfigByCode(code) {
+    return request({
+        url: `/api/project/code/${code}`,
+        method: 'get'
+    });
+}
+
+/** 删除后端项目配置 */
+export function deleteBackProjectConfig(id) {
+    return request({
+        url: `/api/project/del/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 更新后端项目配置 */
+export function updateBackProjectConfig(data) {
+    return request({
+        url: `/api/project/update`,
+        method: 'put',
+        data
+    });
+}
+
+/** 保存后端项目配置 */
+export function saveBackProjectConfig(data) {
+    return request({
+        url: `/api/project/save`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 获取后端项目列表，关联时使用 */
+export function getBackProjectConfigList(id) {
+    return request({
+        url: `/api/project/simple`,
+        method: 'get'
+    });
+}
+
+/** 前端项目配置分页 */
+export function getFrontProjectConfigByPage(params) {
+    return request({
+        url: `/api/project/viewSetting/page`,
+        method: 'get',
+        params
+    });
+}
+
+/** 全量前端项目配置 */
+export function getAllFrontProjectConfig() {
+    return request({
+        url: `/api/project/viewSetting/all`,
+        method: 'get'
+    });
+}
+
+/** 获取前端项目配置 */
+export function getFrontProjectConfigById(id) {
+    return request({
+        url: `/api/project/viewSetting/${id}`,
+        method: 'get'
+    });
+}
+
+/** 删除前端项目配置 */
+export function deleteFrontProjectConfig(id) {
+    return request({
+        url: `/api/project/viewSetting/del/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 更新前端项目配置 */
+export function updateFrontProjectConfig(data) {
+    return request({
+        url: `/api/project/viewSetting/update`,
+        method: 'put',
+        data
+    });
+}
+
+/** 保存前端项目配置 */
+export function saveFrontProjectConfig(data) {
+    return request({
+        url: `/api/project/viewSetting/save`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 登录时根据前端标识获取配置 */
+export function getFrontProjectConfigByLogin(markKey) {
+    return request({
+        url: `/api/project/viewSetting/project/${markKey}`,
+        method: 'get'
+    });
+}
+
+/** 登录时获取全量前端配置 */
+export function getAllFrontProjectConfigByLogin(markKey) {
+    return request({
+        url: `/api/project/viewSetting/simple/all`,
+        method: 'get'
+    });
+}
+
+/** 检查项目code */
+export function checkBackProjectExist(params) {
+    return request({
+        url: `/api/project/check/code`,
+        method: 'get',
+        params
+    });
+}
+
+/** 检查项目markKey */
+export function checkFrontProjectExist(params) {
+    return request({
+        url: `/api/project/check/markKey`,
+        method: 'get',
+        params
+    });
+}
+//
+export function getUploadUrl(params) {
+    return request({
+        url: `/api/minio/preSignedUrl`,
+        method: 'get',
+        params
+    });
+}
+
+/** 设置默认组织 */
+export function setDefaultOrg(data) {
+    return request({
+        url: `/api/project/setDefaultOrg`,
+        method: 'put',
+        data
+    });
+}
+
+/** 创建默认组织 */
+export function createDefaultOrg(id, data) {
+    return request({
+        url: `/api/project/${id}/createDefaultOrg`,
+        method: 'POST',
+        data
+    });
+}
+
+/** 登录项目组织列表 */
+export function getOrgList(id) {
+    return request({
+        url: `/api/project/${id}/orgList`,
+        method: 'get'
+    });
+}
diff --git a/src/api/questionBank.js b/src/api/questionBank.js
index 90c860824..e9a73d248 100644
--- a/src/api/questionBank.js
+++ b/src/api/questionBank.js
@@ -1,18 +1,45 @@
 import request from '@/utils/request';
 
+// 查询理论试题(全部组织)
+export function listAllQuestionPage(params) {
+    return request({
+        url: `/api/question/paging`,
+        method: 'get',
+        params
+    });
+}
+
 // 分页查询理论试题
 export function listQuestionPage(params) {
     return request({
-        url: `/api/questionBank/questions/paging`,
+        // url: `/api/questionBank/questions/paging`,
+        url: `/api/question/org/paging`,
         method: 'get',
         params
     });
 }
 
+// 查询所有理论试题
+export function listQuestionAll() {
+    return request({
+        url: `/api/question/org`,
+        method: 'get'
+    });
+}
+
+// 标签列表
+export function getLabelList() {
+    return request({
+        url: `/api/question/org/label`,
+        method: 'get'
+    });
+}
+
 // 创建题目
 export function createQuestion(data) {
     return request({
-        url: `/api/questionBank/questions`,
+        // url: `/api/questionBank/questions`,
+        url: `/api/question/org`,
         method: 'post',
         data
     });
@@ -21,25 +48,55 @@ export function createQuestion(data) {
 // 删除题目
 export function deleteQuestion(questionId) {
     return request({
-        url: `/api/questionBank/questions/${questionId}`,
-        method: 'delete'
+        // url: `/api/questionBank/questions/${questionId}`,
+        url: `/api/question/org`,
+        method: 'delete',
+        data: [questionId]
     });
 }
 
 // 更新题目
 export function updateOption(data) {
     return request({
-        url: `/api/questionBank/questions/${data.id}`,
+        // url: `/api/questionBank/questions/${data.id}`,
+        url: `/api/question/org/${data.id}`,
         method: 'put',
         data
     });
 }
 
 // 获取题目信息
-export function getQuestionInfo(questionId) {
+export function getQuestionInfo(questionId, params) {
     return request({
-        url: `/api/questionBank/questions/${questionId}`,
-        method: 'get'
+        // url: `/api/questionBank/questions/${questionId}`,
+        url: `/api/question/org/${questionId}`,
+        method: 'get',
+        params
     });
 }
 
+// 题库批量导入
+export function importQuestion(data) {
+    return request({
+        url: `/api/question/org/import`,
+        method: 'post',
+        data
+    });
+}
+
+// 预览答题
+export function testAnswer(questionId, data) {
+    return request({
+        url: `/api/question/org/test/answer/${questionId}`,
+        method: 'post',
+        data
+    });
+}
+
+// 清空题库
+export function clearBank() {
+    return request({
+        url: `/api/question/org/clear`,
+        method: 'get'
+    });
+}
diff --git a/src/api/rtSimulation.js b/src/api/rtSimulation.js
index 519419e1a..fdce3607f 100644
--- a/src/api/rtSimulation.js
+++ b/src/api/rtSimulation.js
@@ -6,29 +6,15 @@ export function createSimulation(data) {
         method: 'post'
     });
 }
-/** 根据仿真group获取仿真基础信息 */
+/** 根据仿真group获取仿真基础信息 废弃 */
 export function getSimulationInfoByGroup(groupId) {
     return request({
         url: `/common/simulation/${groupId}`,
         method: 'get'
     });
 }
-/** 根据仿真group获取仿真地图数据 */
-export function getMapDataByGroup(groupId) {
-    return request({
-        url: `/rtSimulation/${groupId}/mapData`,
-        method: 'get'
-    });
-}
-/** 仿真发送指令 */
-export function sendSimulationCommand(group, memberId, type, data) {
-    return request({
-        url: `/common/simulation/${group}/member/${memberId}/operate/${type}`,
-        method: 'post',
-        data
-    });
-}
-/** 获取仿真成员列表 */
+
+/** 获取仿真成员列表 废弃 */
 export function getMemberListCommon(group, role) {
 
     if (!role) {
@@ -39,14 +25,14 @@ export function getMemberListCommon(group, role) {
         method: 'get'
     });
 }
-/** 获取仿真用户列表 */
+/** 获取仿真用户列表 废弃 */
 export function getUserListCommon(group) {
     return request({
         url: `/common/simulation/${group}/users`,
         method: 'get'
     });
 }
-/** 销毁仿真 */
+/** 销毁仿真 废弃 */
 export function destroySimulation(group) {
     return request({
         url: `/common/simulation/${group}/destroy`,
@@ -56,11 +42,11 @@ export function destroySimulation(group) {
 /** 初始化仿真 */
 export function initSimulation(group) {
     return request({
-        url: `/common/simulation/${group}/init`,
+        url: `/simulation/new/${group}/reset`,
         method: 'put'
     });
 }
-/** 设置故障 */
+/** 设置故障 废弃 */
 export function setSimulationFault(group, data) {
     return request({
         url: `/common/simulation/${group}/fault`,
@@ -68,7 +54,7 @@ export function setSimulationFault(group, data) {
         data
     });
 }
-/** 取消故障 */
+/** 取消故障 废弃 */
 export function cancelSimulationFault(group, deviceId, faultType) {
     return request({
         url: `/common/simulation/${group}/device/${deviceId}/fault/${faultType}`,
@@ -78,28 +64,28 @@ export function cancelSimulationFault(group, deviceId, faultType) {
 /** 仿真运行倍速 */
 export function timesSpeedPlayback(group, speed) {
     return request({
-        url: `/common/simulation/${group}/updateSpeed/${speed}`,
+        url: `/simulation/${group}/updateSpeed/${speed}`,
         method: 'put'
     });
 }
 /** 仿真暂停 */
 export function simulationPause(group) {
     return request({
-        url: `/common/simulation/${group}/pause`,
+        url: `/simulation/${group}/pause`,
         method: 'put'
     });
 }
 /** 仿真开始 */
 export function simulationStart(group) {
     return request({
-        url: `/common/simulation/${group}/start`,
+        url: `/simulation/${group}/start`,
         method: 'put'
     });
 }
 /** 获取存在的仿真列表 */
 export function getExistSimulationList(params) {
     return request({
-        url: `/common/simulation/list`,
+        url: `/simulation/list`,
         method: 'get',
         params
     });
@@ -107,7 +93,15 @@ export function getExistSimulationList(params) {
 /** 获取仿真用户信息 */
 export function getSimulationUserInfo(id) {
     return request({
-        url: `/common/simulation/${id}/users`,
+        url: `/simulation/${id}/users`,
         method: 'get'
     });
 }
+/** 监管仿真 */
+export function getSuperviseSimulation(params) {
+    return request({
+        url: `/simulation/supervise`,
+        method: 'get',
+        params
+    });
+}
diff --git a/src/api/simulation.js b/src/api/simulation.js
index 9d14b4848..fa3aaac91 100644
--- a/src/api/simulation.js
+++ b/src/api/simulation.js
@@ -296,7 +296,7 @@ export function modifySystemTime(data, group) {
 /** 新版地图按计划行车 */
 export function ranAsPlan(data, group) {
     return request({
-        url: `/simulation/${group}/ranAsPlan`,
+        url: `/simulation/new/${group}/runAsPlan`,
         method: 'post',
         data: data
     });
@@ -537,3 +537,40 @@ export function queryPaTimedList(group, params) {
         params
     });
 }
+/** 创建仿真 */
+export function createSimulation(id) {
+    return request({
+        url: `/simulation/new/mapFunction/${id}`,
+        method: 'post'
+    });
+}
+
+/** 根据地图ID和功能ID获取仿真GroupId */
+export function getGroupByMapAndFunction(mapId, functionId) {
+    return request({
+        url: `/simulation/new/map/${mapId}/function/${functionId}`,
+        method: 'get'
+    });
+}
+/** 由系统管理员和教员销毁仿真 */
+export function destroySimulationByAdmin(group) {
+    return request({
+        url: `/simulation/${group}/destroy`,
+        method: 'delete'
+    });
+}
+
+/** 非仿真创建者退出仿真 */
+export function exitSimulation(group) {
+    return request({
+        url: `/simulation/${group}/exit`,
+        method: 'put'
+    });
+}
+/** 仿真监管那里进入仿真 */
+export function enterSimulationByTeacher(group) {
+    return request({
+        url: `/simulation/${group}/monitor`,
+        method: 'post'
+    });
+}
diff --git a/src/api/thirdAccountConfig.js b/src/api/thirdAccountConfig.js
new file mode 100644
index 000000000..9f178cb06
--- /dev/null
+++ b/src/api/thirdAccountConfig.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request';
+
+/** 删除第三方配置 */
+export function deleteThirdAccountConfig(id) {
+    return request({
+        url: `/api/thirdAccountConfig/${id}`,
+        method: 'delete'
+    });
+}
+
+/** 分页查询所有配置 */
+export function queryThirdAccountConfig(params) {
+    return request({
+        url: `/api/thirdAccountConfig/paged`,
+        method: 'get',
+        params
+    });
+}
+
+/** 新增或更新第三方配置 */
+export function updateThirdAccountConfig(data) {
+    return request({
+        url: `/api/thirdAccountConfig`,
+        method: 'post',
+        data
+    });
+}
diff --git a/src/api/trainingManage.js b/src/api/trainingManage.js
index 4d087f9ef..cb9a3a719 100644
--- a/src/api/trainingManage.js
+++ b/src/api/trainingManage.js
@@ -41,7 +41,6 @@ export function getTrainingStepList(trainingId) {
 }
 /** 修改实训所有步骤 */
 export function updateTrainingStep(group, trainingId, data) {
-    console.log(group, trainingId, '*******');
     return request({
         url: `/api/v2/draft/training/${group}/${trainingId}/step/update`,
         method: 'put',
@@ -152,10 +151,10 @@ export function getTrainingGradeRules(trainingId) {
         method: 'get'
     });
 }
-/** 清空步骤 */
-export function clearTrainingStep(trainingId) {
+/** 清空重置实训 */
+export function clearDesignTraining(trainingId, group) {
     return request({
-        url: `/api/v2/draft/training/${trainingId}/step/clear`,
+        url: `/api/v2/draft/training/${group}/reset/${trainingId}`,
         method: 'delete'
     });
 }
diff --git a/src/api/trainingPlatform.js b/src/api/trainingPlatform.js
index 6a3d9a6b2..842b033cc 100644
--- a/src/api/trainingPlatform.js
+++ b/src/api/trainingPlatform.js
@@ -75,4 +75,74 @@ export function getSubSystemByProjectCode() {
         method: 'get'
     });
 }
+/** 创建地图系统 */
+export function createMapFunction(data) {
+    return request({
+        url: `/api/mapFunction`,
+        method: 'post',
+        data
+    });
+}
+/** 列表查询地图系统 */
+export function queryMapFunctionList(params) {
+    return request({
+        url: `/api/mapFunction/list`,
+        method: 'get',
+        params
+    });
+}
+/** 更新地图系统 */
+export function updateMapFunction(data) {
+    return request({
+        url: `/api/mapFunction/${data.id}`,
+        method: 'put',
+        data
+    });
+}
+/** 删除地图系统 */
+export function deleteMapFunction(id) {
+    return request({
+        url: `/api/mapFunction/${id}`,
+        method: 'delete'
+    });
+}
+/** 分页查询地图系统 */
+export function queryMapFunctionPaged(params) {
+    return request({
+        url: `/api/mapFunction/paged`,
+        method: 'get',
+        params
+    });
+}
+/** 生成地图子系统 */
+export function generateMapFunctionNew(mapId, data) {
+    return request({
+        url: `/api/mapFunction/${mapId}/generate`,
+        method: 'post',
+        data
+    });
+}
 
+/** 根据id查询地图系统 */
+export function getMapFunctioById(id) {
+    return request({
+        url: `/api/mapFunction/${id}`,
+        method: 'get'
+    });
+}
+
+/** 一键删除地图下所有线路功能 */
+export function deleteAllMapFunction(mapId) {
+    return request({
+        url: `/api/mapFunction/batch/${mapId}`,
+        method: 'delete'
+    });
+}
+/** 新增分组 */
+export function updateMapFunctionSubset(data) {
+    return request({
+        url: `/api/mapFunction/group`,
+        method: 'put',
+        data
+    });
+}
diff --git a/src/api/userRulesManage.js b/src/api/userRulesManage.js
new file mode 100644
index 000000000..df2dfbe01
--- /dev/null
+++ b/src/api/userRulesManage.js
@@ -0,0 +1,35 @@
+
+import request from '@/utils/request';
+
+/** 设置权限失效或有效*/
+export function setPermissonInValid(subjectId) {
+    return request({
+        url: `/api/v2/permission/subject/inValid/${subjectId}`,
+        method: 'get'
+    });
+}
+
+/** 用户权限列表*/
+export function listPermision(params) {
+    return request({
+        url: `/api/v2/permission/subject/page`,
+        method: 'get',
+        params: params
+    });
+}
+
+/** 查看用户分发的下级所有用户权限*/
+export function getPermissonInDistribute(subjectId) {
+    return request({
+        url: `/api/v2/permission/subject/distribute/${subjectId}`,
+        method: 'get'
+    });
+}
+
+/** 查看当前mapId 下用户的所有权限及功能*/
+export function getMapIdPermisson(mapId) {
+    return request({
+        url: `/api/v2/permission/subject/permission/${mapId}`,
+        method: 'get'
+    });
+}
diff --git a/src/assets/reset.png b/src/assets/reset.png
new file mode 100644
index 000000000..f10bfe575
Binary files /dev/null and b/src/assets/reset.png differ
diff --git a/src/components/PopMenu/item.vue b/src/components/PopMenu/item.vue
index 7f9c55279..f40fcfd4f 100644
--- a/src/components/PopMenu/item.vue
+++ b/src/components/PopMenu/item.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <li v-if="option.children && option.children.length" class="menu-item" :class="popClass" @mouseenter="enter($vnode.key)" @mouseleave="leave">
+    <li v-if="option.children && option.children.length && checkVisible(option)" class="menu-item" :class="popClass" @mouseenter="enter($vnode.key)" @mouseleave="leave">
       <div ref="flexBox" class="flex-box">
         <el-button type="text" class="item" :disabled="checkDisabled(option)">
           <el-link v-if="option.tipsType" :type="option.tipsType" :underline="false">{{ option.label }}</el-link>
@@ -11,7 +11,7 @@
       <ul v-if="isPopup" ref="popup" class="menu" :style="{display: isShow? 'block': 'table', marginLeft: marginLeft+'px'}">
         <div class="menu-pop pop-menu">
           <div v-show="isShow" class="arrow  el-icon-arrow-down" />
-          <pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" :allowedColor="allowedColor" :disabledColor="disabledColor" @close="close" />
+          <pop-menu-item v-for="(el, i) in option.children" :key="i" :option="el" :pop-class="popClass" :allowed-color="allowedColor" :disabled-color="disabledColor" @close="close" />
           <div v-show="isShow" class="arrow  el-icon-arrow-up" />
         </div>
       </ul>
@@ -52,14 +52,14 @@ export default {
             type: Boolean,
             default: false
         },
-		disabledColor: {
-			type: String,
-			default: '#000',
-		},
-		allowedColor: {
-			type: String,
-			default: '#ccc'
-		}
+        disabledColor: {
+            type: String,
+            default: '#000'
+        },
+        allowedColor: {
+            type: String,
+            default: '#ccc'
+        }
     },
     data() {
         return {
diff --git a/src/components/QueryListPage/QueryForm.vue b/src/components/QueryListPage/QueryForm.vue
index 66f075dcc..c3295c145 100644
--- a/src/components/QueryListPage/QueryForm.vue
+++ b/src/components/QueryListPage/QueryForm.vue
@@ -303,7 +303,9 @@ export default {
     methods: {
         // 获取默认查询参数
         initQueryModel() {
-            this.formModel = localStore.get(this.$route.path) || this.formModel;
+            if (!this.queryForm.notRecord) {
+                this.formModel = localStore.get(this.$route.path) || this.formModel;
+            }
             this.buildForm();
             if (typeof this.queryForm.initLoadCallback === 'function') {
                 this.queryForm.initLoadCallback(this.formModel);
@@ -350,7 +352,6 @@ export default {
             // 构建查询表单对象、显示的查询对象
             const queryObject = {};
             const model = {};
-            // debugger;
             for (const item in this.queryForm.queryObject) {
                 if (this.queryForm.queryObject.show === false) {
                     continue;
diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue
index 43b60a9e0..8bed6bf34 100644
--- a/src/components/QueryListPage/QueryListPage.vue
+++ b/src/components/QueryListPage/QueryListPage.vue
@@ -93,7 +93,7 @@
             :sort-by="column.sortBy"
           >
             <template slot-scope="scope">
-              <div v-html="scope.row[column.prop]" />
+              <div style="white-space: pre-wrap;" v-html="scope.row[column.prop]" />
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue
index f6338219d..4acee5fab 100644
--- a/src/components/QuillEditor/index.vue
+++ b/src/components/QuillEditor/index.vue
@@ -77,7 +77,7 @@ export default {
                             size: 3,
                             action: `${this.$store.state.user.uploadUrl}/api/upload/PICTURE?appId=00001&appSecret=joylink00001`,
                             response: (res) => {
-                                return `${this.$store.state.user.resourcesUrl}${res.data}`;
+                                return `${this.$store.state.user.ossUrl}${res.data}`;
                             },
                             error: () => { that.$message.error('图片上传失败，请检查网络状态'); },
                             sizeError: () => { that.$message.error('图片上传失败，图片大小限制3MB'); } // 图片超过大小的回调
diff --git a/src/components/VCode/index.vue b/src/components/VCode/index.vue
new file mode 100644
index 000000000..d02501d7e
--- /dev/null
+++ b/src/components/VCode/index.vue
@@ -0,0 +1,835 @@
+<template>
+  <!-- 本体部分 -->
+  <div
+    :class="['vue-puzzle-vcode', { show_: show }]"
+    @mousedown="onCloseMouseDown"
+    @mouseup="onCloseMouseUp"
+    @touchstart="onCloseMouseDown"
+    @touchend="onCloseMouseUp"
+  >
+    <div
+      class="vue-auth-box_"
+      @mousedown.stop
+      @touchstart.stop
+    >
+      <div
+        class="auth-body_"
+        :style="`height: ${canvasHeight}px`"
+      >
+        <!-- 主图，有缺口 -->
+        <canvas
+          ref="canvas1"
+          :width="canvasWidth"
+          :height="canvasHeight"
+          :style="`width:${canvasWidth}px;height:${canvasHeight}px`"
+        />
+        <!-- 成功后显示的完整图 -->
+        <canvas
+          ref="canvas3"
+          :class="['auth-canvas3_', { show: isSuccess }]"
+          :width="canvasWidth"
+          :height="canvasHeight"
+          :style="`width:${canvasWidth}px;height:${canvasHeight}px`"
+        />
+        <!-- 小图 -->
+        <canvas
+          ref="canvas2"
+          :width="puzzleBaseSize"
+          class="auth-canvas2_"
+          :height="canvasHeight"
+          :style="
+            `width:${puzzleBaseSize}px;height:${canvasHeight}px;transform:translateX(${styleWidth -
+              sliderBaseSize -
+              (puzzleBaseSize - sliderBaseSize) *
+              ((styleWidth - sliderBaseSize) /
+              (canvasWidth - sliderBaseSize))}px)`
+          "
+        />
+        <div :class="['loading-box_', { hide_: !loading }]">
+          <div class="loading-gif_">
+            <span />
+            <span />
+            <span />
+            <span />
+            <span />
+          </div>
+        </div>
+        <div :class="['info-box_', { show: infoBoxShow }, { fail: infoBoxFail }]">
+          {{ infoText }}
+        </div>
+        <div
+          :class="['flash_', { show: isSuccess }]"
+          :style="
+            `transform: translateX(${
+              isSuccess
+                ? `${canvasWidth + canvasHeight * 0.578}px`
+                : `-${canvasHeight * 0.578}px`
+            }) skew(-30deg, 0);`
+          "
+        />
+        <img
+          class="reset_"
+          :src="resetSvg"
+          @click="reset"
+        >
+      </div>
+      <div class="auth-control_">
+        <div
+          class="range-box"
+          :style="`height:${sliderBaseSize}px`"
+        >
+          <div class="range-text">{{ sliderText }}</div>
+          <div
+            ref="range-slider"
+            class="range-slider"
+            :style="`width:${styleWidth}px`"
+          >
+            <div
+              :class="['range-btn', { isDown: mouseDown }]"
+              :style="`width:${sliderBaseSize}px`"
+              @mousedown="onRangeMouseDown($event)"
+              @touchstart="onRangeMouseDown($event)"
+            >
+              <div />
+              <div />
+              <div />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import resetSvg from '@/assets/reset.png';
+export default {
+    props: {
+        canvasWidth: { type: Number, default: 310 }, // 主canvas的宽
+        canvasHeight: { type: Number, default: 160 }, // 主canvas的高
+        // 是否出现，由父级控制
+        show: { type: Boolean, default: false },
+        puzzleScale: { type: Number, default: 1 }, // 拼图块的大小缩放比例
+        sliderSize: { type: Number, default: 50 }, // 滑块的大小
+        range: { type: Number, default: 10 }, // 允许的偏差值
+        // 所有的背景图片
+        imgs: {
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        successText: {
+            type: String,
+            default: '验证通过！'
+        },
+        failText: {
+            type: String,
+            default: '验证失败，请重试'
+        },
+        sliderText: {
+            type: String,
+            default: '拖动滑块完成拼图'
+        }
+    },
+    data() {
+        return {
+            mouseDown: false, // 鼠标是否在按钮上按下
+            startWidth: 50, // 鼠标点下去时父级的width
+            startX: 0, // 鼠标按下时的X
+            newX: 0, // 鼠标当前的偏移X
+            pinX: 0, // 拼图的起始X
+            pinY: 0, // 拼图的起始Y
+            loading: false, // 是否正在加在中，主要是等图片onload
+            isCanSlide: false, // 是否可以拉动滑动条
+            error: false, // 图片加在失败会出现这个，提示用户手动刷新
+            infoBoxShow: false, // 提示信息是否出现
+            infoText: '', // 提示等信息
+            infoBoxFail: false, // 是否验证失败
+            timer1: null, // setTimout1
+            closeDown: false, // 为了解决Mac上的click BUG
+            isSuccess: false, // 验证成功
+            imgIndex: -1, // 用于自定义图片时不会随机到重复的图片
+            isSubmting: false, // 是否正在判定，主要用于判定中不能点击重置按钮
+            resetSvg
+        };
+    },
+    /** 计算属性 **/
+    computed: {
+    // styleWidth是底部用户操作的滑块的父级，就是轨道在鼠标的作用下应该具有的宽度
+        styleWidth() {
+            const w = this.startWidth + this.newX - this.startX;
+            return w < this.sliderBaseSize
+                ? this.sliderBaseSize
+                : w > this.canvasWidth
+                    ? this.canvasWidth
+                    : w;
+        },
+        // 图中拼图块的60 * 用户设定的缩放比例计算之后的值 0.2~2
+        puzzleBaseSize() {
+            return Math.round(
+                Math.max(Math.min(this.puzzleScale, 2), 0.2) * 52.5 + 6
+            );
+        },
+        // 处理一下sliderSize，弄成整数，以免计算有偏差
+        sliderBaseSize() {
+            return Math.max(
+                Math.min(
+                    Math.round(this.sliderSize),
+                    Math.round(this.canvasWidth * 0.5)
+                ),
+                10
+            );
+        }
+    },
+    /** 监听 **/
+    watch: {
+        show(newV) {
+            // 每次出现都应该重新初始化
+            if (newV) {
+                // document.body.classList.add('vue-puzzle-overflow');
+                this.reset();
+            } else {
+                this.isSubmting = false;
+                this.isSuccess = false;
+                this.infoBoxShow = false;
+                // document.body.classList.remove('vue-puzzle-overflow');
+            }
+        }
+    },
+    /** 生命周期 **/
+    mounted() {
+        // document.body.appendChild(this.$el);
+        document.addEventListener('mousemove', this.onRangeMouseMove, false);
+        document.addEventListener('mouseup', this.onRangeMouseUp, false);
+        document.addEventListener('touchmove', this.onRangeMouseMove, {
+            passive: false
+        });
+        document.addEventListener('touchend', this.onRangeMouseUp, false);
+        if (this.show) {
+            document.body.classList.add('vue-puzzle-overflow');
+            this.reset();
+        }
+    },
+    beforeDestroy() {
+        clearTimeout(this.timer1);
+        // document.body.removeChild(this.$el);
+        document.removeEventListener('mousemove', this.onRangeMouseMove, false);
+        document.removeEventListener('mouseup', this.onRangeMouseUp, false);
+        document.removeEventListener('touchmove', this.onRangeMouseMove, {
+            passive: false
+        });
+        document.removeEventListener('touchend', this.onRangeMouseUp, false);
+    },
+    /** 方法 **/
+    methods: {
+    // 关闭
+        onClose() {
+            if (!this.mouseDown && !this.isSubmting) {
+                clearTimeout(this.timer1);
+                this.$emit('close');
+            }
+        },
+        onCloseMouseDown() {
+            this.closeDown = true;
+        },
+        onCloseMouseUp() {
+            if (this.closeDown) {
+                this.onClose();
+            }
+            this.closeDown = false;
+        },
+        // 鼠标按下准备拖动
+        onRangeMouseDown(e) {
+            if (this.isCanSlide) {
+                this.mouseDown = true;
+                this.startWidth = this.$refs['range-slider'].clientWidth;
+                this.newX = e.clientX || e.changedTouches[0].clientX;
+                this.startX = e.clientX || e.changedTouches[0].clientX;
+            }
+        },
+        // 鼠标移动
+        onRangeMouseMove(e) {
+            if (this.mouseDown) {
+                e.preventDefault();
+                this.newX = e.clientX || e.changedTouches[0].clientX;
+            }
+        },
+        // 鼠标抬起
+        onRangeMouseUp() {
+            if (this.mouseDown) {
+                this.mouseDown = false;
+                this.submit();
+            }
+        },
+        /**
+     * 开始进行
+     * @param withCanvas 是否强制使用canvas随机作图
+     */
+        init(withCanvas) {
+            // 防止重复加载导致的渲染错误
+            if (this.loading && !withCanvas) {
+                return;
+            }
+            this.loading = true;
+            this.isCanSlide = false;
+            const c = this.$refs.canvas1;
+            const c2 = this.$refs.canvas2;
+            const c3 = this.$refs.canvas3;
+            const ctx = c.getContext('2d');
+            const ctx2 = c2.getContext('2d');
+            const ctx3 = c3.getContext('2d');
+            const isFirefox = navigator.userAgent.indexOf('Firefox') >= 0 && navigator.userAgent.indexOf('Windows') >= 0; // 是windows版火狐
+            const img = document.createElement('img');
+            ctx.fillStyle = 'rgba(255,255,255,1)';
+            ctx3.fillStyle = 'rgba(255,255,255,1)';
+            ctx.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
+            ctx2.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
+            // 取一个随机坐标，作为拼图块的位置
+            this.pinX = this.getRandom(this.puzzleBaseSize, this.canvasWidth - this.puzzleBaseSize - 20); // 留20的边距
+            this.pinY = this.getRandom(20, this.canvasHeight - this.puzzleBaseSize - 20); // 主图高度 - 拼图块自身高度 - 20边距
+            img.crossOrigin = 'anonymous'; // 匿名，想要获取跨域的图片
+            img.onload = () => {
+                const [x, y, w, h] = this.makeImgSize(img);
+                ctx.save();
+                // 先画小图
+                this.paintBrick(ctx);
+                ctx.closePath();
+                if (!isFirefox) {
+                    ctx.shadowOffsetX = 0;
+                    ctx.shadowOffsetY = 0;
+                    ctx.shadowColor = '#000';
+                    ctx.shadowBlur = 3;
+                    ctx.fill();
+                    ctx.clip();
+                } else {
+                    ctx.clip();
+                    ctx.save();
+                    ctx.shadowOffsetX = 0;
+                    ctx.shadowOffsetY = 0;
+                    ctx.shadowColor = '#000';
+                    ctx.shadowBlur = 3;
+                    ctx.fill();
+                    ctx.restore();
+                }
+                ctx.drawImage(img, x, y, w, h);
+                ctx3.fillRect(0, 0, this.canvasWidth, this.canvasHeight);
+                ctx3.drawImage(img, x, y, w, h);
+                // 设置小图的内阴影
+                ctx.globalCompositeOperation = 'source-atop';
+                this.paintBrick(ctx);
+                ctx.arc(
+                    this.pinX + Math.ceil(this.puzzleBaseSize / 2),
+                    this.pinY + Math.ceil(this.puzzleBaseSize / 2),
+                    this.puzzleBaseSize * 1.2,
+                    0,
+                    Math.PI * 2,
+                    true
+                );
+                ctx.closePath();
+                ctx.shadowColor = 'rgba(255, 255, 255, .8)';
+                ctx.shadowOffsetX = -1;
+                ctx.shadowOffsetY = -1;
+                ctx.shadowBlur = Math.min(Math.ceil(8 * this.puzzleScale), 12);
+                ctx.fillStyle = '#ffffaa';
+                ctx.fill();
+                // 将小图赋值给ctx2
+                const imgData = ctx.getImageData(
+                    this.pinX - 3, // 为了阴影 是从-3px开始截取，判定的时候要+3px
+                    this.pinY - 20,
+                    this.pinX + this.puzzleBaseSize + 5,
+                    this.pinY + this.puzzleBaseSize + 5
+                );
+                ctx2.putImageData(imgData, 0, this.pinY - 20);
+
+                // ctx2.drawImage(c, this.pinX - 3,this.pinY - 20,this.pinX + this.puzzleBaseSize + 5,this.pinY + this.puzzleBaseSize + 5,
+                // 0, this.pinY - 20, this.pinX + this.puzzleBaseSize + 5, this.pinY + this.puzzleBaseSize + 5);
+                // 清理
+                ctx.restore();
+                ctx.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
+                // 画缺口
+                ctx.save();
+                this.paintBrick(ctx);
+                ctx.globalAlpha = 0.8;
+                ctx.fillStyle = '#ffffff';
+                ctx.fill();
+                ctx.restore();
+                // 画缺口的内阴影
+                ctx.save();
+                ctx.globalCompositeOperation = 'source-atop';
+                this.paintBrick(ctx);
+                ctx.arc(
+                    this.pinX + Math.ceil(this.puzzleBaseSize / 2),
+                    this.pinY + Math.ceil(this.puzzleBaseSize / 2),
+                    this.puzzleBaseSize * 1.2,
+                    0,
+                    Math.PI * 2,
+                    true
+                );
+                ctx.shadowColor = '#000';
+                ctx.shadowOffsetX = 2;
+                ctx.shadowOffsetY = 2;
+                ctx.shadowBlur = 16;
+                ctx.fill();
+                ctx.restore();
+                // 画整体背景图
+                ctx.save();
+                ctx.globalCompositeOperation = 'destination-over';
+                ctx.drawImage(img, x, y, w, h);
+                ctx.restore();
+                this.loading = false;
+                this.isCanSlide = true;
+            };
+            img.onerror = () => {
+                this.init(true); // 如果图片加载错误就重新来，并强制用canvas随机作图
+            };
+            if (!withCanvas && this.imgs && this.imgs.length) {
+                let randomNum = this.getRandom(0, this.imgs.length - 1);
+                if (randomNum === this.imgIndex) {
+                    if (randomNum === this.imgs.length - 1) {
+                        randomNum = 0;
+                    } else {
+                        randomNum++;
+                    }
+                }
+                this.imgIndex = randomNum;
+                img.src = this.imgs[randomNum];
+            } else {
+                img.src = this.makeImgWithCanvas();
+            }
+        },
+        // 工具 - 范围随机数
+        getRandom(min, max) {
+            return Math.ceil(Math.random() * (max - min) + min);
+        },
+        // 工具 - 设置图片尺寸cover方式贴合canvas尺寸 w/h
+        makeImgSize(img) {
+            const imgScale = img.width / img.height;
+            const canvasScale = this.canvasWidth / this.canvasHeight;
+            let x = 0;
+            let y = 0;
+            let w = 0;
+            let h = 0;
+            if (imgScale > canvasScale) {
+                h = this.canvasHeight;
+                w = imgScale * h;
+                y = 0;
+                x = (this.canvasWidth - w) / 2;
+            } else {
+                w = this.canvasWidth;
+                h = w / imgScale;
+                x = 0;
+                y = (this.canvasHeight - h) / 2;
+            }
+            return [x, y, w, h];
+        },
+        // 绘制拼图块的路径
+        paintBrick(ctx) {
+            const moveL = Math.ceil(15 * this.puzzleScale); // 直线移动的基础距离
+            ctx.beginPath();
+            ctx.moveTo(this.pinX, this.pinY);
+            ctx.lineTo(this.pinX + moveL, this.pinY);
+            ctx.arcTo(
+                this.pinX + moveL,
+                this.pinY - moveL / 2,
+                this.pinX + moveL + moveL / 2,
+                this.pinY - moveL / 2,
+                moveL / 2
+            );
+            ctx.arcTo(
+                this.pinX + moveL + moveL,
+                this.pinY - moveL / 2,
+                this.pinX + moveL + moveL,
+                this.pinY,
+                moveL / 2
+            );
+            ctx.lineTo(this.pinX + moveL + moveL + moveL, this.pinY);
+            ctx.lineTo(this.pinX + moveL + moveL + moveL, this.pinY + moveL);
+            ctx.arcTo(
+                this.pinX + moveL + moveL + moveL + moveL / 2,
+                this.pinY + moveL,
+                this.pinX + moveL + moveL + moveL + moveL / 2,
+                this.pinY + moveL + moveL / 2,
+                moveL / 2
+            );
+            ctx.arcTo(
+                this.pinX + moveL + moveL + moveL + moveL / 2,
+                this.pinY + moveL + moveL,
+                this.pinX + moveL + moveL + moveL,
+                this.pinY + moveL + moveL,
+                moveL / 2
+            );
+            ctx.lineTo(
+                this.pinX + moveL + moveL + moveL,
+                this.pinY + moveL + moveL + moveL
+            );
+            ctx.lineTo(this.pinX, this.pinY + moveL + moveL + moveL);
+            ctx.lineTo(this.pinX, this.pinY + moveL + moveL);
+            ctx.arcTo(
+                this.pinX + moveL / 2,
+                this.pinY + moveL + moveL,
+                this.pinX + moveL / 2,
+                this.pinY + moveL + moveL / 2,
+                moveL / 2
+            );
+            ctx.arcTo(
+                this.pinX + moveL / 2,
+                this.pinY + moveL,
+                this.pinX,
+                this.pinY + moveL,
+                moveL / 2
+            );
+            ctx.lineTo(this.pinX, this.pinY);
+        },
+        // 用canvas随机生成图片
+        makeImgWithCanvas() {
+            const canvas = document.createElement('canvas');
+            const ctx = canvas.getContext('2d');
+            canvas.width = this.canvasWidth;
+            canvas.height = this.canvasHeight;
+            ctx.fillStyle = `rgb(${this.getRandom(100, 255)},${this.getRandom(
+                100,
+                255
+            )},${this.getRandom(100, 255)})`;
+            ctx.fillRect(0, 0, this.canvasWidth, this.canvasHeight);
+            // 随机画10个图形
+            for (let i = 0; i < 12; i++) {
+                ctx.fillStyle = `rgb(${this.getRandom(100, 255)},${this.getRandom(
+                    100,
+                    255
+                )},${this.getRandom(100, 255)})`;
+                ctx.strokeStyle = `rgb(${this.getRandom(100, 255)},${this.getRandom(
+                    100,
+                    255
+                )},${this.getRandom(100, 255)})`;
+                if (this.getRandom(0, 2) > 1) {
+                    // 矩形
+                    ctx.save();
+                    ctx.rotate((this.getRandom(-90, 90) * Math.PI) / 180);
+                    ctx.fillRect(
+                        this.getRandom(-20, canvas.width - 20),
+                        this.getRandom(-20, canvas.height - 20),
+                        this.getRandom(10, canvas.width / 2 + 10),
+                        this.getRandom(10, canvas.height / 2 + 10)
+                    );
+                    ctx.restore();
+                } else {
+                    // 圆
+                    ctx.beginPath();
+                    const ran = this.getRandom(-Math.PI, Math.PI);
+                    ctx.arc(
+                        this.getRandom(0, canvas.width),
+                        this.getRandom(0, canvas.height),
+                        this.getRandom(10, canvas.height / 2 + 10),
+                        ran,
+                        ran + Math.PI * 1.5
+                    );
+                    ctx.closePath();
+                    ctx.fill();
+                }
+            }
+            return canvas.toDataURL('image/png');
+        },
+        // 开始判定
+        submit() {
+            this.isSubmting = true;
+            // 偏差 x = puzzle的起始X - (用户真滑动的距离) + (puzzle的宽度 - 滑块的宽度) * （用户真滑动的距离/canvas总宽度）
+            // 最后+ 的是补上slider和滑块宽度不一致造成的缝隙
+            const x = Math.abs(
+                this.pinX -
+          (this.styleWidth - this.sliderBaseSize) +
+          (this.puzzleBaseSize - this.sliderBaseSize) *
+            ((this.styleWidth - this.sliderBaseSize) /
+              (this.canvasWidth - this.sliderBaseSize)) -
+          3
+            );
+            if (x < this.range) {
+                // 成功
+                this.infoText = this.successText;
+                this.infoBoxFail = false;
+                this.infoBoxShow = true;
+                this.isCanSlide = false;
+                this.isSuccess = true;
+                // 成功后准备关闭
+                clearTimeout(this.timer1);
+                this.timer1 = setTimeout(() => {
+                    // 成功的回调
+                    this.isSubmting = false;
+                    this.$emit('success', x);
+                }, 800);
+            } else {
+                // 失败
+                this.infoText = this.failText;
+                this.infoBoxFail = true;
+                this.infoBoxShow = true;
+                this.isCanSlide = false;
+                // 失败的回调
+                this.$emit('fail', x);
+                // 800ms后重置
+                clearTimeout(this.timer1);
+                this.timer1 = setTimeout(() => {
+                    this.isSubmting = false;
+                    this.reset();
+                }, 800);
+            }
+        },
+        // 重置 - 重新设置初始状态
+        resetState() {
+            this.infoBoxFail = false;
+            this.infoBoxShow = false;
+            this.isCanSlide = false;
+            this.isSuccess = false;
+            this.startWidth = this.sliderBaseSize; // 鼠标点下去时父级的width
+            this.startX = 0; // 鼠标按下时的X
+            this.newX = 0; // 鼠标当前的偏移X
+        },
+        // 重置
+        reset() {
+            if (this.isSubmting) {
+                return;
+            }
+            this.resetState();
+            this.init();
+        }
+    }
+};
+</script>
+<style lang="scss">
+.vue-puzzle-vcode {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 999;
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 200ms;
+  &.show_ {
+    opacity: 1;
+    pointer-events: auto;
+  }
+}
+.vue-auth-box_ {
+  position: absolute;
+  top: 47%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  padding: 20px;
+  background: #fff;
+  user-select: none;
+  border-radius: 3px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+  .auth-body_ {
+    position: relative;
+    overflow: hidden;
+    border-radius: 3px;
+    .loading-box_ {
+      position: absolute;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+      background-color: rgba(0, 0, 0, 0.8);
+      z-index: 20;
+      opacity: 1;
+      transition: opacity 200ms;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      &.hide_ {
+        opacity: 0;
+        pointer-events: none;
+        .loading-gif_ {
+          span {
+            animation-play-state: paused;
+          }
+        }
+      }
+      .loading-gif_ {
+        flex: none;
+        height: 5px;
+        line-height: 0;
+        @keyframes load {
+          0% {
+            opacity: 1;
+            transform: scale(1.3);
+          }
+          100% {
+            opacity: 0.2;
+            transform: scale(0.3);
+          }
+        }
+        span {
+          display: inline-block;
+          width: 5px;
+          height: 100%;
+          margin-left: 2px;
+          border-radius: 50%;
+          background-color: #888;
+          animation: load 1.04s ease infinite;
+          &:nth-child(1) {
+            margin-left: 0;
+          }
+          &:nth-child(2) {
+            animation-delay: 0.13s;
+          }
+          &:nth-child(3) {
+            animation-delay: 0.26s;
+          }
+          &:nth-child(4) {
+            animation-delay: 0.39s;
+          }
+          &:nth-child(5) {
+            animation-delay: 0.52s;
+          }
+        }
+      }
+    }
+    .info-box_ {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 24px;
+      line-height: 24px;
+      text-align: center;
+      overflow: hidden;
+      font-size: 13px;
+      background-color: #83ce3f;
+      opacity: 0;
+      transform: translateY(24px);
+      transition: all 200ms;
+      color: #fff;
+      z-index: 10;
+      &.show {
+        opacity: 0.95;
+        transform: translateY(0);
+      }
+      &.fail {
+        background-color: #ce594b;
+      }
+    }
+    .auth-canvas2_ {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 60px;
+      height: 100%;
+      z-index: 2;
+    }
+    .auth-canvas3_ {
+      position: absolute;
+      top: 0;
+      left: 0;
+      opacity: 0;
+      transition: opacity 600ms;
+      z-index: 3;
+      &.show {
+        opacity: 1;
+      }
+    }
+    .flash_ {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 30px;
+      height: 100%;
+      background-color: rgba(255, 255, 255, 0.1);
+      z-index: 3;
+      &.show {
+        transition: transform 600ms;
+      }
+    }
+    .reset_ {
+      position: absolute;
+      top: 2px;
+      right: 2px;
+      width: 35px;
+      height: auto;
+      z-index: 12;
+      cursor: pointer;
+      transition: transform 200ms;
+      transform: rotate(0deg);
+      &:hover {
+        transform: rotate(-90deg);
+      }
+    }
+  }
+  .auth-control_ {
+    .range-box {
+      position: relative;
+      width: 100%;
+      background-color: #eef1f8;
+      margin-top: 20px;
+      border-radius: 3px;
+      box-shadow: 0 0 8px rgba(240, 240, 240, 0.6) inset;
+      .range-text {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        font-size: 14px;
+        color: #b7bcd1;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        text-align: center;
+        width: 100%;
+      }
+      .range-slider {
+        position: absolute;
+        height: 100%;
+        width: 50px;
+        background-color: rgba(106, 160, 255, 0.8);
+        border-radius: 3px;
+        .range-btn {
+          position: absolute;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          right: 0;
+          width: 50px;
+          height: 100%;
+          background-color: #fff;
+          border-radius: 3px;
+          box-shadow: 0 0 4px #ccc;
+          cursor: pointer;
+          & > div {
+            width: 0;
+            height: 40%;
+            transition: all 200ms;
+            &:nth-child(2) {
+              margin: 0 4px;
+            }
+            border: solid 1px #6aa0ff;
+          }
+          &:hover,
+          &.isDown {
+            & > div:first-child {
+              border: solid 4px transparent;
+              height: 0;
+              border-right-color: #6aa0ff;
+            }
+            & > div:nth-child(2) {
+              border-width: 3px;
+              height: 0;
+              border-radius: 3px;
+              margin: 0 6px;
+              border-right-color: #6aa0ff;
+            }
+            & > div:nth-child(3) {
+              border: solid 4px transparent;
+              height: 0;
+              border-left-color: #6aa0ff;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.vue-puzzle-overflow {
+  overflow: hidden !important;
+}
+</style>
diff --git a/src/i18n/langs/en/index.js b/src/i18n/langs/en/index.js
index 1687a124b..23bc029bf 100644
--- a/src/i18n/langs/en/index.js
+++ b/src/i18n/langs/en/index.js
@@ -29,6 +29,7 @@ import systemGenerate from './systemGenerate';
 import login from './login';
 import designPlatform from './designPlatform';
 import trainingManage from './trainingManage';
+import newRouter from './newRouter';
 
 export default {
     enLocale,
@@ -61,5 +62,6 @@ export default {
     systemGenerate,
     login,
     designPlatform,
-    trainingManage
+    trainingManage,
+    newRouter
 };
diff --git a/src/i18n/langs/en/newRouter.js b/src/i18n/langs/en/newRouter.js
new file mode 100644
index 000000000..1ee49ab46
--- /dev/null
+++ b/src/i18n/langs/en/newRouter.js
@@ -0,0 +1,48 @@
+export default {
+    simulation: 'simulation',
+    multiplayerSimulation: 'Many simulation',
+    regulationSimulation: 'Regulation of the simulation',
+    teachingManagement: 'teaching management',
+    classroom: 'classroom management',
+    student: 'student management',
+    theory: 'The theory of management',
+    training: 'Practical teaching management',
+    exam: 'examination management',
+    lineDesign: 'track design',
+    case: 'case',
+    SystemManagement: 'System management',
+    SystemDataManagement: 'System data management',
+    dataDictionary: 'Data dictionary',
+    SystemAccountManagement: 'System Account Management',
+    ThirdPartyAccounts: 'Configuring Third-Party Accounts',
+    OnlineInformationManagement: 'Online information management',
+    loginUser: 'Online users',
+    cacheDataManage: 'Cache data management',
+    simulationManage: 'simulation management',
+    companyUserManage: 'Organization User Management',
+    companyManage: 'Company manage',
+    lineDataManage: 'Line data management',
+    lineTypeManage: 'Line type management',
+    linePacketManage: 'Line packet management',
+    teachingDataManage: 'Teaching data management',
+    theoryData: 'Theoretical topic data management',
+    trainingDataManage: 'Training data management',
+    examData: 'Examination data management',
+    userTrainingDataManage: 'User training data management',
+    userExamData: 'User test data management',
+    projectDataManage: 'Project data management',
+    projectManage: 'Project Manage',
+    projectConfig: 'Project client configuration',
+    projectDeviceManage: 'Project equipment management',
+    permissionDataManage: 'Permission Data Management',
+    permissionManage: 'Permission',
+    authorityTransferManage: 'Privilege distribution management',
+    userRulesManage: 'User Rights Statistics',
+    fileManage: 'File Manage',
+    frontResourceManage: 'Front-End Resource Management',
+    iscsPrerecordManage: 'ISCS Advance record management',
+    XRVTI: 'Xi\'an Railway Vocational & Technical Institute',
+    GEMVC: 'Guizhou Equipment Manufacturing Vocational College',
+    JVCOEAI: 'Jiangsu Vocational College Of Electronics And Information',
+    functionManage: 'function management'
+};
diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js
index 8288d8f03..85e8cac90 100644
--- a/src/i18n/langs/en/orderAuthor.js
+++ b/src/i18n/langs/en/orderAuthor.js
@@ -117,5 +117,8 @@ export default {
     distributionAttribution: 'Distribution attribution',
     goodsAmount:'Goods Amount',
     operate:'operate',
-    orderNotPay:'order not pay'
+    orderNotPay:'order not pay',
+    updateTime: 'update time',
+    oneClickSync: 'one click sync',
+    ability: 'ability'
 };
diff --git a/src/i18n/langs/en/router.js b/src/i18n/langs/en/router.js
index 9fd78d3f9..2cc718eb0 100644
--- a/src/i18n/langs/en/router.js
+++ b/src/i18n/langs/en/router.js
@@ -1,108 +1,110 @@
 export default {
-    homePage: 'Home',
+	homePage: 'Home',
 
-    mapManage: 'Map',
-    skinManage: 'Skin management',
-    mapDraw: 'Map draw',
-    runPlanManage: 'Run plan',
-    productEdit: 'Product editor',
+	mapManage: 'Map',
+	skinManage: 'Skin management',
+	mapDraw: 'Map draw',
+	runPlanManage: 'Run plan',
+	productEdit: 'Product editor',
 
-    newDesignEditor: 'Editor',
-    newDesignEditorList: 'Editor List',
-    newDesignDraftEditorList: 'Draft Editor List',
-    uploadPdf: 'Upload Pdf',
-    fileManage:'File Manage',
+	newDesignEditor: 'Editor',
+	newDesignEditorList: 'Editor List',
+	newDesignDraftEditorList: 'Draft Editor List',
+	uploadPdf: 'Upload Pdf',
+	fileManage: 'File Manage',
 
-    designhomePage: 'Public map',
-    designUserPage: 'Personal map',
-    newDesignUserPage: 'Personal map',
+	designhomePage: 'Public map',
+	designUserPage: 'Personal map',
+	newDesignUserPage: 'Personal map',
 
-    lessaonManage: 'Lesson',
-    lessonEdit: 'Lesson editor',
-    trainingRecord: 'Trainning recording',
-    trainingRule: 'Training rules',
-    trainingManage: 'Training management',
-    taskManage: 'Task management',
-    scriptManage: 'Script',
+	lessaonManage: 'Lesson',
+	lessonEdit: 'Lesson editor',
+	trainingRecord: 'Trainning recording',
+	trainingRule: 'Training rules',
+	trainingManage: 'Training management',
+	taskManage: 'Task management',
+	scriptManage: 'Script',
 
-    teachSystem: 'Teaching',
+	teachSystem: 'Teaching',
 
-    examSystem: 'Examination',
+	examSystem: 'Examination',
 
-    demonstrationSystem: 'Simulation',
+	demonstrationSystem: 'Simulation',
 
-    dpSystem: 'Large screen',
+	dpSystem: 'Large screen',
 
-    planSystem: 'Lian plan',
+	planSystem: 'Lian plan',
 
-    replayManage: 'Playback',
+	replayManage: 'Playback',
 
-    permissionManage: 'Permission',
-    selfPermission: 'My Permission',
+	permissionManage: 'Permission',
+	selfPermission: 'My Permission',
 
-    pulishManage: 'Publication',
-    publishMapManage: 'Publishing map management',
-    productStateManage: 'Product state management',
-    publishLessonManage: 'Publishing lesson management',
-    runPlanTemplateManage: 'Template plan management',
-    runPlanCommonManage: 'Loading Plan Managemen',
-    runPlanEveryDayManage: 'Daily plan Management',
-    examRuleManage: 'Management of examination rules',
+	pulishManage: 'Publication',
+	publishMapManage: 'Publishing map management',
+	productStateManage: 'Product state management',
+	publishLessonManage: 'Publishing lesson management',
+	runPlanTemplateManage: 'Template plan management',
+	runPlanCommonManage: 'Loading Plan Managemen',
+	runPlanEveryDayManage: 'Daily plan Management',
+	examRuleManage: 'Management of examination rules',
 
-    orderAuthorityManage: 'Order&Authority',
-    commodityManage: 'Commodity management',
-    orderManage: 'Order management',
-    authorityManage: 'authority management',
-    authorityTransferManage: 'Privilege distribution management',
-    userRulesManage: 'User Rights Statistics',
-    addCommodity: 'Adding goods',
-    addOrder: 'Adding orders',
-    addCoursePermissions: 'Adding course permissions',
+	orderAuthorityManage: 'Order&Authority',
+	commodityManage: 'Commodity management',
+	orderManage: 'Order management',
+	authorityManage: 'authority management',
+	authorityTransferManage: 'Privilege distribution management',
+	userRulesManage: 'User Rights Statistics',
+	addCommodity: 'Adding goods',
+	addOrder: 'Adding orders',
+	addCoursePermissions: 'Adding course permissions',
 
-    systemManage: 'System',
-    dataDictionary: 'Data dictionary',
-    dataDictionaryDetails: 'Data dictionary details',
-    userManage: 'user management',
-    loginUserManage:'login user Manage',
-    cacheManage: 'cache management',
-    userTrainingManage: 'User training management',
-    userExamManage: 'User examination management',
-    userSimulationManage: 'User simulation management',
-    existingSimulation: 'Existence simulation management',
-    ibpDraw: 'Ibp Draw',
-    trainingPlatform: 'trainingPlatform',
-    releaseApplication: 'Release application',
-    courseApplication: 'Course release application',
-    scriptReleaseApplication: 'Script release application',
-    runGraphReleaseApplication: 'Run graph release application',
-    subsystemGeneration: 'Subsystem generation',
-    newsBulletin: 'New bulletin',
-    notificationBulletin: 'Systematic notification',
-    commandDictionary: 'Command dictionary',
-    configLine: 'Line management',
-    deviceManage: 'Device management',
-    iscsDraw: 'Iscs Draw',
-    iscsSystem: 'Iscs System',
-    studentManage: 'Student manage',
-    examDetail: 'Exam detail',
-    raceManage: 'Race manage',
-    practiceManage:'Practice manage',
-    bankManage: 'Bank manage',
-    sceneManage:'Scene manage',
-    companyManage: 'Company manage',
-    authorApply: 'Grant application',
-    AuthorList: 'Authorization code list',
-    questionsRuleManage: 'Question rule  manage',
-    preTheoryData: 'Pre Theory Data',
-    boardManage: 'Message Board Manage',
-    publishIBPManage:'publish IBP Manage',
-    publishISCSManage:'publish ISCS Manage',
-    publishTrainingManage: 'publish Training Manage',
-    voiceTraining: 'Voice Training',
-    mapGroup: 'Map Group',
-    drawingMange:'Drawing Mange',
-    projectServer: 'Project Server',
-    audioResourcesManage: 'Audio Resources Manage',
-    iscsDeviceManage: 'ISCS Device Manage',
-    iscsResourcesManage: 'ISCS Resources Manage'
-};
+	systemManage: 'System',
+	dataDictionary: 'Data dictionary',
+	dataDictionaryDetails: 'Data dictionary details',
+	userManage: 'user management',
+	loginUserManage: 'login user Manage',
+	cacheManage: 'cache management',
+	userTrainingManage: 'User training management',
+	userExamManage: 'User examination management',
+	userSimulationManage: 'User simulation management',
+	existingSimulation: 'Existence simulation management',
+	ibpDraw: 'Ibp Draw',
+	trainingPlatform: 'trainingPlatform',
+	releaseApplication: 'Release application',
+	courseApplication: 'Course release application',
+	scriptReleaseApplication: 'Script release application',
+	runGraphReleaseApplication: 'Run graph release application',
+	subsystemGeneration: 'Subsystem generation',
+	newsBulletin: 'New bulletin',
+	notificationBulletin: 'Systematic notification',
+	commandDictionary: 'Command dictionary',
+	configLine: 'Line management',
+	deviceManage: 'Device management',
+	iscsDraw: 'Iscs Draw',
+	iscsSystem: 'Iscs System',
+	studentManage: 'Student manage',
+	examDetail: 'Exam detail',
+	raceManage: 'Race manage',
+	practiceManage: 'Practice manage',
+	bankManage: 'Bank manage',
+	sceneManage: 'Scene manage',
+	companyManage: 'Company manage',
+	authorApply: 'Grant application',
+	AuthorList: 'Authorization code list',
+	questionsRuleManage: 'Question rule manage',
+	preTheoryData: 'Pre Theory Data',
+	boardManage: 'Message Board Manage',
+	publishIBPManage: 'publish IBP Manage',
+	publishISCSManage: 'publish ISCS Manage',
+	publishTrainingManage: 'publish Training Manage',
+	voiceTraining: 'Voice Training',
+	mapGroup: 'Map Group',
+	drawingMange: 'Drawing Mange',
+	projectServer: 'Project Server',
+	audioResourcesManage: 'Audio Resources Manage',
+	iscsDeviceManage: 'ISCS Device Manage',
+	iscsResourcesManage: 'ISCS Resources Manage',
+	projectManage: 'Project Manage',
+	frontProjectConfigManage: 'Front Project Config Manage',
+}
diff --git a/src/i18n/langs/zh/index.js b/src/i18n/langs/zh/index.js
index 36de12e12..98b938df2 100644
--- a/src/i18n/langs/zh/index.js
+++ b/src/i18n/langs/zh/index.js
@@ -29,6 +29,7 @@ import systemGenerate from './systemGenerate';
 import login from './login';
 import designPlatform from './designPlatform';
 import trainingManage from './trainingManage';
+import newRouter from './newRouter';
 
 export default {
     cnLocale,
@@ -61,5 +62,6 @@ export default {
     systemGenerate,
     login,
     designPlatform,
-    trainingManage
+    trainingManage,
+    newRouter
 };
diff --git a/src/i18n/langs/zh/menu.js b/src/i18n/langs/zh/menu.js
index e9f466a2c..a2aa5c5a6 100644
--- a/src/i18n/langs/zh/menu.js
+++ b/src/i18n/langs/zh/menu.js
@@ -129,7 +129,7 @@ export default {
         confirmRunToFrontStation: '确认运行至前方站'
     },
     passiveDialog: {
-        alarmDetailInformation: '级告警详细信息',
+        alarmDetailInformation: '级报警详细信息',
         lineName: '线路名称',
         unitName: '单位名称',
         moduleName: '模块名称',
diff --git a/src/i18n/langs/zh/newRouter.js b/src/i18n/langs/zh/newRouter.js
new file mode 100644
index 000000000..2c07c485d
--- /dev/null
+++ b/src/i18n/langs/zh/newRouter.js
@@ -0,0 +1,48 @@
+export default {
+    simulation: '仿真',
+    multiplayerSimulation: '多人仿真',
+    regulationSimulation: '监管仿真',
+    teachingManagement: '教学管理',
+    classroom: '班级管理',
+    student: '学生管理',
+    theory: '理论题目管理',
+    training: '实训教学管理',
+    exam: '考试管理',
+    lineDesign: '线路设计',
+    case: '案例管理',
+    SystemManagement: '系统管理',
+    SystemDataManagement: '系统数据管理',
+    dataDictionary: '数据字典',
+    SystemAccountManagement: '系统账户管理',
+    ThirdPartyAccounts: '第三方账户配置',
+    OnlineInformationManagement: '在线信息管理',
+    loginUser: '在线用户',
+    cacheDataManage: '缓存数据管理',
+    simulationManage: '仿真管理',
+    companyUserManage: '组织用户管理',
+    companyManage: '组织管理',
+    lineDataManage: '线路数据管理',
+    lineTypeManage: '线路类型管理',
+    linePacketManage: '线路分组管理',
+    teachingDataManage: '教学数据管理',
+    theoryData: '理论题数据管理',
+    trainingDataManage: '实训数据管理',
+    examData: '考试数据管理',
+    userTrainingDataManage: '用户实训数据管理',
+    userExamData: '用户考试数据管理',
+    projectDataManage: '项目数据管理',
+    projectManage: '项目管理',
+    projectConfig: '项目客户端配置',
+    projectDeviceManage: '项目设备管理',
+    permissionDataManage: '权限数据管理',
+    permissionManage: '权限管理',
+    authorityTransferManage: '权限分发管理',
+    userRulesManage: '用户权限管理',
+    fileManage: '文件管理',
+    frontResourceManage: '前端资源管理',
+    iscsPrerecordManage: 'ISCS预录管理',
+    XRVTI: '西安铁路职业技术学院',
+    GEMVC: '贵州装备制造职业学院',
+    JVCOEAI: '江苏电子信息职业学院',
+    functionManage: '功能管理'
+};
diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js
index 057939587..84975260f 100644
--- a/src/i18n/langs/zh/orderAuthor.js
+++ b/src/i18n/langs/zh/orderAuthor.js
@@ -116,5 +116,8 @@ export default {
     distributionAttribution: '分发归属',
     goodsAmount:'商品个数',
     operate:'操作',
-    orderNotPay:'该订单未支付'
+    orderNotPay:'该订单未支付',
+    updateTime: '更新时间',
+    oneClickSync: '一键同步',
+    ability: '功能'
 };
diff --git a/src/i18n/langs/zh/publish.js b/src/i18n/langs/zh/publish.js
index 55ad8fe50..0069d13de 100644
--- a/src/i18n/langs/zh/publish.js
+++ b/src/i18n/langs/zh/publish.js
@@ -105,7 +105,7 @@ export default {
     selectScope: '请选择范围',
     questionNumbers: '题数',
     allNumberTipOne: '此类型有',
-    allNumberTipTwo: '道题',
+    allNumberTipTwo: '题',
     scorePerQuestion: '每题分值',
     inputQuestionNumber: '请输入题数',
     inputQuestionNumberError: '输入的题数大于0',
diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js
index c5349e2fe..5ec3d2e6e 100644
--- a/src/i18n/langs/zh/router.js
+++ b/src/i18n/langs/zh/router.js
@@ -1,112 +1,114 @@
 export default {
-    homePage: '首页',
+	homePage: '首页',
 
-    designhomePage: '公共地图',
-    designUserPage: '个人地图',
-    newDesignUserPage: '地图绘制',
-    newDesignEditor: '编辑器',
-    newDesignEditorList: '图文列表',
-    newDesignDraftEditorList: '文章草稿',
-    uploadPdf: 'PDF上传',
-    fileManage:'文件管理',
+	designhomePage: '公共地图',
+	designUserPage: '个人地图',
+	newDesignUserPage: '地图绘制',
+	newDesignEditor: '编辑器',
+	newDesignEditorList: '图文列表',
+	newDesignDraftEditorList: '文章草稿',
+	uploadPdf: 'PDF上传',
+	fileManage: '文件管理',
 
-    mapManage: '地图管理',
-    skinManage: '皮肤管理',
-    mapDraw: '地图绘制',
-    runPlanManage: '运行图管理',
-    productEdit: '产品编辑',
+	mapManage: '地图管理',
+	skinManage: '皮肤管理',
+	mapDraw: '地图绘制',
+	runPlanManage: '运行图管理',
+	productEdit: '产品编辑',
 
-    lessaonManage: '课程管理',
-    trainingRecord: '实训录制',
-    taskManage: '任务管理',
-    trainingRule: '操作定义',
-    trainingManage: '实训管理',
-    lessonEdit: '课程编辑',
-    scriptManage: '剧本管理',
+	lessaonManage: '课程管理',
+	trainingRecord: '实训录制',
+	taskManage: '任务管理',
+	trainingRule: '操作定义',
+	trainingManage: '实训管理',
+	lessonEdit: '课程编辑',
+	scriptManage: '剧本管理',
 
-    teachSystem: '教学系统',
+	teachSystem: '教学系统',
 
-    examSystem: '考试系统',
+	examSystem: '考试系统',
 
-    demonstrationSystem: '仿真系统',
+	demonstrationSystem: '仿真系统',
 
-    dpSystem: '大屏系统',
+	dpSystem: '大屏系统',
 
-    planSystem: '琏计划',
+	planSystem: '琏计划',
 
-    replayManage: '回放管理',
+	replayManage: '回放管理',
 
-    permissionManage: '权限管理',
-    selfPermission: '我的权限',
+	permissionManage: '权限管理',
+	selfPermission: '我的权限',
 
-    pulishManage: '发布内容管理',
-    publishMapManage: '发布地图管理',
-    productStateManage: '产品状态管理',
-    publishLessonManage: '发布课程管理',
-    runPlanTemplateManage: '模板运行图管理',
-    runPlanCommonManage: '加载计划运行图管理',
-    runPlanEveryDayManage: '每日运行图管理',
-    examRuleManage: '试卷规则管理',
+	pulishManage: '发布内容管理',
+	publishMapManage: '发布地图管理',
+	productStateManage: '产品状态管理',
+	publishLessonManage: '发布课程管理',
+	runPlanTemplateManage: '模板运行图管理',
+	runPlanCommonManage: '加载计划运行图管理',
+	runPlanEveryDayManage: '每日运行图管理',
+	examRuleManage: '试卷规则管理',
 
-    orderAuthorityManage: '订单权限管理',
-    commodityManage: '商品管理',
-    orderManage: '订单管理',
-    authorityManage: '权限管理',
-    authorityTransferManage: '权限分发管理',
-    userRulesManage: '用户权限统计',
-    addCommodity: '添加商品',
-    addOrder: '添加订单',
-    addCoursePermissions: '添加课程权限',
+	orderAuthorityManage: '订单权限管理',
+	commodityManage: '商品管理',
+	orderManage: '订单管理',
+	authorityManage: '权限管理',
+	authorityTransferManage: '权限分发管理',
+	userRulesManage: '用户权限统计',
+	addCommodity: '添加商品',
+	addOrder: '添加订单',
+	addCoursePermissions: '添加课程权限',
 
-    systemManage: '系统管理',
-    dataDictionary: '数据字典',
-    dataDictionaryDetails: '数据字典明细',
-    userManage: '用户管理',
-    loginUserManage:'在线用户管理',
-    cacheManage: '缓存管理',
-    userTrainingManage: '用户实训统计',
-    userExamManage: '用户考试统计',
-    userSimulationManage: '用户仿真统计',
-    existingSimulation: '存在仿真管理',
+	systemManage: '系统管理',
+	dataDictionary: '数据字典',
+	dataDictionaryDetails: '数据字典明细',
+	userManage: '用户管理',
+	loginUserManage: '在线用户管理',
+	cacheManage: '缓存管理',
+	userTrainingManage: '用户实训统计',
+	userExamManage: '用户考试统计',
+	userSimulationManage: '用户仿真统计',
+	existingSimulation: '存在仿真管理',
 
-    ibpDraw: 'Ibp盘绘制',
-    trainingPlatform: '实训平台',
-    releaseApplication: '发布申请',
-    courseApplication: '课程发布申请',
-    scriptReleaseApplication: '剧本发布申请',
-    runGraphReleaseApplication: '运行图发布申请',
-    subsystemGeneration: '子系统生成',
-    newsBulletin: '消息公告',
-    notificationBulletin: '系统通知',
-    commandDictionary: '指令字典',
-    configLine: '线路管理',
-    deviceManage: '设备管理',
-    iscsDraw: 'Iscs绘制',
-    iscsSystem: 'Iscs系统',
-    studentManage: '学生管理',
-    competitionManage: '竞赛管理',
-    refereeJManage: '仿真管理',
-    homeJsxt: '首页',
-    examDetail: '考试详情',
-    raceManage: '竞赛管理',
-    recaList: '报名列表',
-    bankManage: '题库列表',
-    practiceManage:'实操列表',
-    sceneManage:'场景列表',
-    companyManage: '组织管理',
-    authorApply: '授权申请',
-    AuthorList: '授权列表',
-    questionsRuleManage: '出题规则管理',
-    preTheoryData: '理论导入预处理',
-    boardManage: '留言板管理',
-    publishIBPManage:'发布IBP盘管理',
-    publishISCSManage:'发布ISCS管理',
-    publishTrainingManage: '发布实训管理',
-    voiceTraining: '语音训练',
-    mapGroup: '地图分组',
-    drawingMange:'图纸管理',
-    projectServer: '项目域名',
-    audioResourcesManage: '音频资源管理',
-    iscsDeviceManage: 'ISCS设备管理',
-    iscsResourcesManage: 'ISCS资源管理'
-};
+	ibpDraw: 'Ibp盘绘制',
+	trainingPlatform: '实训平台',
+	releaseApplication: '发布申请',
+	courseApplication: '课程发布申请',
+	scriptReleaseApplication: '剧本发布申请',
+	runGraphReleaseApplication: '运行图发布申请',
+	subsystemGeneration: '子系统生成',
+	newsBulletin: '消息公告',
+	notificationBulletin: '系统通知',
+	commandDictionary: '指令字典',
+	configLine: '线路管理',
+	deviceManage: '设备管理',
+	iscsDraw: 'Iscs绘制',
+	iscsSystem: 'Iscs系统',
+	studentManage: '学生管理',
+	competitionManage: '竞赛管理',
+	refereeJManage: '仿真管理',
+	homeJsxt: '首页',
+	examDetail: '考试详情',
+	raceManage: '竞赛管理',
+	recaList: '报名列表',
+	bankManage: '题库列表',
+	practiceManage: '实操列表',
+	sceneManage: '场景列表',
+	companyManage: '组织管理',
+	authorApply: '授权申请',
+	AuthorList: '授权列表',
+	questionsRuleManage: '出题规则管理',
+	preTheoryData: '理论导入预处理',
+	boardManage: '留言板管理',
+	publishIBPManage: '发布IBP盘管理',
+	publishISCSManage: '发布ISCS管理',
+	publishTrainingManage: '发布实训管理',
+	voiceTraining: '语音训练',
+	mapGroup: '地图分组',
+	drawingMange: '图纸管理',
+	projectServer: '项目域名',
+	audioResourcesManage: '音频资源管理',
+	iscsDeviceManage: 'ISCS设备管理',
+	iscsResourcesManage: 'ISCS资源管理',
+	projectManage: '项目管理',
+	frontProjectConfigManage: '前端项目配置管理',
+}
diff --git a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
index 7efe6acf5..c73a83689 100644
--- a/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
+++ b/src/jlmap3d/jl3dpassflow/connect/passflowconnect.js
@@ -3,183 +3,183 @@ import { getToken } from '@/utils/auth';
 import store from '@/store/index';
 
 // 定于仿真socket接口
-export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passerStation,passerAi) {
-	const scope = this;
-	this.teststomp = new StompClient();
+export function PassflowConnect(deviceaction, toptrain, downtrain, routegroup, passerStation, passerAi) {
+    const scope = this;
+    this.teststomp = new StompClient();
 
-	// let topic = '/user/queue/simulation/jl3d/'+routegroup;
-	let topic = '/user/queue/simulation/'+ routegroup +'/jl3d';
-	let header = {'X-Token': getToken() };
+    // let topic = '/user/queue/simulation/jl3d/'+routegroup;
+    const topic = '/user/queue/simulation/' + routegroup + '/jl3d';
+    const header = {'X-Token': getToken() };
 
-	socketon(topic);
+    socketon(topic);
 
-	function socketon(topic) {
-		try {
-			scope.teststomp.subscribe(topic, callback, header);
-		} catch (error) {
-			console.error('websocket订阅失败');
-		}
+    function socketon(topic) {
+        try {
+            scope.teststomp.subscribe(topic, callback, header);
+        } catch (error) {
+            console.error('websocket订阅失败');
+        }
 
-	};
+    }
 
-	this.socketoff = function(topic) {
-		scope.teststomp.unsubscribe(topic);
-	};
+    this.socketoff = function(topic) {
+        scope.teststomp.unsubscribe(topic);
+    };
 
-	// 仿真socket接口回调函数
-	function callback(Response) {
-		const data = JSON.parse(Response.body);
+    // 仿真socket接口回调函数
+    function callback(Response) {
+        const data = JSON.parse(Response.body);
 
-		if(data.type == "DeviceCtrl_3D"){
-			if(data.body.type == "PSD"){
-				if(data.body.code == passerStation.nowStation.toppsd){
-					if(data.body.command == 'G'){
+        if (data.type == 'DeviceCtrl_3D') {
+            if (data.body.type == 'PSD') {
+                if (data.body.code == passerStation.nowStation.toppsd) {
+                    if (data.body.command == 'G') {
 
-						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")
-						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.command == 'G'){
-						deviceaction.down.action.reset();
-						deviceaction.down.action.time = deviceaction.down.action._clip.duration;
-						deviceaction.down.action.timeScale = -1;
-						deviceaction.down.action.play();
-					}else{
-						passerAi.passerout("down");
-						deviceaction.down.action.reset();
-						deviceaction.down.action.time = 0;
-						deviceaction.down.action.timeScale = 1;
-						deviceaction.down.action.play();
-					}
+                        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');
+                        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.command == 'G') {
+                        deviceaction.down.action.reset();
+                        deviceaction.down.action.time = deviceaction.down.action._clip.duration;
+                        deviceaction.down.action.timeScale = -1;
+                        deviceaction.down.action.play();
+                    } else {
+                        passerAi.passerout('down');
+                        deviceaction.down.action.reset();
+                        deviceaction.down.action.time = 0;
+                        deviceaction.down.action.timeScale = 1;
+                        deviceaction.down.action.play();
+                    }
 
-				}
-			}
-			if(data.body.type == "TRAIN_DOOR"){
-				if(toptrain.nowcode == data.body.trainCode){
+                }
+            }
+            if (data.body.type == 'TRAIN_DOOR') {
+                if (toptrain.nowcode == data.body.trainCode) {
 
-					if(data.body.command == 'G'){
-						closetraindoor(toptrain,data.body.code,"top");
+                    if (data.body.command == 'G') {
+                        closetraindoor(toptrain, data.body.code, 'top');
 
-					}else{
-						opentraindoor(toptrain,data.body.code,"top");
+                    } else {
+                        opentraindoor(toptrain, data.body.code, 'top');
 
-					}
+                    }
 
-				}
-				if(downtrain.nowcode == data.body.trainCode){
-					// console.log(data.body);
-					if(data.body.command == 'G'){
-						closetraindoor(downtrain,data.body.code,"down");
+                }
+                if (downtrain.nowcode == data.body.trainCode) {
+                    // console.log(data.body);
+                    if (data.body.command == 'G') {
+                        closetraindoor(downtrain, data.body.code, 'down');
 
-					}else{
-						opentraindoor(downtrain,data.body.code,"down");
+                    } else {
+                        opentraindoor(downtrain, data.body.code, 'down');
 
-					}
+                    }
 
-				}
-			}
-		}
+                }
+            }
+        }
 
-		if(data.type == "TrainRun_3D"){
+        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;
-					}
-					toptrain.position.copy(passerStation.nowStation.topcurve.getPointAt(data.body[i].offset));
+            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;
+                    }
+                    toptrain.position.copy(passerStation.nowStation.topcurve.getPointAt(data.body[i].offset));
 
-					// }
+                    // }
 
-				}else{
-					if(downtrain.nowcode == data.body[i].code){
-						toptrain.position.x -= 1;
-					}
-				}
+                } else {
+                    if (downtrain.nowcode == data.body[i].code) {
+                        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;
-					}
+                if (data.body[i].section == passerStation.nowStation.downsection) {
+                    if (downtrain.nowcode != data.body[i].code) {
+                        downtrain.nowcode = data.body[i].code;
+                    }
 
-					downtrain.position.copy(passerStation.nowStation.downcurve.getPointAt(data.body[i].offset));
+                    downtrain.position.copy(passerStation.nowStation.downcurve.getPointAt(data.body[i].offset));
 
-				}else{
-					if(downtrain.nowcode == data.body[i].code){
-						downtrain.position.x += 1;
-					}
-				}
-			}
-		}
-		if(data.type == 'Simulation_Over') {
-			store.dispatch('LogOut').then(() => {
-				location.reload();
-			});
-		}
-	}
-	let actions;
+                } else {
+                    if (downtrain.nowcode == data.body[i].code) {
+                        downtrain.position.x += 1;
+                    }
+                }
+            }
+        }
+        // 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;
-			}
+    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.top;
+            }
+        } else {
+            if (doorcode == '1') {
+                actions = train.action.top;
+            }
 
-			if(doorcode == "2"){
-				actions = train.action.down;
-			}
-		}
+            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){
+        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;
-		}
+        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();
-		}
+        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/jl3drailwaydrive/jl3drailwaydrive.js b/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js
index 740b14338..0ae68d9ec 100644
--- a/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js
+++ b/src/jlmap3d/jl3drailwaydrive/jl3drailwaydrive.js
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { JL3D_LOCAL_STATIC,BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
 // 模型loader
 import { AssetLoader } from '@/jlmap3d/jl3drailwaydrive/loader/AssetLoader.js';
 import {DDSLoader} from '@/jlmap3d/main/loaders/DDSLoader.js';
@@ -67,8 +67,9 @@ export function JLmapDriving(dom,data,mapId,storemod,translation,routegroup,proj
 	//let camera = SetCamera(dom);
 	// 定义场景(渲染容器)
 	let scene = SetScene(project);
+	// https://joylink.club/oss/joylink
 	scene.background = new THREE.CubeTextureLoader()
-				.setPath( 'https://joylink.club/oss/joylink/PICTURE/2021-06-15/' )
+				.setPath( BASE_ASSET_API + '/PICTURE/2021-06-15/' )
 				.load( [ '18-75117.jpg', '17-78286.jpg', '19-62689.jpg', '15-95146.jpg', '16-99183.jpg', '14-94914.jpg' ] );
 
 	let meshCloud;
diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
index 3a6cdffb6..788b3d473 100644
--- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
+++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js
@@ -570,7 +570,6 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) {
 							trainlisttest.list[code].position.y = 0;
 							// trainlisttest.list[code].progress = 0;
 							trainlisttest.list[code].dispose = "0";
-							debugger
 							trainlisttest.list[code].nowcode = data.body.deviceList[i].section;
 							trainlisttest.list[code].nextcode = null;
 							trainlisttest.list[code].curve = null;
diff --git a/src/jmapNew/map.js b/src/jmapNew/map.js
index 48d773580..6f2a12293 100644
--- a/src/jmapNew/map.js
+++ b/src/jmapNew/map.js
@@ -51,6 +51,7 @@ class Jlmap {
         this.isUpdateShowTrainList = false;
         this.isUpdateRunLineTrain = false;
         this._disposeFlag = false;
+        if (this.methods.initJlmap instanceof Function) { this.methods.initJlmap(); }
     }
 
     // 初始化属性有鼠标事件 缩放等
@@ -119,7 +120,7 @@ class Jlmap {
         this.$options.scaleIndex = parseInt((scaling / 0.05).toFixed());
         this.$painter.updateTransform({ scaleRate: scaling, offsetX: origin ? origin.x : 0, offsetY: origin ? origin.y : 0 });
     }
-    setMap(map, mapDevice, logicData) {
+    setMap(map, mapDevice, logicData, repaint = true) {
         // 保存皮肤类型
         if (map.skinVO) {
             this.lineCode = map.skinVO.code;
@@ -143,7 +144,11 @@ class Jlmap {
         if (this.methods.dataLoaded instanceof Function) { this.methods.dataLoaded(this.mapDevice); }
 
         // 初次渲染视图
-        this.$painter.repaint(this.mapDevice);
+        if (repaint) {
+            this.$painter.repaint(this.mapDevice);
+        } else {
+            this.render(Object.values(this.mapDevice));
+        }
 
         // 视图加载完成 回调
         if (this.methods.viewLoaded instanceof Function) { this.methods.viewLoaded(this.mapDevice); }
@@ -427,7 +432,7 @@ class Jlmap {
             const type = elem._type;
             const oDevice = this.mapDevice[code] || deviceFactory(type, elem, this.showConfig);
             oDevice.showMode = showMode;
-            oDevice.instance && oDevice.model && oDevice.instance.setState(oDevice.model);
+            oDevice.instance && oDevice.instance.model && oDevice.instance.setState(oDevice.instance.model);
         });
         this.$painter.$transformHandle.revisibleAll();
     }
diff --git a/src/jmapNew/parser/parser-graph.js b/src/jmapNew/parser/parser-graph.js
index a1fdfc591..3c80b6032 100644
--- a/src/jmapNew/parser/parser-graph.js
+++ b/src/jmapNew/parser/parser-graph.js
@@ -17,10 +17,19 @@ export function parser(data, skinCode, showConfig) {
     var mapDevice = {};
     var propConvert = skinCode ? Vue.prototype.$theme.loadPropConvert(skinCode) : null;
     if (data) {
+        const centralStationList = [];
         zrUtil.each(data.stationList || [], elem => {
+            if (elem.centralized) {
+                centralStationList.push(elem);
+            }
             mapDevice[elem.code] = createDevice(deviceType.Station, elem, propConvert, showConfig);
         }, this);
-
+        zrUtil.each(centralStationList, elem => {
+            mapDevice[elem.code].stationCode = elem.code;
+            zrUtil.each(elem.chargeStationCodeList || [], item => {
+                mapDevice[item].stationCode = elem.code;
+            });
+        });
         zrUtil.each(data.sectionList || [], elem => {
             mapDevice[elem.code] = createDevice(deviceType.Section, elem, propConvert, showConfig);
             elem = propConvert.initPrivateProps(elem);
diff --git a/src/jmapNew/shape/graph/Line/index.js b/src/jmapNew/shape/graph/Line/index.js
index 8403236b4..1dbbe14c7 100644
--- a/src/jmapNew/shape/graph/Line/index.js
+++ b/src/jmapNew/shape/graph/Line/index.js
@@ -105,7 +105,7 @@ export default class Line2 extends Group {
             this.segment && this.segment.hide();
             this.viceSegment && this.viceSegment.hide();
         } else {
-            this.setLineType(model.type);
+            model && this.setLineType(model.type);
         }
     }
     recover() {
diff --git a/src/jmapNew/shape/graph/Psd/EHorizontal2Door.js b/src/jmapNew/shape/graph/Psd/EHorizontal2Door.js
index 33cff02aa..e6d2ba7e6 100644
--- a/src/jmapNew/shape/graph/Psd/EHorizontal2Door.js
+++ b/src/jmapNew/shape/graph/Psd/EHorizontal2Door.js
@@ -84,7 +84,7 @@ class EHorizontal2Door extends Group {
                 this.stand2.setStyle('fill', style.Psd.horizontal2Door.defaultColor);
             }
         }
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.stand1.setStyle('fill', '#7F7F7F');
             this.stand2.setStyle('fill', '#7F7F7F');
         }
diff --git a/src/jmapNew/shape/graph/Psd/ERectDoor.js b/src/jmapNew/shape/graph/Psd/ERectDoor.js
index 227cd39f9..716ab0781 100644
--- a/src/jmapNew/shape/graph/Psd/ERectDoor.js
+++ b/src/jmapNew/shape/graph/Psd/ERectDoor.js
@@ -51,7 +51,7 @@ class ERect2Door extends Group {
                 this.psd.setStyle('fill', style.Psd.rectDoor.defaultColor);
             }
         }
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.psd.setStyle('fill', '#7F7F7F');
         }
     }
diff --git a/src/jmapNew/shape/graph/Section/index.js b/src/jmapNew/shape/graph/Section/index.js
index c05475ad6..26790f43f 100644
--- a/src/jmapNew/shape/graph/Section/index.js
+++ b/src/jmapNew/shape/graph/Section/index.js
@@ -578,7 +578,7 @@ export default class Section extends Group {
             // 区段延时解锁
             model.remain > 0 && this.delayUnlock();
             // 设置灰显
-            if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+            if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
                 this.setAshShow();
             }
             // 设置脱轨器
@@ -618,12 +618,20 @@ export default class Section extends Group {
 
     /** 计算提示位置*/
     getShapeTipPoint() {
-        const rect = this.getBoundingRect();
-        const distance = this.style.Section.line.width / 2;
-        return {
-            x: rect.x + rect.width / 2,
-            y: rect.y + rect.height / 2.7 - distance
-        };
+        if (this.model.curve) {
+            const rect = this.name.getBoundingRect();
+            return {
+                x: rect.x + rect.width / 2,
+                y: rect.y + rect.height / 2.7
+            };
+        } else {
+            const rect = this.getBoundingRect();
+            const distance = this.style.Section.line.width / 2;
+            return {
+                x: rect.x + rect.width / 2,
+                y: rect.y + rect.height / 2.7 - distance
+            };
+        }
     }
 
     getBoundingRect() {
diff --git a/src/jmapNew/shape/graph/Signal/index.js b/src/jmapNew/shape/graph/Signal/index.js
index 5f5d4544d..b74acd722 100644
--- a/src/jmapNew/shape/graph/Signal/index.js
+++ b/src/jmapNew/shape/graph/Signal/index.js
@@ -1210,7 +1210,7 @@ class Signal extends Group {
             }
             this.model.virtual && this.sigBack && this.sigBack.show();
             // 设置灰显
-            if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+            if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
                 this.setAshShow();
             }
 
@@ -1218,7 +1218,7 @@ class Signal extends Group {
             if (this.style.Signal.text.conflictColor && model.checkConflict) {
                 this.sigName.setColor(this.style.Signal.text.conflictColor);
             }
-            if (store.state.training.prdType === '01') {
+            if (store.state.map.picture === 'localWork') {
                 this.lowButton && this.lowButton.show();
             }
         }
diff --git a/src/jmapNew/shape/graph/Station/EStationText.js b/src/jmapNew/shape/graph/Station/EStationText.js
index 672c8922d..7d4c96574 100644
--- a/src/jmapNew/shape/graph/Station/EStationText.js
+++ b/src/jmapNew/shape/graph/Station/EStationText.js
@@ -42,8 +42,8 @@ class EStationText extends Group {
                 z: this.model.z,
                 silent: !model.visible || false,
                 style: {
-                    x: model.subheadPosition.x,
-                    y: model.subheadPosition.y,
+                    x: model.computedSubheadTextPosition.x,
+                    y: model.computedSubheadTextPosition.y,
                     fontWeight: model.fontWeight,
                     fontSize: model.subheadFont || 18,
                     fontFamily: style.fontFamily,
diff --git a/src/jmapNew/shape/graph/Station/index.js b/src/jmapNew/shape/graph/Station/index.js
index 96fe16def..4061db974 100644
--- a/src/jmapNew/shape/graph/Station/index.js
+++ b/src/jmapNew/shape/graph/Station/index.js
@@ -34,10 +34,12 @@ export default class Station extends Group {
             this.computedPosition = pictureDevice.position;
             this.computedTurnBackPoint = { x: model.turnBackPoint ? model.turnBackPoint.x + offsetX : 0, y: model.turnBackPoint ? model.turnBackPoint.y + offsetY : 0 };
             this.computedControlModePoint = { x: model.controlModePoint.x + offsetX, y: model.controlModePoint.y + offsetY };
+            this.computedSubheadTextPosition = { x: model.subheadPosition ? model.subheadPosition.x + offsetX : 0, y: model.subheadPosition ? model.subheadPosition.y + offsetY : 0 };
         } else {
             this.computedPosition = model.position;
             this.computedTurnBackPoint = model.turnBackPoint;
             this.computedControlModePoint = model.controlModePoint;
+            this.computedSubheadTextPosition = model.subheadPosition;
         }
         this.z = 40;
         this.model = model;
@@ -59,6 +61,7 @@ export default class Station extends Group {
             'stationText': EStationText // 车站名称   （普通站台样式）
         };
         model.computedPosition = this.computedPosition;
+        model.computedSubheadTextPosition = this.computedSubheadTextPosition;
         // 遍历当前线路下的绘图元素 组合模式
         traverseLineElements(style.Station, elementTypeList, model, style, this);
 
diff --git a/src/jmapNew/shape/graph/StationStand/ETrainSetButton.js b/src/jmapNew/shape/graph/StationStand/ETrainSetButton.js
index cd9cddf84..967b742be 100644
--- a/src/jmapNew/shape/graph/StationStand/ETrainSetButton.js
+++ b/src/jmapNew/shape/graph/StationStand/ETrainSetButton.js
@@ -55,7 +55,7 @@ class ETrainSetButton extends Group {
     }
 
     setState(model) {
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.setColor('#7F7F7F');
         }
     }
diff --git a/src/jmapNew/shape/graph/StationStand/index.js b/src/jmapNew/shape/graph/StationStand/index.js
index 12c635464..8c535b354 100644
--- a/src/jmapNew/shape/graph/StationStand/index.js
+++ b/src/jmapNew/shape/graph/StationStand/index.js
@@ -159,7 +159,7 @@ class StationStand extends Group {
         this.downDetainLamp && this.downDetainLamp.hide();
     }
     setScreenDoorOpenStatus(model) {
-        if (!this.model.noStatus && !(this.model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (!this.model.noStatus && !(this.model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
             this.gapStand && this.gapStand.setState(model);
         }
     }
@@ -183,7 +183,7 @@ class StationStand extends Group {
             currentTypeList.forEach(element => {
                 this[element].setState(model);
             });
-            if (store.state.training.prdType === '01') {
+            if (store.state.map.picture === 'localWork') {
                 this.stopJumpLamp && this.stopJumpLamp.show();
                 this.cancelStopJumpLamp && this.cancelStopJumpLamp.show();
                 this.upDetainLamp && this.upDetainLamp.show();
diff --git a/src/jmapNew/shape/graph/StationStand/safeStand/EGapStand.js b/src/jmapNew/shape/graph/StationStand/safeStand/EGapStand.js
index 8201de20d..86ef8f30f 100644
--- a/src/jmapNew/shape/graph/StationStand/safeStand/EGapStand.js
+++ b/src/jmapNew/shape/graph/StationStand/safeStand/EGapStand.js
@@ -110,7 +110,7 @@ class EGapStand extends Group {
                 this.setClose();
             }
         }
-        if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+        if (model.noStatus || (model.atsNoStatus && store.state.map.picture === '02')) {
             this.setColor('#7F7F7F');
         }
     }
diff --git a/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js b/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js
index 57f8cbd09..a3a46fe53 100644
--- a/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js
+++ b/src/jmapNew/shape/graph/StationStand/safeStand/ESolidStand.js
@@ -1,3 +1,4 @@
+import store from '@/store/index';
 import Group from 'zrender/src/container/Group';
 import Rect from 'zrender/src/graphic/shape/Rect';
 import Text from 'zrender/src/graphic/Text';
@@ -52,16 +53,19 @@ class ESolidStand extends Group {
             this.holdTrain.hide();
         }
 
-        const path = window.location.href;
-        if (path.includes('/practiceDisplay')) {
+        // const path = window.location.href;
+        // const search = window.location.search;
+        // if (path.includes('/display/demon') && search.includes('project=bjd')) {
+        if (store.state.map.picture == 'largePassengerView') {
             // 文字描述
+            const modelNum = model.num ? model.num : 0;
             this.arrowText = new Text({
                 zlevel: this.model.zlevel,
                 z: this.model.z + 10,
                 style: {
                     x: computedPosition.x + 35,
                     y: computedPosition.y - 20,
-                    text:  `${'站台人数: ' + model.num ? model.num : 0}`,
+                    text:  '站台人数: ' + modelNum,
                     textFill: '#000',
                     textAlign: 'left',
                     textFont: 12 + 'px consolas',
@@ -69,6 +73,7 @@ class ESolidStand extends Group {
                     textBackgroundColor: style.tipBackgroundColor
                 }
             });
+            console.log('站台人数: ', modelNum);
             this.add(this.arrowText);
             this.arrowText.hide();
             this.on('mouseover', () => {
@@ -123,8 +128,10 @@ class ESolidStand extends Group {
 
     setState(model) {
         const style = this.model.style;
-        const path = window.location.href;
-        if (!path.includes('/practiceDisplay')) {
+        // const path = window.location.href;
+        // const search = window.location.search;
+        // if (!(path.includes('/display/demon') && search.includes('project=bjd'))) {
+        if (store.state.map.picture != 'largePassengerView') {
             // 列车跳停
             model.assignSkip && this.setColor(style.StationStand.solidStand.designatedJumpStopColor);
             // 全部跳停
diff --git a/src/jmapNew/shape/graph/Switch/ESwLnversion.js b/src/jmapNew/shape/graph/Switch/ESwLnversion.js
index a2e30332c..303bae69c 100644
--- a/src/jmapNew/shape/graph/Switch/ESwLnversion.js
+++ b/src/jmapNew/shape/graph/Switch/ESwLnversion.js
@@ -69,7 +69,7 @@ class ESwLnversion extends Group {
 
     animateStyle(cb) {
         this.eachChild((child) => {
-            cb(child);
+            child && cb(child);
         });
     }
 
diff --git a/src/jmapNew/shape/graph/Switch/index.js b/src/jmapNew/shape/graph/Switch/index.js
index 3657c219a..044ea66f4 100644
--- a/src/jmapNew/shape/graph/Switch/index.js
+++ b/src/jmapNew/shape/graph/Switch/index.js
@@ -877,7 +877,7 @@ export default class Switch extends Group {
                 const sectionC = this.mapDevice[switchModel.sectionCCode];
                 sectionC && sectionC.instance && sectionC.instance.handleSwitchSection(sectionC);
             }
-            if (model.noStatus || (model.atsNoStatus && store.state.training.prdType == '02')) {
+            if (model.noStatus || (model.atsNoStatus && store.state.map.picture === 'dispatchWork')) {
                 this.setAshShow();
             }
             !model.auto && this.artificialArc && this.artificialArc.show();
diff --git a/src/jmapNew/shape/graph/Train/EMouse.js b/src/jmapNew/shape/graph/Train/EMouse.js
index 074f2da9a..502de5ffd 100644
--- a/src/jmapNew/shape/graph/Train/EMouse.js
+++ b/src/jmapNew/shape/graph/Train/EMouse.js
@@ -104,11 +104,10 @@ class EMouse extends Group {
             RM: 'IL'
         };
         // \nNumber of people: ${this.device.model.num ? this.device.model.num : 0}
-        const path = window.location.href;
         const stationNames = new Map(store.state.map.map.stationList.map(s=>[s.code, s.name]));
         if (getSessionStorage('project') === 'yjddzh') {
             text = `列车号：${this.device.model.groupNumber}\n位置：${this.device.model.locationKM}\n速度：${this.device.model.speed || 0} km/h\n方向：${this.device.model.right == 1 ? '下行' : '上行'}`;
-        } else if (!path.includes('/practiceDisplay')) {
+        } else if (store.state.map.picture != 'largePassengerView') {
             if (LangStorage.getLang() == 'en') {
                 text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
             } else {
@@ -119,7 +118,7 @@ class EMouse extends Group {
                 }
             }
         } else {
-            text = `${'车内人数: ' + this.device.model.num}`;
+            text = `${'车内人数: ' + this.device.model.num || 0}`;
         }
 
         const trainTip = this.device.style.Train.common.trainTip;
@@ -140,7 +139,8 @@ class EMouse extends Group {
                 }
             });
 
-            if (path.includes('/practiceDisplay')) {
+            // if (path.includes('/display/demon') && search.includes('project=bjd')) {
+            if (store.state.map.picture == 'largePassengerView') {
                 this.arrowText.setStyle('textFont', 12 + 'px consolas');
                 this.arrowText.setStyle('y', this.device.model.point.y + 15);
                 this.arrowText.setStyle('x', this.device.model.point.x + 55);
diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js
index 1df23483b..05fa8fb33 100644
--- a/src/jmapNew/shape/graph/Train/TrainBody.js
+++ b/src/jmapNew/shape/graph/Train/TrainBody.js
@@ -533,7 +533,7 @@ export default class TrainBody extends Group {
             this.textTrainTrip.dirty();
         }
         if (this.textTrainGroup) {
-            if (store.state.training.prdType === '10') {
+            if (store.state.map.picture === 'emergency') {
                 widthText = 0;
             }
             this.textTrainGroup.attr({
diff --git a/src/jmapNew/shape/graph/Train/index.js b/src/jmapNew/shape/graph/Train/index.js
index 7c8c6b21f..e9686ae9c 100644
--- a/src/jmapNew/shape/graph/Train/index.js
+++ b/src/jmapNew/shape/graph/Train/index.js
@@ -21,7 +21,7 @@ export default class Train extends Group {
         this.fontSize = model.nameFontSize || style.Train.common.trainTextFontSize;
         this.newScale = this.fontSize / style.Train.common.trainTextFontSize;
         this.nameFormat = model.nameFormat || style.Train.trainBody.trainNameFormat;
-        if (store.state.training.prdType === '10') {
+        if (store.state.map.picture === 'emergency') {
             this.nameFormat = 'groupNumber';
         } else if (style.Train.trainBody.specialTrainType.length > 0) {
             style.Train.trainBody.specialTrainType.some((item) => {
@@ -40,7 +40,7 @@ export default class Train extends Group {
     _computed() {
         const model = this.model;
         const style = this.style;
-        if (model.trainWindowModel) {
+        if (model.trainWindowModel && model.trainWindowModel.instance) {
             const amendData = store.getters['map/amendPoints'](model.trainWindowModel.code);
             if (amendData) {
                 model.trainWindowModel.instance.computedPoint = amendData.position;
@@ -391,8 +391,10 @@ export default class Train extends Group {
             //     this.setDriveMode(model.driveMode);
             // }
             this.setRunStatus(model.stop, flag);
-            const path = window.location.href;
-            if (!path.includes('/practiceDisplay')) {
+            // const path = window.location.href;
+            // const search = window.location.search;
+            // if (!(path.includes('/display/demon') && search.includes('project=bjd'))) {
+            if (store.state.map.picture != 'largePassengerView') {
                 if (this.style.Train.common.trainHeadColorChangeMode) {
                     this.setDriveMode(model.driveMode + model.runLevel);
                 } else {
@@ -415,7 +417,8 @@ export default class Train extends Group {
             if (style.Section.trainPosition.display) {
                 this.updateSection(object);
             }
-            if (path.includes('/practiceDisplay')) {
+            // if (path.includes('/display/demon') && search.includes('project=bjd')) {
+            if (store.state.map.picture == 'largePassengerView') {
                 this.handlePassagerColor(model.num);
             }
             if (style.Train.trainBody.trainBodyFaultFlashColor) {
diff --git a/src/jmapNew/shape/graph/TrainWindow/EMouse.js b/src/jmapNew/shape/graph/TrainWindow/EMouse.js
index 0d790f839..297607a32 100644
--- a/src/jmapNew/shape/graph/TrainWindow/EMouse.js
+++ b/src/jmapNew/shape/graph/TrainWindow/EMouse.js
@@ -4,34 +4,25 @@ export default class EMouse {
     }
 
     mouseover(e) {
-        if (this.device.prdType) {
-            this.device.setVisible(true);
-            const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
-                instance.mouseEvent.mouseEnter(e);
-            }
+        this.device.setVisible(true);
+        const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
+        if (instance && instance.mouseEvent && instance.mouseEvent.mouseover) {
+            instance.mouseEvent.mouseEnter(e);
         }
     }
 
     mouseout(e) {
-        if (this.device.prdType) {
-            this.device.setVisible(false);
-            const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
-            if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
-                instance.mouseEvent.mouseLeave(e);
-            }
+        this.device.setVisible(false);
+        const instance = this.device.getInstanceByCode(this.device.model.sectionCode);
+        if (instance && instance.mouseEvent && instance.mouseEvent.mouseout) {
+            instance.mouseEvent.mouseLeave(e);
         }
     }
 
     mouseEnter() {
-        // if (this.device.prdType) {
-        //     this.device.setVisible(true);
-        // }
     }
 
     mouseLeave() {
-        if (this.device.prdType ) {
-            this.device.setVisible(false);
-        }
+        this.device.setVisible(false);
     }
 }
diff --git a/src/jmapNew/shape/graph/TrainWindow/index.js b/src/jmapNew/shape/graph/TrainWindow/index.js
index 3329eddc4..f24e66fe4 100644
--- a/src/jmapNew/shape/graph/TrainWindow/index.js
+++ b/src/jmapNew/shape/graph/TrainWindow/index.js
@@ -23,13 +23,12 @@ class TrainWindow extends Group {
         this.model = model;
         this.style = style;
         this.z = 9;
-        this.prdType = store.state.training.prdType;
         this.create();
         this.createMouseEvent();
         this.setState(model);
     }
     create() {
-        if (this.prdType !== '01') {
+        if (store.state.map.picture !== 'localWork') {
             this.createTrainWindow();
         }
     }
@@ -79,11 +78,9 @@ class TrainWindow extends Group {
     }
 
     setState(model) {
-        // if (!this.isShowShape) return;
-        if (this.model.showMode == '01' || !this.style.TrainWindow.show) {
+        const path = window.location.href;
+        if (!path.includes('lineDesign') && (this.model.showMode == '01' || !this.style.TrainWindow.show)) {
             this.eachChild(item => { item.hide(); });
-        // } else if (!store.getters['map/checkDeviceShow'](this._code)) {
-        //     this.trainRect && this.trainRect.hide();
         } else if (model._tro) {
             this.trainRect && this.trainRect.hide();
         } else {
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
index 40bdfdea3..b39cc9ecd 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
@@ -318,7 +318,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.type = 'password';
@@ -346,7 +346,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -369,7 +369,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -393,7 +393,7 @@ export default {
                 this.stepNum = 3;
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.type = 'text';
@@ -422,7 +422,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
index 9021a248b..7496e0f09 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue
@@ -108,7 +108,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -126,7 +126,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 2e5cec984..1bb7a5041 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue
index ce2510a80..c6e656b77 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue
@@ -164,7 +164,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.password.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 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 3db6acf9e..7e8fcbb9f 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue
@@ -75,7 +75,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
index d25914d36..3ad110c38 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/routeSelection.vue
@@ -210,7 +210,7 @@ export default {
                         val: row.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -237,7 +237,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
index 511f5a541..57a895825 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
@@ -153,7 +153,7 @@ export default {
             };
             this.strategy = row.value;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -204,7 +204,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
index 23ef80cbd..607bf2370 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
@@ -239,7 +239,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -255,7 +255,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 35dc51e08..721e3bf81 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
@@ -256,7 +256,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -283,7 +283,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -313,7 +313,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -344,7 +344,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -362,7 +362,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 855283f97..88da5f81b 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
@@ -88,7 +88,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -105,7 +105,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 bb8ada826..b9884bb18 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
@@ -107,7 +107,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -124,7 +124,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 5a868ad19..87efe306d 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
@@ -121,7 +121,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 a36d08900..d03b88b25 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
@@ -117,7 +117,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +134,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -155,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 04dfa92b5..b67e2647a 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -145,7 +145,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 bffcb78f0..0c73ed882 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
@@ -121,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 91b1de513..711614ec0 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
@@ -115,7 +115,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -132,7 +132,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 861288b9a..39036153b 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
@@ -121,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 0d7d9bebb..6b47b529a 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
@@ -133,7 +133,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6ca4b3723..5a85d06b4 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
@@ -121,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 a6c59a776..01818b16b 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
@@ -103,7 +103,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -118,7 +118,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -135,7 +135,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2921c611d..9e508e6de 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
@@ -105,7 +105,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -120,7 +120,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -137,7 +137,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..9e3fff807
--- /dev/null
+++ b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenu.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'dispatchWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'dispatchWork'" />
+    <menu-limit ref="menuLimit" :selected="selected" :work="'dispatchWork'" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="beijing-01__systerm" />
+    <passive-timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './dispatchWorkMenuBar';
+import MenuLimit from './menuLimit';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'DispatchWorkMenus',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        MenuLimit,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {},
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            this.$refs['menuSignal'].setRouteSignal();
+        });
+        this.$root.$on('dialogOpen', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.mouseEvent.mouseover();
+            }
+        });
+
+        this.$root.$on('dialogClose', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.__down = false;
+                this.selected.instance.mouseEvent.mouseout();
+                this.$jlmap.clearEvent();
+            }
+        });
+    },
+    beforeDestroy() {
+        this.$root.$off('dialogOpen');
+        this.$root.$off('dialogClose');
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.beijing-01__systerm {
+	overflow: hidden !important;
+}
+
+.beijing-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__header {
+	padding: 10px;
+	height: 26px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__body {
+	padding: 10px;
+	margin: 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 6px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	filter: blur(7px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(190, 190, 190, 0.8);
+	z-index: -1;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 5px;
+	right: 5px;
+	line-height: 18px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.beijing-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.beijing-01__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.beijing-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.beijing-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.beijing-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.beijing-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.beijing-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.beijing-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.beijing-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.beijing-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.beijing-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.beijing-01__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.beijing-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.beijing-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.beijing-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.beijing-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..66a15395f
--- /dev/null
+++ b/src/jmapNew/theme/beijing_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,849 @@
+<template>
+  <div id="menuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li
+            v-if="handleShow(item)"
+            :id="getDomId(item)"
+            :key="i"
+            class="nav-li"
+            @click.stop="selectedClassA(item, i)"
+          >
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template v-if="child.children && child.children.length > 0">
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="selectedClassB(child, j)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
+                          <span class="status">&ensp;</span>
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li
+                          v-else-if="grandchild.show"
+                          :id="getDomId(grandchild)"
+                          :key="k"
+                          class="menu-li"
+                          @click.stop="hookClick(grandchild)"
+                        >
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else-if="child.show"
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="hookClick(child)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+    <station-control ref="stationControl" />
+    <detain-train-contorl ref="detainTrainContorl" />
+    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
+    <notice-info ref="noticeInfo" pop-class="beijing-01__systerm" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+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';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'MenuBar',
+    components: {
+        NoticeInfo,
+        StationControl,
+        DetainTrainContorl,
+        DetainTrainContorlUpDown,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            menu: [
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl,
+                            show: true
+                        },
+                        {
+                            title: '区域选择',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '全线扣车',
+                            operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                            click: this.setDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消全线扣车',
+                            operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                            click: this.cancelDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                            click: this.cancelUpDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                            click: this.cancelDownDetainTrainAll,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about,
+                            show: true
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            this.closeMenu(true);
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        handleShow(item) {
+            if (item.hide) {
+                return false;
+            }
+            return true;
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        initMenu() {
+            if (this.menu[3]) {
+                this.menu[3].children = this.initStationList();
+            }
+            this.clickEvent();
+            this.closeMenu(true);
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                if (document.getElementById('menuBar')) {
+                    self.closeMenu(false);
+                }
+            };
+        },
+        getDomId(item) {
+            if (item && item.operate) {
+                return item.operate.domId;
+            }
+            return '';
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu(flag) {
+            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+                this.classA = this.tempClassA = -1;
+                this.classB = this.tempClassB = -1;
+            }
+        },
+        hookClick(item, event) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            if (item && typeof item.click == 'function') {
+                item.click(item.operate);
+            }
+        },
+        selectedClassA(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuA(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuA(item, index);
+            }
+        },
+        selectedClassB(item, index) {
+
+        },
+        // 弹出顶部菜单操作
+        popupMenuA(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            this.clickEvent();
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassA = index;
+            this.tempClassB = -1;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+
+        popupMenuB(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassB = index;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.closeMenu(true);
+            }
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        // 设置全线扣车
+        setDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消全线扣车
+        cancelDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消上行扣车
+        cancelUpDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 取消下行扣车
+        cancelDownDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 30px;
+    $height: 30px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 180px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        z-index: 36;
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+        background: linear-gradient(#FDFDFE, #DEE3F3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+    }
+
+    .nav-li {
+        position: relative;
+        display: inline-block;
+        padding-left: $menuPadding;
+        padding-right: $menuPadding;
+    }
+
+    .nav-li:active {
+        background: #C9D0E1;
+        border-radius: 4px;
+    }
+
+    .nav-li-text {
+        font-size: 13px;
+        color: #000;
+        text-align: center;
+        text-decoration: none;
+    }
+
+    .nav-ul {
+        display: none;
+        position: absolute;
+        list-style: none;
+        border: 1px solid gray !important;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        padding: 0px;
+        margin: 0px;
+        max-height: 550px;
+        overflow-y: scroll;
+
+        &::-webkit-scrollbar {
+            width: 4px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+            border-radius: 10px;
+            background: #c3c3c3;
+        }
+
+        &::-webkit-scrollbar-track {
+            border-radius: 0;
+            background: #f0f0f0;
+
+        }
+    }
+
+    .menu-ul {
+        display: none;
+        list-style: none;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        bottom: $menuItemHeight;
+    }
+
+    .active {
+        position: absolute;
+        display: block !important;
+    }
+
+    .menu-ul-text {
+        font-size: 14px;
+        color: #000;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li {
+        text-align: left;
+        background: #F0F0F0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-block {
+        display: flex;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-text {
+        font-size: 14px;
+        color: #000;
+    }
+
+    .menu-li-text .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+    }
+
+    .menu-li-text .label {
+        display: inline-block;
+    }
+
+    .menu-separator {
+        text-align: left;
+        background: #F0F0F0;
+        height: 2px;
+        line-height: 2px;
+    }
+
+    .menu-separator .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+        height: 100%;
+        background: #EFECDE;
+    }
+
+    .menu-separator .separator {
+        display: inline-block;
+        background: #CACACA;
+        margin-left: 5px;
+        height: 2px;
+        width: $menuItemWidth - $width - 30px;
+    }
+
+    .menu-li-block:hover {
+        background: #C9DEF7;
+        box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+    }
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/localWorkMenu.vue b/src/jmapNew/theme/beijing_01/menus/localWorkMenu.vue
new file mode 100644
index 000000000..6cb518e74
--- /dev/null
+++ b/src/jmapNew/theme/beijing_01/menus/localWorkMenu.vue
@@ -0,0 +1,371 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-button ref="menuButton" />
+    <passive-alarm ref="passiveAlarm" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
+    <menu-limit ref="menuLimit" :selected="selected" :work="'localWork'" />
+    <passive-contorl ref="passiveControl" pop-class="beijing-01__systerm" />
+    <passive-timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuButton from './menuButton';
+import MenuBar from './localWorkMenuBar';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+import MenuStation from './menuStation';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuSignal from './menuSignal';
+import MenuLimit from './menuLimit';
+
+export default {
+    name: 'LocalWorkMenus',
+    components: {
+        MenuBar,
+        MenuButton,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout,
+        MenuStation,
+        MenuStationStand,
+        MenuSwitch,
+        MenuSection,
+        MenuTrain,
+        MenuSignal,
+        MenuLimit
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+        this.$root.$on('dialogOpen', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.mouseEvent.mouseover();
+            }
+        });
+
+        this.$root.$on('dialogClose', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.__down = false;
+                this.selected.instance.mouseEvent.mouseout();
+                this.$jlmap.clearEvent();
+            }
+        });
+    },
+    beforeDestroy() {
+        this.$root.$off('dialogOpen');
+        this.$root.$off('dialogClose');
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.beijing-01__systerm {
+	overflow: hidden !important;
+}
+
+.beijing-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__header {
+	padding: 10px;
+	height: 26px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__body {
+	padding: 10px;
+	margin: 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 6px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	filter: blur(7px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(190, 190, 190, 0.8);
+	z-index: -1;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 5px;
+	right: 5px;
+	line-height: 18px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.beijing-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.beijing-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.beijing-01__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.beijing-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.beijing-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.beijing-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.beijing-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.beijing-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.beijing-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.beijing-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.beijing-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.beijing-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.beijing-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.beijing-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.beijing-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.beijing-01__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.beijing-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.beijing-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.beijing-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.beijing-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.beijing-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/beijing_01/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..88de94a6b
--- /dev/null
+++ b/src/jmapNew/theme/beijing_01/menus/localWorkMenuBar.vue
@@ -0,0 +1,846 @@
+<template>
+  <div id="menuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li
+            v-if="handleShow(item)"
+            :id="getDomId(item)"
+            :key="i"
+            class="nav-li"
+            @click.stop="selectedClassA(item, i)"
+          >
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template v-if="child.children && child.children.length > 0">
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="selectedClassB(child, j)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
+                          <span class="status">&ensp;</span>
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li
+                          v-else-if="grandchild.show"
+                          :id="getDomId(grandchild)"
+                          :key="k"
+                          class="menu-li"
+                          @click.stop="hookClick(grandchild)"
+                        >
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else-if="child.show"
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="hookClick(child)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+    <station-control ref="stationControl" />
+    <detain-train-contorl ref="detainTrainContorl" />
+    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
+    <notice-info ref="noticeInfo" pop-class="beijing-01__systerm" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+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';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'MenuBar',
+    components: {
+        NoticeInfo,
+        StationControl,
+        DetainTrainContorl,
+        DetainTrainContorlUpDown,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            menu: [
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl,
+                            show: true
+                        },
+                        {
+                            title: '区域选择',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '全线扣车',
+                            operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                            click: this.setDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消全线扣车',
+                            operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                            click: this.cancelDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                            click: this.cancelUpDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                            click: this.cancelDownDetainTrainAll,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about,
+                            show: true
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            this.closeMenu(true);
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        handleShow(item) {
+            if (item.hide) {
+                return false;
+            }
+            return true;
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        initMenu() {
+            if (this.menu[3]) {
+                this.menu[3].children = this.initStationList();
+            }
+            this.clickEvent();
+            this.closeMenu(true);
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                if (document.getElementById('menuBar')) {
+                    self.closeMenu(false);
+                }
+            };
+        },
+        getDomId(item) {
+            if (item && item.operate) {
+                return item.operate.domId;
+            }
+            return '';
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu(flag) {
+            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+                this.classA = this.tempClassA = -1;
+                this.classB = this.tempClassB = -1;
+            }
+        },
+        hookClick(item, event) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            if (item && typeof item.click == 'function') {
+                item.click(item.operate);
+            }
+        },
+        selectedClassA(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuA(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuA(item, index);
+            }
+        },
+        // 弹出顶部菜单操作
+        popupMenuA(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            this.clickEvent();
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassA = index;
+            this.tempClassB = -1;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+
+        popupMenuB(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassB = index;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.closeMenu(true);
+            }
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        // 设置全线扣车
+        setDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消全线扣车
+        cancelDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消上行扣车
+        cancelUpDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 取消下行扣车
+        cancelDownDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 30px;
+    $height: 30px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 180px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        z-index: 36;
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+        background: linear-gradient(#FDFDFE, #DEE3F3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+    }
+
+    .nav-li {
+        position: relative;
+        display: inline-block;
+        padding-left: $menuPadding;
+        padding-right: $menuPadding;
+    }
+
+    .nav-li:active {
+        background: #C9D0E1;
+        border-radius: 4px;
+    }
+
+    .nav-li-text {
+        font-size: 13px;
+        color: #000;
+        text-align: center;
+        text-decoration: none;
+    }
+
+    .nav-ul {
+        display: none;
+        position: absolute;
+        list-style: none;
+        border: 1px solid gray !important;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        padding: 0px;
+        margin: 0px;
+        max-height: 550px;
+        overflow-y: scroll;
+
+        &::-webkit-scrollbar {
+            width: 4px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+            border-radius: 10px;
+            background: #c3c3c3;
+        }
+
+        &::-webkit-scrollbar-track {
+            border-radius: 0;
+            background: #f0f0f0;
+
+        }
+    }
+
+    .menu-ul {
+        display: none;
+        list-style: none;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        bottom: $menuItemHeight;
+    }
+
+    .active {
+        position: absolute;
+        display: block !important;
+    }
+
+    .menu-ul-text {
+        font-size: 14px;
+        color: #000;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li {
+        text-align: left;
+        background: #F0F0F0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-block {
+        display: flex;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-text {
+        font-size: 14px;
+        color: #000;
+    }
+
+    .menu-li-text .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+    }
+
+    .menu-li-text .label {
+        display: inline-block;
+    }
+
+    .menu-separator {
+        text-align: left;
+        background: #F0F0F0;
+        height: 2px;
+        line-height: 2px;
+    }
+
+    .menu-separator .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+        height: 100%;
+        background: #EFECDE;
+    }
+
+    .menu-separator .separator {
+        display: inline-block;
+        background: #CACACA;
+        margin-left: 5px;
+        height: 2px;
+        width: $menuItemWidth - $width - 30px;
+    }
+
+    .menu-li-block:hover {
+        background: #C9DEF7;
+        box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+    }
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuBar.vue b/src/jmapNew/theme/beijing_01/menus/menuBar.vue
deleted file mode 100644
index a66f3adb1..000000000
--- a/src/jmapNew/theme/beijing_01/menus/menuBar.vue
+++ /dev/null
@@ -1,1128 +0,0 @@
-<template>
-  <div id="menuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li
-            v-if="handleShow(item)"
-            :id="getDomId(item)"
-            :key="i"
-            class="nav-li"
-            @click.stop="selectedClassA(item, i)"
-          >
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template v-if="child.children && child.children.length > 0">
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li
-                    v-else
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="selectedClassB(child, j)"
-                  >
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li
-                          v-else-if="grandchild.show"
-                          :id="getDomId(grandchild)"
-                          :key="k"
-                          class="menu-li"
-                          @click.stop="hookClick(grandchild)"
-                        >
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li
-                    v-else-if="child.show"
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="hookClick(child)"
-                  >
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-    <station-control ref="stationControl" />
-    <detain-train-contorl ref="detainTrainContorl" />
-    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
-    <notice-info ref="noticeInfo" pop-class="beijing-01__systerm" />
-    <train-add ref="trainAdd" />
-    <train-transtalet ref="trainTranstalet" />
-    <train-delete ref="trainDelete" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-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';
-import TrainAdd from './menuDialog/trainAdd';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-import TrainDelete from './menuDialog/trainDelete';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { EventBus } from '@/scripts/event-bus';
-import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuBar',
-    components: {
-        NoticeInfo,
-        StationControl,
-        DetainTrainContorl,
-        DetainTrainContorlUpDown,
-        TrainAdd,
-        TrainTranstalet,
-        TrainDelete,
-        ManageUser,
-        HelpAbout
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            valid: true,
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '站遥控',
-                                operate: OperationEvent.MixinCommand.remoteControl.mbar,
-                                click: this.stationRemoteControl
-                            },
-                            {
-                                title: '区域选择',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '批处理命令',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '全线扣车',
-                                operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                                click: this.setDetainTrainAll
-                            },
-                            {
-                                title: '取消全线扣车',
-                                operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                                click: this.cancelDetainTrainAll
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                                click: this.cancelUpDetainTrainAll
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                                click: this.cancelDownDetainTrainAll
-                            }
-                        ]
-                    },
-                    {
-                        title: '信息管理',
-                        operate: '',
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ],
-                Center: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '站遥控',
-                                operate: OperationEvent.MixinCommand.remoteControl.mbar,
-                                click: this.stationRemoteControl
-                            },
-                            {
-                                title: '区域选择',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '批处理命令',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '全线扣车',
-                                operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                                click: this.setDetainTrainAll
-                            },
-                            {
-                                title: '取消全线扣车',
-                                operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                                click: this.cancelDetainTrainAll
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                                click: this.cancelUpDetainTrainAll
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                                click: this.cancelDownDetainTrainAll
-                            }
-                        ]
-                    },
-                    {
-                        title: '信息管理',
-                        operate: '',
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'started',
-            'steps',
-            'order',
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        },
-        '$store.state.training.operatemode': function (mode) {
-            this.initMenu();
-        },
-        '$store.state.training.started': function (val) {
-            this.closeMenu(true);
-        },
-        '$store.state.training.prdType': function () {
-            this.initMenu();
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        handleShow(item) {
-            if (item.hide) {
-                return false;
-            }
-            return true;
-        },
-        initStationList() {
-            const list = [];
-            this.stationList.forEach(station => {
-                if (station.visible) {
-                    const node = {
-                        title: station.name,
-                        operate: station.code,
-                        show: true,
-                        click: this.mapLocation,
-                        code: station.code
-                    };
-
-                    list.push(node);
-                }
-            });
-            return list;
-        },
-        initMenu(menu) {
-            const type = State2SimulationMap[this.$store.state.training.prdType];
-            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
-            if (this.menu[3]) {
-                this.menu[3].children = this.initStationList();
-            }
-            this.clickEvent();
-            this.closeMenu(true);
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                if (document.getElementById('menuBar')) {
-                    self.closeMenu(false);
-                }
-            };
-        },
-        getDomId(item) {
-            if (item && item.operate) {
-                return item.operate.domId;
-            }
-            return '';
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu(flag) {
-            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
-                this.classA = this.tempClassA = -1;
-                this.classB = this.tempClassB = -1;
-            }
-        },
-        hookClick(item, event) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            if (item && typeof item.click == 'function') {
-                item.click(item.operate);
-            }
-        },
-        selectedClassA(item, index) {
-            const order = this.order || 0;
-            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-                this.popupMenuA(item, index);
-            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-                this.popupMenuA(item, index);
-            }
-        },
-        // 弹出顶部菜单操作
-        popupMenuA(item, index) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            this.clickEvent();
-            const operate = {
-                type: 'bar',
-                operation: item.operate.operation
-            };
-            this.tempClassA = index;
-            this.tempClassB = -1;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-
-        popupMenuB(item, index) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            const operate = {
-                type: 'bar',
-                operation: item.operate.operation
-            };
-            this.tempClassB = index;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        // 设置地图定位
-        mapLocation(code) {
-            if (code) {
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
-                this.closeMenu(true);
-            }
-        },
-        // 站遥控
-        stationRemoteControl(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControl.doShow(operate);
-                }
-            });
-        },
-        // 设置全线扣车
-        setDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorl.doShow(operate);
-                }
-            });
-        },
-        // 取消全线扣车
-        cancelDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorl.doShow(operate);
-                }
-            });
-        },
-        // 取消上行扣车
-        cancelUpDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorlUpDown.doShow(operate);
-                }
-            });
-        },
-        // 取消下行扣车
-        cancelDownDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorlUpDown.doShow(operate);
-                }
-            });
-        },
-        // 添加计划车
-        addPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAdd.doShow(operate);
-                }
-            });
-        },
-        // 平移计划车
-        translatPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainTranstalet.doShow(operate);
-                }
-            });
-        },
-        // 删除计划车
-        delPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDelete.doShow(operate);
-                }
-            });
-        },
-        // 用户管理
-        userManage(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.manageUser.doShow(operate);
-                }
-            });
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $width: 30px;
-    $height: 30px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 180px;
-    $menuItemPadding: 5px;
-
-    #menuBar {
-        z-index: 36;
-        position: absolute;
-        width: inherit;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
-        background: linear-gradient(#FDFDFE, #DEE3F3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray !important;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-        max-height: 550px;
-        overflow-y: scroll;
-
-        &::-webkit-scrollbar {
-            width: 4px;
-        }
-
-        &::-webkit-scrollbar-thumb {
-            border-radius: 10px;
-            background: #c3c3c3;
-        }
-
-        &::-webkit-scrollbar-track {
-            border-radius: 0;
-            background: #f0f0f0;
-
-        }
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        display: flex;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuButton.vue b/src/jmapNew/theme/beijing_01/menus/menuButton.vue
index d75063015..a2f6d28ab 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div id="menuButtons_box" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button
       :id="Signal.arrangementRoute.button.domId"
       :style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
@@ -244,9 +244,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import { deepAssign } from '@/utils/index';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 
 export default {
@@ -287,9 +285,6 @@ export default {
         },
         Command() {
             return OperationEvent.Command;
-        },
-        isShowBtn() {
-            return this.$store.state.training.prdType == '01';
         }
     },
     watch: {
@@ -298,6 +293,11 @@ export default {
         },
         '$store.state.menuOperation.selectedCount': function (val) {
             this.selectedChange();
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            if (val) {
+                this.$store.dispatch('menuOperation/setButtonOperation', null);
+            }
         }
     },
     methods: {
@@ -326,7 +326,7 @@ export default {
                 type: 'mbm',
                 operation: operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -340,7 +340,7 @@ export default {
                 over:true,
                 cmdType:data.cmdType
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -350,19 +350,19 @@ export default {
         },
         selectedChange() {
             const model = this.$store.state.menuOperation.selected;
+            console.log(model, model._type, this.$store.state.menuOperation.buttonOperation, 'caise');
             if (model && model._type) {
                 switch (this.$store.state.menuOperation.buttonOperation) {
                 case OperationEvent.Station.guideLock.button.operation : {
                     if (model && model._type == 'GuideLock') {
                         const operate = {
                             start: true,
-                            over: true,
                             operation: OperationEvent.Station.guideLock.button.operation,
                             param:{
                                 stationCode:model.stationCode
                             }
                         };
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                             if (valid) {
                                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                                 if (model.totalGuideLock) {
@@ -372,7 +372,8 @@ export default {
                                 }
                                 this.$refs.password.doShow(operate);
                             }
-                        }).catch(() => {
+                        }).catch((e) => {
+                            console.log(e);
                             this.$refs.noticeInfo.doShow();
                         });
 
@@ -391,7 +392,7 @@ export default {
                             },
                             cmdType : CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
                         };
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                             if (valid) {
                                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                             }
@@ -413,7 +414,7 @@ export default {
                             },
                             cmdType : CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
                         };
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                             if (valid) {
                                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                             }
@@ -425,7 +426,7 @@ export default {
                 }
                 }
             } else {
-                Handler.clear();
+                // Handler.clear();
                 this.$store.dispatch('menuOperation/setButtonOperation', null);
             }
         }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue
index 8e7a63d4c..6743155bb 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -94,7 +94,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -113,7 +113,7 @@ export default {
             } else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
                 operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.doClose();
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
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 8f1ead014..44c40651b 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 817325e73..078738c47 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue
@@ -99,7 +99,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -116,7 +116,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 0f7cb491f..e2ea52036 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
index cad8f2bc2..9c46f70e1 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
@@ -109,7 +109,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -137,7 +137,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -161,7 +161,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2ee3adefe..3a2974f64 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -109,7 +109,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -137,7 +137,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -161,7 +161,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2fa2a668b..156d7779f 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue
@@ -99,7 +99,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
index 0f62c10be..2edad72fb 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
index 802dac249..fe239a56d 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
@@ -118,6 +118,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+            this.station = {};
             this.$store.dispatch('training/emitTipFresh');
         },
         cancel() {
@@ -126,7 +127,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -147,7 +148,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose1.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -166,7 +167,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -193,7 +194,7 @@ export default {
         },
         // 请求遥控
         conterCommit() {
-            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 1).then(({valid, operate})=>{
                 if (valid) {
                     this.doClose();
                     this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由站控转为中控:\n' + this.stationName);
@@ -202,7 +203,7 @@ export default {
         },
         // 请求站控
         requestCommit() {
-            commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 1).then(({valid, operate})=>{
                 if (valid) {
                     this.doClose();
                     this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
@@ -211,7 +212,7 @@ export default {
         },
         // 紧急站控
         emergencyCommit() {
-            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 1).then(({valid, operate})=>{
                 if (valid) {
                     this.doClose();
                     this.$refs.twoConfirmation.doShow(operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
index 07a3302a6..bccc1680c 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
index b58eee696..c9ad46d2e 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
@@ -109,7 +109,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
index bde18d9b7..f683065da 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuLimit.vue b/src/jmapNew/theme/beijing_01/menus/menuLimit.vue
index f85f4cee5..2b98f3d57 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuLimit.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuLimit.vue
@@ -11,9 +11,7 @@ import CancelAllLimit from '@/jmapNew/theme/components/menus/dialog/cancelAllLim
 import { mapGetters } from 'vuex';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-
 export default {
     name: 'MenuLimit',
     components: {
@@ -26,28 +24,27 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             systemName:'beijing-01__systerm',
-            menuNormal: {
-                Local: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ]
-            }
+            menuNormal: [
+                {
+                    label: '取消全线临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED,
+                    isDisabled: (limitControl, work) => false,
+                    isShow: (limitControl, work) => work === 'dispatchWork'
+                }
+            ]
         };
     },
     computed: {
@@ -72,8 +69,12 @@ export default {
             };
         },
         initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSection.vue b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
index 1e7378f11..88a020e40 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSection.vue
@@ -21,12 +21,12 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import TrainAddPlan from '@/jmapNew/theme/components/menus/dialog/trainAddPlan';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SectionMenu',
@@ -46,45 +46,50 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '轨道激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '轨道切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    // {
-                    //     label: '确认计轴有效',
-                    //     handler: this.alxeEffective,
-                    //     cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
-                    // },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '轨道激活',
+                    handler: this.active,
+                    cmdType: CMD.Section.CMD_SECTION_ACTIVE,
+                    isDisabled: (section, work) => section.cutOff !== 1,
+                    isShow: (section, work) => work === 'dispatchWork' && section.type !== '04'
+                },
+                {
+                    label: '轨道切除',
+                    handler: this.split,
+                    cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
+                    isDisabled: (section, work) => section.cutOff === 1,
+                    isShow: (section, work) => work === 'dispatchWork' && section.type !== '04'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (section, work) => section.speedUpLimit !== -1,
+                    isShow: (section, work) => work === 'dispatchWork' && section.type !== '04'
+                },
+                {
+                    label: '取消临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
+                    isDisabled: (section, work) => section.speedUpLimit === -1,
+                    isShow: (section, work) => work === 'dispatchWork' && section.type !== '04'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -135,10 +140,12 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
-                cmdType: CMD.Section.CMD_Train_Init_Plan
+                cmdType: CMD.Section.CMD_Train_Init_Plan,
+                isDisabled: (section, work) => false,
+                isShow: (section, work) => work === 'dispatchWork' && section.type !== '04'
             });
         }
     },
@@ -151,11 +158,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
-            } else {
-                this.menu = [];
-            }
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work));
+                menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
                 this.menu = this.menuForce;
@@ -218,7 +226,7 @@ export default {
         //     };
 
         //     mouseCancelState(this.selected);
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //         } else {
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
index 056b9de5f..737799077 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSignal.vue
@@ -21,12 +21,12 @@ import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SignalMenu',
@@ -46,6 +46,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -54,45 +60,53 @@ export default {
             clickNum:0,
             systemName:'beijing-01__systerm',
             oldSelected:null,
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '排列进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路控制状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '排列进路',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '进路交人工控',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '进路交自动控',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查询进路控制状态',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -148,11 +162,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            if (this.operatemode === OperateMode.ADMIN) {
-                this.menu = [...this.menu, ...this.menuForce];
-            }
-
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work));
+                menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -172,7 +187,7 @@ export default {
             }
         },
         setRouteSignal() {
-            if (this.$store.state.training.prdType == '01') {
+            if (this.$store.state.map.picture === 'localWork') {
                 let signalList = [];
                 this.routeList.forEach(route=>{
                     signalList.push(route.startSignalCode);
@@ -211,16 +226,24 @@ export default {
                     }
                     this.clickNum = 0;
                 } else {
-                    this.oldSelected = selectType;
-                    this.routeList.forEach(elem => {
-                        if (elem.startSignalCode === this.oldSelected.code) {
-                            const signalCode = this.$store.getters['map/getDeviceByCode'](elem.endSignalCode);
-                            const data = Object.assign({_type: 'Signal'}, signalCode);
-                            data.isRouteActive = true;
-                            this.$store.dispatch('map/updateMapDevices', data);
+                    const operate = {
+                        code: selectType.code,
+                        operation: OperationEvent.Signal.arrangementRoute.button.operation
+                    };
+                    this.$store.dispatch('trainingNew/next', operate).then(valid => {
+                        if (valid) {
+                            this.oldSelected = selectType;
+                            this.routeList.forEach(elem => {
+                                if (elem.startSignalCode === this.oldSelected.code) {
+                                    const signalCode = this.$store.getters['map/getDeviceByCode'](elem.endSignalCode);
+                                    const data = Object.assign({_type: 'Signal'}, signalCode);
+                                    data.isRouteActive = true;
+                                    this.$store.dispatch('map/updateMapDevices', data);
+                                }
+                            });
+                            this.clickNum++;
                         }
                     });
-                    this.clickNum++;
                 }
                 break;
             }
@@ -274,7 +297,7 @@ export default {
         },
         isTrainOccupy(selectType) {
             const data = this.$store.getters['map/getApproachSectionByCode'](selectType.code);
-            if (data && data.routeSectionList.length > 0) {
+            if (data && data.routeSectionList && data.routeSectionList.length > 0) {
                 let isTrainOccupy = false;
                 data.routeSectionList.forEach(sectionCode=>{
                     const section = this.$store.getters['map/getDeviceByCode'](sectionCode);
@@ -311,7 +334,7 @@ export default {
         },
         // 现地设置进路
         setRoute(route) {
-            commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:route.code}, 3).then(({valid, operate})=>{
+            commitOperate(menuOperate.Signal.arrangementRoute, {code: this.selected.code, routeCode:route.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
@@ -430,7 +453,7 @@ export default {
                 over:true,
                 cmdType:data.cmdType
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuStation.vue b/src/jmapNew/theme/beijing_01/menus/menuStation.vue
index cc23a61fa..7c121a37d 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStation.vue
@@ -19,12 +19,10 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
+import {judgeStationControl} from '../../components/utils/menuJudge';
 export default {
     name: 'StationMenu',
     components: {
@@ -41,61 +39,66 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '全站设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: '全站取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
-                        auth: { station: true, center: false }
-                    }
-                    // 暂时没有该操作-------等后端后续添加
-                    // {
-                    //     label: '上电解锁',
-                    //     handler: this.powerUnLock,
-                    //     cmdType: CMD.Station.active,
-                    //     auth: { station: true, center: false }
-                    // },
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.active,
-                    //     auth: { station: true, center: false }
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '所有进路自排关',
-                        handler: this.humanControlALL,
-                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: '所有进路自排开',
-                        handler: this.atsAutoControlALL,
-                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
-                        auth: { station: false, center: true }
-                    }
-                    // 暂时没有该操作-------等后端后续添加
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.active,
-                    //     auth: { station: false, center: true }
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '全站设置联锁自动触发',
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork' && station.centralized
+                },
+                {
+                    label: '全站取消联锁自动触发',
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork' && station.centralized
+                },
+                {
+                    label: '所有进路自排关',
+                    handler: this.humanControlALL,
+                    cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork' && station.centralized
+                },
+                {
+                    label: '所有进路自排开',
+                    handler: this.atsAutoControlALL,
+                    cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork' && station.centralized
+                }
+                // 暂时没有该操作-------等后端后续添加
+                // {
+                //     label: '上电解锁',
+                //     handler: this.powerUnLock,
+                //     cmdType: CMD.Station.active,
+                //     isShow: (station, work) => work === 'localWork' && station.centralized
+                // },
+                // {
+                //     label: '执行关键操作测试',
+                //     handler: this.execKeyOperationTest,
+                //     cmdType: CMD.Station.active,
+                //     isShow: (station, work) => work === 'localWork' && station.centralized
+                // }
+                // {
+                //     label: '执行关键操作测试',
+                //     handler: this.execKeyOperationTest,
+                //     cmdType: CMD.Station.active,
+                //     isShow: (station, work) => work === 'disabledWork' && station.centralized
+                // }
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -147,14 +150,11 @@ export default {
         },
         initMenu() {
             this.menu = [];
-            if (this.selected.centralized) {
-                // 编辑模式菜单列表
-                this.menu = MenuContextHandler.covert(this.menuNormal);
-                if (this.operatemode === OperateMode.ADMIN) {
-                    this.menu = [...this.menu, ...this.menuForce];
-                }
-            }
-
+            this.menuNormal.forEach(menuItem => {
+                menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work);
+                menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work));
+                this.menu.push(menuItem);
+            });
             if (this.selected.centralized) {
                 // 故障模式菜单列表
                 if (this.operatemode === OperateMode.FAULT) {
@@ -211,7 +211,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.setAutoTrigger.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -227,7 +227,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -242,7 +242,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.powerUnLock.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
@@ -256,7 +256,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.execKeyOperationTest.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
@@ -270,7 +270,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.humanControlALL.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationHumanControlAll.doShow(operate, this.selected);
@@ -284,7 +284,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.atsAutoControlALL.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2bb9780da..3d1b00058 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
@@ -26,10 +26,9 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import {DeviceMenu } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
+import {judgeStationControl} from '../../components/utils/menuJudge';
 export default {
     name: 'StationStandMenu',
     components: {
@@ -49,69 +48,89 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             systemName:'beijing-01__systerm',
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '设置扣车',
-                        handler: this.setDetainTrain,
-                        cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: '提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '停站时间控制',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '运行时间控制',
-                        handler: this.setRunLevel,
-                        cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: '变通策略管理',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '站台信息',
-                        handler: this.detail,
-                        cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置扣车',
+                    handler: this.setDetainTrain,
+                    cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain !== 0,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain === 0,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置跳停',
+                    handler: this.setJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 0,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消跳停',
+                    handler: this.cancelJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip === 0 && stand.assignSkip === 0,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '提前发车',
+                    handler: this.earlyDeparture,
+                    cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: (stand, work) => stand.trainParking !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '停站时间控制',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '运行时间控制',
+                    handler: this.setRunLevel,
+                    cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '变通策略管理',
+                    handler: this.setBackStrategy,
+                    cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '站台信息',
+                    handler: this.detail,
+                    cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -162,12 +181,12 @@ export default {
             };
         },
         initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // if (this.operatemode === OperateMode.ADMIN) {
-            //     this.menu = [...this.menu, ...this.menuForce];
-            // }
-
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work));
+                menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
index eaacf5113..7b6c2e497 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuSwitch.vue
@@ -24,10 +24,9 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import {DeviceMenu } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
+import {judgeStationControl} from '../../components/utils/menuJudge';
 export default {
     name: 'SwitchMenu',
     components: {
@@ -46,50 +45,43 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '轨道切除',
-                        handler: this.split,
-                        cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
-                    },
-                    {
-                        label: '轨道激活',
-                        handler: this.active,
-                        cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    // {
-                    //     label: '确认计轴有效',
-                    //     handler: this.alxeEffective,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE,
-                    //     auth: { station: false, center: true }
-                    // },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    }
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '查看站场设备状态',
-                    //     handler: this.undeveloped,
-                    //     disabledCallback: MenuDisabledState.Switch.setSpeed,
-                    //     auth: { station: false, center: true }
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '轨道切除',
+                    handler: this.split,
+                    cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '轨道激活',
+                    handler: this.active,
+                    cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -138,11 +130,12 @@ export default {
             };
         },
         initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // if (this.operatemode === OperateMode.ADMIN) {
-            //     this.menu = [...this.menu, ...this.menuForce];
-            // }
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || (menuItem.isDisabled && menuItem.isDisabled(this.selected, this.work));
+                menuItem.show = menuItem.isShow && menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTool.vue b/src/jmapNew/theme/beijing_01/menus/menuTool.vue
index 155232fee..31f7eee1e 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTool.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTool.vue
@@ -15,128 +15,128 @@ import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
 
 export default {
-	name: 'MenuTool',
-	components: {
-		SystemTime
-	},
-	props: {
-		selected: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			logoImg: logo_,
-			time: '00:0000',
-			tools: [
-				{
-					title: '服务器1',
-					operate: '',
-					src: logo_,
-					click: this.undeveloped
-				},
-				{
-					title: '服务器2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '前置机1',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '前置机2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '主调',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台1',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台2',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '调度台3',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '大屏',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '维护工作站',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '运行图显示人工站',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '跳停',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '扣车',
-					operate: '',
-					src: '',
-					click: this.undeveloped
-				},
-				{
-					title: '列车报警',
-					operate: '',
-					src: logo_,
-					click: this.undeveloped
-				}
-			]
-		};
-	},
-	computed: {
-		isShowSystemTime() {
-			return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
-		}
-	},
-	watch: {
-		'$store.state.training.initTime': function (initTime) {
-			this.time = timestampFormat('HH:mmss', initTime)
-		}
-	},
-	mounted() {
-		this.initTools();
-	},
-	methods: {
-		initTools() {
-			this.tools = [];
-		}
-	}
+    name: 'MenuTool',
+    components: {
+        SystemTime
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            logoImg: logo_,
+            time: '00:0000',
+            tools: [
+                {
+                    title: '服务器1',
+                    operate: '',
+                    src: logo_,
+                    click: this.undeveloped
+                },
+                {
+                    title: '服务器2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '前置机1',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '前置机2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '主调',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台1',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台2',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '调度台3',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '大屏',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '维护工作站',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '运行图显示人工站',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '跳停',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '扣车',
+                    operate: '',
+                    src: '',
+                    click: this.undeveloped
+                },
+                {
+                    title: '列车报警',
+                    operate: '',
+                    src: logo_,
+                    click: this.undeveloped
+                }
+            ]
+        };
+    },
+    computed: {
+        isShowSystemTime() {
+            return this.$route.params.mode == 'demon' || this.$route.params.mode === 'dp' || !this.$route.params.mode;
+        }
+    },
+    watch: {
+        '$store.state.training.initTime': function (initTime) {
+            this.time = timestampFormat('HH:mmss', initTime);
+        }
+    },
+    mounted() {
+        this.initTools();
+    },
+    methods: {
+        initTools() {
+            this.tools = [];
+        }
+    }
 };
 </script>
 
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index bcd4c2205..9e4a6d29c 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -34,12 +34,9 @@ import TrainDeletePlan from './dialog/trainDeletePlan';
 import TrainSetHead from './dialog/trainSetHead';
 import TrainSetWork from './dialog/trainSetWork';
 import TrainFlag from './dialog/trainFlag';
-// import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-// import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'MenuTrain',
@@ -325,7 +322,7 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             // this.menu = trainMenuFiltration(this.menuNormal);
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // if (this.operatemode === OperateMode.ADMIN) {
             // 	this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
             // }
@@ -479,7 +476,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -504,7 +501,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.addTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDefine.doShow(operate, this.selected);
@@ -518,7 +515,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.delTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate, this.selected);
@@ -532,7 +529,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.moveTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(operate, this.selected);
@@ -546,7 +543,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEdit.doShow(operate, this.selected);
@@ -560,7 +557,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -574,7 +571,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.moveEventlyTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveEvently.doShow(operate, this.selected);
@@ -588,7 +585,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.deletePlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeletePlan.doShow(operate, this.selected);
@@ -602,7 +599,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetHead.doShow(operate, this.selected);
@@ -616,7 +613,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWork.doShow(operate, this.selected);
@@ -630,7 +627,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainFlag.doShow(operate, this.selected);
@@ -644,7 +641,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 c8fa1ad48..4e90fbe92 100644
--- a/src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue
@@ -66,7 +66,7 @@
         <el-input v-model="model.recommendedOperation" disabled />
       </el-form-item>
       <div class="alarm-detail-description">
-        <span> 报警详细描述</span><br>
+        <span>报警详细描述</span><br>
         <el-input v-model="model.alarmDetail" type="textarea" :rows="5" placeholder="请输入内容" disabled />
       </div>
     </el-form>
@@ -128,13 +128,12 @@ export default {
             if (elem && elem.hasOwnProperty('success')) {
                 if (elem.success) {
                     const operate = this.$store.state.training.operate;
-                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                     const newOperate = {
                         type: operate.type,
                         name: station.name
                     };
-
                     this.doShow(newOperate);
                 }
             }
@@ -174,7 +173,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -186,7 +185,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 cb1caeb18..3860b5491 100644
--- a/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue
@@ -42,8 +42,8 @@ export default {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
                 const operate = this.$store.state.training.operate;
-                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     type: operate.type,
                     name: station.name
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -92,7 +92,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue
index 93b34f265..17a8021e0 100644
--- a/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue
@@ -216,7 +216,7 @@ export default {
             //         };
             //
             //         this.loading = true;
-            //         this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            //         this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
             //             this.loading = false;
             //             if (valid) {
             //                 this.doClose();
@@ -239,7 +239,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue
index 53f00e838..ec2e899eb 100644
--- a/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue
@@ -147,7 +147,7 @@ export default {
                 //         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
                 //     };
                 //     this.loading = true;
-                //     this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                //     this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 //         this.loading = false;
                 //         if (valid) {
                 //             this.doClose();
diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/sectionCmdControl.vue
index fd43ffed9..05a71e097 100644
--- a/src/jmapNew/theme/chengdu_01/menus/dialog/sectionCmdControl.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/dialog/sectionCmdControl.vue
@@ -271,7 +271,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -300,7 +300,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -315,7 +315,9 @@ export default {
             });
         },
         confirm2() {
-            const operate = {};
+            const operate = {
+                send: true
+            };
 
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
                 /** 区段解封*/
@@ -333,7 +335,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -365,7 +367,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -382,7 +384,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue
index 26f96bd69..4badff4ff 100644
--- a/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue
@@ -216,7 +216,7 @@ export default {
             //         };
             //
             //         this.loading = true;
-            //         this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            //         this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
             //             this.loading = false;
             //             if (valid) {
             //                 this.doClose();
@@ -239,7 +239,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/chengdu_01/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..525fc3871
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_01/menus/dispatchWorkMenu.vue
@@ -0,0 +1,438 @@
+<template>
+  <div class="chengdou-01__menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :work="work" />
+    <menu-request ref="menuRequest" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" />
+    <menu-station-platform ref="menuStationPlatform" :selected="selected" @popMenuStationStand="popMenuStationStand" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="chengdou-01__system" :work="work" />
+    <passive-Timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuRequest from './menuRequest';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './menuBar';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+import MenuStationPlatform from './menuStationPlatform';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuRequest,
+        // MenuCancel,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout,
+        MenuStationPlatform
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            work: 'dispatchWork'
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    },
+    methods: {
+        popMenuStationStand(param) {
+            this.$refs.menuStationStand.doShow(param.position, param.type);
+        }
+    }
+};
+</script>
+
+<style>
+    .chengdou-01__menus .pop-menu {
+        background: #5F9EA0;
+    }
+    .chengdou-01__menus .pop-menu .el-popover{
+        background: #5F9EA0;
+    }
+    .chengdou-01__menus .pop-menu span {
+        color: #000;
+    }
+
+    .chengdou-01__menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .chengdou-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .chengdou-01__system .el-dialog {
+        background: #0055E8;
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        border: 1px solid rgb(69, 134, 247);
+        border-radius: 6px;
+        font-size: 13px !important;
+        color: #000;
+    }
+
+    .chengdou-01__system .el-dialog span {
+        font-size: 13px !important;
+        line-height: 22px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__footer {
+        background: #5F9EA0;
+        opacity: 1;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__body {
+        padding: 20px;
+        margin: 0px 3px 3px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #5F9EA0;
+        opacity: 1;
+    }
+
+    .chengdou-01__system .station-stand .el-dialog__body {
+        background: #000;
+        color: #E8E8E8;
+    }
+    .chengdou-01__system .el-dialog .el-dialog__title {
+        font-size: 16px;
+        color: #fff;
+        position: absolute;
+        top: 4px;
+        left:25px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 6px;
+        right: 3px;
+        line-height: 16px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .chengdou-01__system .el-dialog .el-button {
+        height: 24px;
+        line-height: 22px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #B7D4D5;
+        border-radius: 0 !important;
+        color: #000;
+        background: #5F9EA0;
+    }
+
+    .chengdou-01__system .el-dialog .expand {
+        width: 120px;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:focus span {
+        border: 1px dashed #315253;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:active {
+        border: 2px inset #B7D4D5;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:disabled {
+        border: 2px inset #B7D4D5;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+    .chengdou-01__select-option .el-select-dropdown__item{
+         background: #5F9EA0;
+     }
+    .chengdou-01__select-option .el-scrollbar__wrap {
+        background-color: #5F9EA0;
+        overflow: hidden;
+        overflow-y: scroll;
+    }
+    .chengdou-01__select-option{
+        border-style: solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        border-radius: 0;
+        background:#5F9EA0;
+    }
+    .chengdou-01__select-option .el-scrollbar{
+        border-style: solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0;
+    }
+    .chengdou-01__select-option .el-select-dropdown__item.selected{
+        color: #fff;
+    }
+    .chengdou-01__select-option .el-select-dropdown__item{
+        color: #000;
+    }
+    .chengdou-01__system .el-dialog .el-transfer-panel{
+        border-style: solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0;
+        background: #5F9EA0;
+    }
+    .chengdou-01__system .el-dialog .el-transfer .el-button{
+        width: 40px;
+    }
+    .chengdou-01__system .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label span {
+        color: #000;
+    }
+    .chengdou-01__system .el-dialog .el-transfer-panel .el-transfer-panel__header {
+        background: #5F9EA0;
+        border-bottom: 1px solid #467576;
+    }
+    .chengdou-01__system .el-dialog .el-transfer-panel .el-transfer-panel__empty {
+        color: #5F9EA0;
+    }
+    .chengdou-01__system .el-dialog .el-input {
+        border-style:solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        height: 22px !important;
+        line-height: 22px !important;
+        background: #5F9EA0;
+    }
+
+    .chengdou-01__system .el-dialog .el-input__inner {
+        color: #000;
+        background: #5F9EA0 !important;
+        border-style:solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+        height: 22px !important;
+        line-height: 22px !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-textarea {
+        border-style:solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        border-radius: 0;
+    }
+
+    .chengdou-01__system .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #5F9EA0 !important;
+        border-style:solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .chengdou-01__system .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-table .cell {
+        height: 22px;
+        line-height: 22px;
+    }
+
+    .chengdou-01__system .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .chengdou-01__system .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .chengdou-01__system .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .chengdou-01__system .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .chengdou-01__system .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .chengdou-01__system .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .chengdou-01__system .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .chengdou-01__system .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .chengdou-01__system .el-dialog .button-group {
+        margin-top: 20px;
+    }
+
+    .chengdou-01__system.request_box .content-box .el-table__body-wrapper .el-table__row{
+        background: #000;
+        height: 30px;
+        color: #518E86;
+    }
+    .chengdou-01__system.request_box .content-box .el-table__body-wrapper .el-table__row.hover-row td{
+        background: #d5ecf7;
+    }
+    .chengdou-01__system.request_box .content-box .el-table__body-wrapper .el-table__row.current-row td{
+        background: #d5ecf7;
+    }
+    .chengdou-01__system .el-select .el-input__suffix {
+        top: 5px;
+    }
+    .chengdou-01__system .el-select .is-focus .el-input__suffix {
+        top: -5px;
+    }
+    .chengdou-01__select-option .el-scrollbar__thumb {
+        border-style:solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        background: #518E86;
+    }
+</style>
diff --git a/src/jmapNew/theme/chengdu_01/menus/localWorkMenu.vue b/src/jmapNew/theme/chengdu_01/menus/localWorkMenu.vue
new file mode 100644
index 000000000..b098b6bd9
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_01/menus/localWorkMenu.vue
@@ -0,0 +1,438 @@
+<template>
+  <div class="chengdou-01__menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :work="work" />
+    <menu-request ref="menuRequest" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" />
+    <menu-station-platform ref="menuStationPlatform" :selected="selected" @popMenuStationStand="popMenuStationStand" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="chengdou-01__system" :work="work" />
+    <passive-Timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuRequest from './menuRequest';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './menuBar';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+import MenuStationPlatform from './menuStationPlatform';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuBar,
+        MenuRequest,
+        // MenuCancel,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout,
+        MenuStationPlatform
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            work: 'localWork'
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    },
+    methods: {
+        popMenuStationStand(param) {
+            this.$refs.menuStationStand.doShow(param.position, param.type);
+        }
+    }
+};
+</script>
+
+<style>
+    .chengdou-01__menus .pop-menu {
+        background: #5F9EA0;
+    }
+    .chengdou-01__menus .pop-menu .el-popover{
+        background: #5F9EA0;
+    }
+    .chengdou-01__menus .pop-menu span {
+        color: #000;
+    }
+
+    .chengdou-01__menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .chengdou-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .chengdou-01__system .el-dialog {
+        background: #0055E8;
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        border: 1px solid rgb(69, 134, 247);
+        border-radius: 6px;
+        font-size: 13px !important;
+        color: #000;
+    }
+
+    .chengdou-01__system .el-dialog span {
+        font-size: 13px !important;
+        line-height: 22px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__footer {
+        background: #5F9EA0;
+        opacity: 1;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__body {
+        padding: 20px;
+        margin: 0px 3px 3px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #5F9EA0;
+        opacity: 1;
+    }
+
+    .chengdou-01__system .station-stand .el-dialog__body {
+        background: #000;
+        color: #E8E8E8;
+    }
+    .chengdou-01__system .el-dialog .el-dialog__title {
+        font-size: 16px;
+        color: #fff;
+        position: absolute;
+        top: 4px;
+        left:25px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 6px;
+        right: 3px;
+        line-height: 16px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .chengdou-01__system .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .chengdou-01__system .el-dialog .el-button {
+        height: 24px;
+        line-height: 22px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #B7D4D5;
+        border-radius: 0 !important;
+        color: #000;
+        background: #5F9EA0;
+    }
+
+    .chengdou-01__system .el-dialog .expand {
+        width: 120px;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:focus span {
+        border: 1px dashed #315253;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:active {
+        border: 2px inset #B7D4D5;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:disabled {
+        border: 2px inset #B7D4D5;
+    }
+
+    .chengdou-01__system .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+    .chengdou-01__select-option .el-select-dropdown__item{
+         background: #5F9EA0;
+     }
+    .chengdou-01__select-option .el-scrollbar__wrap {
+        background-color: #5F9EA0;
+        overflow: hidden;
+        overflow-y: scroll;
+    }
+    .chengdou-01__select-option{
+        border-style: solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        border-radius: 0;
+        background:#5F9EA0;
+    }
+    .chengdou-01__select-option .el-scrollbar{
+        border-style: solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0;
+    }
+    .chengdou-01__select-option .el-select-dropdown__item.selected{
+        color: #fff;
+    }
+    .chengdou-01__select-option .el-select-dropdown__item{
+        color: #000;
+    }
+    .chengdou-01__system .el-dialog .el-transfer-panel{
+        border-style: solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0;
+        background: #5F9EA0;
+    }
+    .chengdou-01__system .el-dialog .el-transfer .el-button{
+        width: 40px;
+    }
+    .chengdou-01__system .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label span {
+        color: #000;
+    }
+    .chengdou-01__system .el-dialog .el-transfer-panel .el-transfer-panel__header {
+        background: #5F9EA0;
+        border-bottom: 1px solid #467576;
+    }
+    .chengdou-01__system .el-dialog .el-transfer-panel .el-transfer-panel__empty {
+        color: #5F9EA0;
+    }
+    .chengdou-01__system .el-dialog .el-input {
+        border-style:solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        height: 22px !important;
+        line-height: 22px !important;
+        background: #5F9EA0;
+    }
+
+    .chengdou-01__system .el-dialog .el-input__inner {
+        color: #000;
+        background: #5F9EA0 !important;
+        border-style:solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+        height: 22px !important;
+        line-height: 22px !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-textarea {
+        border-style:solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        border-radius: 0;
+    }
+
+    .chengdou-01__system .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #5F9EA0 !important;
+        border-style:solid;
+        border-width: 1px;
+        border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .chengdou-01__system .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-table .cell {
+        height: 22px;
+        line-height: 22px;
+    }
+
+    .chengdou-01__system .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .chengdou-01__system .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .chengdou-01__system .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .chengdou-01__system .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .chengdou-01__system .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .chengdou-01__system .el-dialog .base-label {
+        background: rgba(0, 0, 0, x);
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .chengdou-01__system .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .chengdou-01__system .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .chengdou-01__system .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .chengdou-01__system .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .chengdou-01__system .el-dialog .button-group {
+        margin-top: 20px;
+    }
+
+    .chengdou-01__system.request_box .content-box .el-table__body-wrapper .el-table__row{
+        background: #000;
+        height: 30px;
+        color: #518E86;
+    }
+    .chengdou-01__system.request_box .content-box .el-table__body-wrapper .el-table__row.hover-row td{
+        background: #d5ecf7;
+    }
+    .chengdou-01__system.request_box .content-box .el-table__body-wrapper .el-table__row.current-row td{
+        background: #d5ecf7;
+    }
+    .chengdou-01__system .el-select .el-input__suffix {
+        top: 5px;
+    }
+    .chengdou-01__system .el-select .is-focus .el-input__suffix {
+        top: -5px;
+    }
+    .chengdou-01__select-option .el-scrollbar__thumb {
+        border-style:solid;
+        border-width: 1px;
+        border-color: #335658 #99C1C3 #99C1C3 #335658;
+        background: #518E86;
+    }
+</style>
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuBar.vue b/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
index 32edd2514..3efb5f524 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
@@ -72,7 +72,7 @@ import { mapGetters } from 'vuex';
 import { TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SystemLogin from './menuDialog/systemLogin';
 import SystemLogout from './menuDialog/systemLogout';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@@ -91,6 +91,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -101,104 +107,62 @@ export default {
             tempClassB: -1,
             valid: true,
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        title: '访问控制',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.login
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '登录转移',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '区域分配',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '员工管理',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '职位功能划分',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '用户概况',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '登录概览',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '列车库存',
-                        operate: OperationEvent.Command.mBar.check
-                    },
-                    {
-                        title: '显示控制',
-                        operate: OperationEvent.Command.mBar.view
-                    }
-                ],
-                Center: [
-                    {
-                        title: '访问控制',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.login
-                            },
-                            {
-                                title: '注销',
-                                click: this.logout
-                            },
-                            {
-                                title: '登录转移',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '区域分配',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '员工管理',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '职位功能划分',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '用户概况',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '登录概览',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '列车库存',
-                        operate: OperationEvent.Command.mBar.check
-                    },
-                    {
-                        title: '显示控制',
-                        operate: OperationEvent.Command.mBar.view
-                    }
-                ]
-            }
+            menuNormal: [
+                {
+                    title: '访问控制',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            show: true,
+                            click: this.login
+                        },
+                        {
+                            title: '注销',
+                            show: true,
+                            click: this.work == 'localWork' ? this.undeveloped : this.logout
+                        },
+                        {
+                            title: '登录转移',
+                            show: true,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '区域分配',
+                            show: true,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '员工管理',
+                            show: true,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '职位功能划分',
+                            show: true,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '用户概况',
+                            show: true,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '登录概览',
+                            show: true,
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '列车库存',
+                    operate: OperationEvent.Command.mBar.check
+                },
+                {
+                    title: '显示控制',
+                    operate: OperationEvent.Command.mBar.view
+                }
+            ]
         };
     },
     computed: {
@@ -233,9 +197,6 @@ export default {
         },
         '$store.state.training.started': function (val) {
             this.closeMenu(true);
-        },
-        '$store.state.training.prdType': function () {
-            this.initMenu();
         }
     },
     mounted() {
@@ -266,7 +227,13 @@ export default {
             return list;
         },
         initMenu(menu) {
-            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[State2SimulationMap[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
+            // this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[State2SimulationMap[this.$store.state.training.prdType]], this.$store.state.training.operatemode);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.menu.length) {
                 this.menu[2].children = this.initStationList();
                 this.clickEvent();
@@ -328,7 +295,7 @@ export default {
             };
             this.tempClassA = index;
             this.tempClassB = -1;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -348,7 +315,7 @@ export default {
                 operation: item.operate
             };
             this.tempClassB = index;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -366,7 +333,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -392,7 +359,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -404,7 +371,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.closeMenu(true);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -418,7 +385,7 @@ export default {
             // const operate = {
             //     operation: order.operate
             // };
-            // this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            // this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
             //     if (valid) {
             //         this.closeMenu(true);
             //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue
index 7cb5fba6a..31288e44a 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -90,7 +90,7 @@ export default {
             };
 
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -117,7 +117,7 @@ export default {
                 this.loading = true;
                 this.doClose();
                 this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         this.loading = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userAdd.vue
index 88cde52dd..3d5645680 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userDelete.vue
index cd58c3ed5..507c963b4 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userEdit.vue
index d75f3420e..fdc756bfd 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
index 6277e229c..b86673e5a 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="chengdou-01__system request_box">
-    <div class="title-box">
+    <div :id="domIdRequestBar" class="title-box">
       <div class="title-name">操作请求堆栈</div>
-      <div class="icon" :class="{'is-active': unfold}" @click="unflodDiv">
+      <div :id="unfold ? domIdConfirm : ''" class="icon" :class="{'is-active': unfold}" @click="unflodDiv">
         <i class="el-icon-arrow-down" />
       </div>
     </div>
@@ -13,15 +13,15 @@
       </el-table>
       <el-row justify="center" class="button-group">
         <el-col :span="2" :offset="4" class="button-top">
-          <el-button :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" :disabled="commitDisabled" @click="commit">重做</el-button>
+          <el-button size="mini" style="float: left;" :loading="loading" :disabled="commitDisabled" @click="commit">重做</el-button>
         </el-col>
         <el-col :span="2" :offset="12" class="button-top">
-          <el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">撤销</el-button>
+          <el-button size="mini" style="float: right;" @click="cancel">撤销</el-button>
         </el-col>
       </el-row>
       <el-row justify="center" class="button-group">
         <el-col :span="8" class="button-bottom-left">
-          <el-button :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" :disabled="commitDisabled" @click="commit">发送请求</el-button>
+          <el-button :id="unfold ? '' : domIdConfirm" size="mini" style="float: left;" :loading="loading" :disabled="commitDisabled" @click="commit">发送请求</el-button>
         </el-col>
         <el-col :span="8" :offset="8" class="button-bottom-right">
           <el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">取消请求</el-button>
@@ -57,10 +57,13 @@ export default {
             'requestList'
         ]),
         domIdConfirm() {
-            return OperationEvent.Signal.arrangementRoute.menu.domId;
+            return OperationEvent.Command.commandChengDu1.confirm.domId;
         },
         domIdCancel() {
-            return OperationEvent.Command.cancel.menu.domId;
+            return OperationEvent.Command.commandChengDu1.cancel.domId;
+        },
+        domIdRequestBar() {
+            return OperationEvent.Command.commandChengDu1.requestBar.domId;
         }
     },
     watch: {
@@ -80,6 +83,11 @@ export default {
                     }
                 });
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            if (val && !this.unfold) {
+                this.unfold = true;
+            }
         }
     },
     mounted() {
@@ -87,6 +95,9 @@ export default {
     methods: {
         unflodDiv() {
             this.unfold = !this.unfold;
+            setTimeout(() => {
+                this.$store.dispatch('training/emitTipFresh');
+            }, 300);
         },
         clickEvent(row, event, column) {
             this.row = row;
@@ -106,11 +117,11 @@ export default {
             const eachCmd = requestList[index];
             const operate = {
                 over: true,
-                operation: eachCmd.operation.code,
+                operation: OperationEvent.Command.commandChengDu1.confirm.operation,
                 cmdType: eachCmd.operation.cmdType,
                 param: eachCmd.operation.param // 请求栈中参数配置
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$store.dispatch('menuOperation/spliceRequestList', {deviceCode:eachCmd.device.code, operateCode:eachCmd.operation.code});
@@ -134,10 +145,10 @@ export default {
         height: auto;
         position: absolute;
         bottom: 10px;
-        left: 50%;
+        left: calc(50% - 300px);
         background: #fff;
         z-index: 10;
-        transform: translateX(-300px);
+        // transform: translateX(-300px);
         background: #518E86;
 
         .title-box{
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
index 4b1299066..30aa378a7 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSection.vue
@@ -23,9 +23,10 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SectionMenu',
@@ -45,32 +46,36 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '轨道封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: '轨道解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    }
-                    // {
-                    //     label: '速度控制',
-                    //     handler: this.setSpeed,
-                    //     cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '轨道封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Section.CMD_SECTION_BLOCK,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                },
+                {
+                    label: '轨道解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                }
+                // {
+                //     label: '速度控制',
+                //     handler: this.setSpeed,
+                //     cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                // }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -116,7 +121,7 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push( {
+            this.menuNormal.push( {
                 label: '新建计划列车',
                 handler: this.createPlanTrain,
                 cmdType: CMD.Section.CMD_Train_Init_Plan
@@ -133,7 +138,14 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                // this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    const status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
@@ -152,7 +164,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainAddPlan.doShow(step);
@@ -182,7 +194,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -218,7 +230,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.speedLimitControl.doShow(step, this.selected);
@@ -241,7 +253,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', step).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionControl.doShow(step, this.selected);
@@ -258,7 +270,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', step).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionCmdControl.doShow(step, this.selected);
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
index 3aae04243..2272f6f44 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSignal.vue
@@ -16,8 +16,9 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SignalMenu',
@@ -33,142 +34,171 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             popClass: 'chengdou-01__select-option',
-            menuNormal: {
-                Local: [
-                    {
-                        label: '始端/终端选择',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '开放自动进路',
-                        handler:  this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '关闭自动进路',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '终端信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '终端信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '引导信号',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '设备标签',
-                        handler: '',
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
-                        children: [
-                            {
-                                label: '创建设备标签',
-                                handler: '',
-                                cmdType: ''
-                            }
-                        ]
-                    },
-                    {
-                        label: '模拟',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: '选择设备',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: '帮助',
-                        handler: '',
-                        cmdType: ''
+            menuNormal: [
+                {
+                    label: '始端/终端选择',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => {
+                        return false;
                     }
-                ],
-                Center: [
-                    {
-                        label: '始端/终端选择',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '开放自动进路',
-                        handler:  this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '关闭自动进路',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '终端信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '终端信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '引导信号',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '设备标签',
-                        handler: '',
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
-                        children: [
-                            {
-                                label: '创建设备标签',
-                                handler: this.createDeviceLabel,
-                                cmdType: ''
-                            }
-                        ]
-                    },
-                    {
-                        label: '模拟',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: '选择设备',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: '帮助',
-                        handler: '',
-                        cmdType: ''
+                },
+                {
+                    label: '取消进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => {
+                        return false;
                     }
-                ]
-            },
+                },
+                {
+                    label: '开放自动进路',
+                    handler:  this.singalPassModel,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '关闭自动进路',
+                    handler: this.singalCancelPassModel,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '终端信号封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => {
+                        return signal.blockade !== 0;
+                    }
+                },
+                {
+                    label: '终端信号解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => {
+                        return signal.blockade === 0;
+                    }
+                },
+                {
+                    label: '引导信号',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '设备标签',
+                    handler: '',
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    children: [
+                        {
+                            label: '创建设备标签',
+                            handler: this.work == 'localWork' ? '' : this.createDeviceLabel,
+                            cmdType: '',
+                            show: false
+                        }
+                    ]
+                },
+                {
+                    label: '模拟',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (signal, work) => false
+                },
+                {
+                    label: '选择设备',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (signal, work) => false
+                },
+                {
+                    label: '帮助',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (signal, work) => false
+                }
+            ],
+            // Center: [
+            // {
+            //     label: '始端/终端选择',
+            //     handler: this.arrangementRoute,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+            // },
+            // {
+            //     label: '取消进路',
+            //     handler: this.cancelTrainRoute,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            // },
+            // {
+            //     label: '开放自动进路',
+            //     handler:  this.singalPassModel,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+            // },
+            // {
+            //     label: '关闭自动进路',
+            //     handler: this.singalCancelPassModel,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+            // },
+            // {
+            //     label: '终端信号封锁',
+            //     handler: this.lock,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+            // },
+            // {
+            //     label: '终端信号解封',
+            //     handler: this.unlock,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+            // },
+            // {
+            //     label: '引导信号',
+            //     handler: this.guide,
+            //     cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+            // },
+            // {
+            //     label: '设备标签',
+            //     handler: '',
+            //     cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+            //     children: [
+            //         {
+            //             label: '创建设备标签',
+            //             handler: this.createDeviceLabel,
+            //             cmdType: ''
+            //         }
+            //     ]
+            // },
+            // {
+            //     label: '模拟',
+            //     handler: '',
+            //     cmdType: ''
+            // },
+            // {
+            //     label: '选择设备',
+            //     handler: '',
+            //     cmdType: ''
+            // },
+            // {
+            //     label: '帮助',
+            //     handler: '',
+            //     cmdType: ''
+            // }
+            // ]
             menuForce: [
                 {
                     label: '设置故障',
@@ -221,7 +251,14 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work, this.lineCode) : true;
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -252,7 +289,7 @@ export default {
                 },
                 cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.routeControl.doShow(step, this.selected);
@@ -288,7 +325,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true});
                     const routes = [];
@@ -332,10 +369,10 @@ export default {
                 }
                 // cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.guide.menu.operation, name: '引导信号', cmdType:CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE}});
+                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.guide.menu.operation, name: '引导信号', cmdType:CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, param: { signalCode: `${this.selected.code}` }}});
                 }
             });
         },
@@ -352,10 +389,10 @@ export default {
                 // cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
 
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.cancelTrainRoute.menu.operation, name: '取消进路', cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE}});
+                    this.$store.dispatch('menuOperation/pushRequestList', {device: this.selected, operation: { code: OperationEvent.Signal.cancelTrainRoute.menu.operation, name: '取消进路', cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, param: { signalCode: `${this.selected.code}` }}});
                 }
             });
         },
@@ -371,10 +408,10 @@ export default {
                 }
                 // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号机封锁', cmdType:CMD.Signal.CMD_SIGNAL_BLOCK}});
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号机封锁', cmdType:CMD.Signal.CMD_SIGNAL_BLOCK, param: { signalCode: `${this.selected.code}` }}});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -392,10 +429,10 @@ export default {
                 }
                 // cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.unlock.menu.operation, name: '终端信号机解封', cmdType:CMD.Signal.CMD_SIGNAL_UNBLOCK}});
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.unlock.menu.operation, name: '终端信号机解封', cmdType:CMD.Signal.CMD_SIGNAL_UNBLOCK, param: { signalCode: `${this.selected.code}` }}});
                 }
             });
         },
@@ -409,10 +446,10 @@ export default {
                     signalCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.setAutoInterlock.menu.operation, name: '开放自动进路', cmdType:CMD.Signal.CMD_SIGNAL_SET_CI_AUTO}});
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.setAutoInterlock.menu.operation, name: '开放自动进路', cmdType:CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, param: { signalCode: `${this.selected.code}` }}});
                 }
             });
         },
@@ -426,10 +463,10 @@ export default {
                     signalCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.cancelAutoInterlock.menu.operation, name: '关闭自动进路', cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO}});
+                    this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.cancelAutoInterlock.menu.operation, name: '关闭自动进路', cmdType:CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, param: { signalCode: `${this.selected.code}` }}});
                 }
             });
         },
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue
index 5b8ef4010..1b63d6e2c 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue
@@ -15,6 +15,7 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'StationMenu',
@@ -32,17 +33,86 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                local: [
-                ],
-                central: [
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '本地控制许可',
+                    children: [
+                        {
+                            label: '请求',
+                            handler: this.setStationControl,
+                            cmdType: this.work === 'localWork' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
+                            isDisabled: (station, work) => {
+                                if (work === 'localWork') {
+                                    return station.controlMode !== 'Center';
+                                } else {
+                                    return station.controlMode === 'Center';
+                                }
+                            }
+                        },
+                        {
+                            label: '取消',
+                            handler: this.setCenterControl,
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
+                            isDisabled: (station, work) => {
+                                if (work === 'localWork') {
+                                    return station.controlMode === 'Center';
+                                } else {
+                                    return station.controlMode !== 'Center';
+                                }
+                            },
+                            isShow: (station, work) => {
+                                return work === 'localWork';
+                            }
+                        },
+                        {
+                            label: '紧急本地控制',
+                            handler: this.setEmergencyControl,
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL,
+                            isDisabled: (station, work) => {
+                                return station.controlMode === 'Emergency';
+                            },
+                            isShow: (station, work) => {
+                                return work === 'localWork';
+                            }
+                        }
+                    ]
+                },
+                {
+                    label: '进路模式',
+                    children: [
+                        {
+                            label: '自动',
+                            handler: this.atsAutoControlALL,
+                            cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                            isDisabled: (station, work) => {
+                                return false;
+                            }
+                        },
+                        {
+                            label: '人工',
+                            handler: this.humanControlALL,
+                            cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                            isDisabled: (station, work) => {
+                                return false;
+                            }
+                        }
+                    ],
+                    isShow: (station, work) => {
+                        return work === 'dispatchWork';
+                    }
+                }
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -91,7 +161,23 @@ export default {
             };
         },
         initMenu() {
+            const selected = this.selected;
+            const work = this.work;
+            function setDisabledShow(item) {
+                if (item.children) {
+                    item.children.forEach(ii => {
+                        setDisabledShow(ii);
+                    });
+                }
+                item.disabled = item.isDisabled ? item.isDisabled(selected, work) : false;
+                item.show = item.isShow ? item.isShow(selected, work) : true;
+            }
             if (this.selected.centralized) {
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    setDisabledShow(menuItem);
+                    this.menu.push(menuItem);
+                });
                 // 故障模式菜单列表
                 if (this.operatemode === OperateMode.FAULT) {
                     this.menu = [...this.menuForce];
@@ -139,6 +225,159 @@ export default {
                 }
             });
         },
+        // 所有进路自排关
+        humanControlALL() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.humanControlALL.menu.operation,
+                param: {
+                    stationCode: this.selected.code
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: {
+                            code: OperationEvent.Command.commandXian.confirm.operation,
+                            name: '所有进路自排关',
+                            cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                            param: step.param
+                        }
+                    });
+                } else {
+                    this.$refs.noticeInfo.doShow();
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        // 所有进路自排开
+        atsAutoControlALL() {
+            const step = {
+                start: true,
+                code: `${this.selected.code}`,
+                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
+                param: {
+                    stationCode: this.selected.code
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: {
+                            code: OperationEvent.Command.commandXian.confirm.operation,
+                            name: '所有进路自排开',
+                            cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                            param: step.param
+                        }
+                    });
+                } else {
+                    this.$refs.noticeInfo.doShow();
+                }
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        setPriorityStrategy() {
+            this.getStrategyByStation('侧线优先');
+        },
+        setLineStrategy() {
+            this.getStrategyByStation('直线折返');
+        },
+        setLateralStrategy() {
+            this.getStrategyByStation('侧线折返');
+        },
+        getStrategyByStation(type) {
+            const tbStrategy = this.tbStrategyList.find(strategy=>{
+                return strategy.stationCode == this.selected.code;
+            });
+            if (tbStrategy) {
+                const strategy = tbStrategy.optionList.find(each=>{
+                    return each.label == type;
+                });
+                if (strategy) {
+                    commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.code, id:strategy.id}, 0).then(({valid, operate})=>{
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$store.dispatch('menuOperation/pushRequestList', {
+                            device: this.selected,
+                            operation: {
+                                code: OperationEvent.Command.commandXian.confirm.operation,
+                                name: type,
+                                cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY,
+                                param: {stationCodes:[this.selected.code]}
+                            }
+                        });
+                    }).catch((error) => {
+                        console.error(error);
+                        this.$refs.noticeInfo.doShow();
+                    });
+                }
+            }
+        },
+        setStationControl() {
+            // 请求站控
+            commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: {
+                            code: OperationEvent.Command.commandXian.confirm.operation,
+                            name: '请求站控',
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL,
+                            param: {stationCodes:[this.selected.code]}
+                        }
+                    });
+                }
+            });
+        },
+        setCenterControl() {
+            // 请求中控
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: {
+                            code: OperationEvent.Command.commandXian.confirm.operation,
+                            name: '请求中控',
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
+                            param: {stationCodes:[this.selected.code]}
+                        }
+                    });
+                }
+            });
+        },
+        setEmergencyControl() {
+            // 紧急站控
+            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: {
+                            code: OperationEvent.Command.commandXian.confirm.operation,
+                            name: '紧急站控',
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL,
+                            param: {stationCodes:[this.selected.code]}
+                        }
+                    });
+                }
+            });
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
index 9195259cc..15ef46c83 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue
@@ -132,7 +132,7 @@ export default {
             //         };
             //
             //         this.loading = true;
-            //         this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            //         this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
             //             this.loading = false;
             //             if (valid) {
             //                 this.doClose();
@@ -155,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
index 80b27dea2..596d3d260 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue
@@ -16,8 +16,9 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationStandMenu',
@@ -33,51 +34,57 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            StoppingProfile: {
-                Local: [],
-                Center: [
-                    {
-                        label: '站台停站调整', // 设置停站时间
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '站台停站',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: '帮助',
-                        handler: '',
-                        cmdType: ''
-                    }
-                ]
-            },
-            know: {
-                Local: [],
-                Center: [
-                    {
-                        label: 'Skip Next Station',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: 'Skip Next Station',
-                        handler: '',
-                        cmdType: ''
-                    },
-                    {
-                        label: 'Help',
-                        handler: '',
-                        cmdType: ''
-                    }
-                ]
-            },
+            StoppingProfile: [
+                {
+                    label: '站台停站调整', // 设置停站时间
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '站台停站',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            know: [
+                {
+                    label: 'Skip Next Station',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: 'Skip Next Station',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: 'Help',
+                    handler: '',
+                    cmdType: '',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -113,14 +120,25 @@ export default {
                 self.doClose();
             };
         },
+        getMenu(type) {
+            this.menu = [];
+            this[type].forEach(menuItem => {
+                const status = judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
+        },
         initMenu(type) {
             // 编辑模式菜单列表
             switch (type) {
             case 'stoppingProfile':
-                this.menu = MenuContextHandler.covert(this.StoppingProfile);
+                // this.menu = MenuContextHandler.covert(this.StoppingProfile);
+                this.getMenu(type);
                 break;
             case 'know':
-                this.menu = MenuContextHandler.covert(this.StoppingProfile);
+                // this.menu = MenuContextHandler.covert(this.StoppingProfile);
+                this.getMenu(type);
                 break;
             }
             // this.menu = MenuContextHandler.covert(this.menuNormal);
@@ -170,7 +188,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.StationStand.setJumpStop.menu.operation});
@@ -188,7 +206,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.StationStand.cancelJumpStop.menu.operation, name: '取消跳停'}});
@@ -206,7 +224,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.platformDwell.doShow(step, this.selected);
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
index 59767b4db..f484f8283 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuSwitch.vue
@@ -21,8 +21,9 @@ import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SwitchMenu',
@@ -43,84 +44,67 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '道岔定位',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '道岔反位',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+            menuNormal: [
+                {
+                    label: '道岔定位',
+                    handler: this.locate,
+                    cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.normalPosition === 1;
+                        } else {
+                            return switchDevice.normalPosition === 1;
+                        }
                     }
-                ],
-                Center: [
-                    {
-                        label: '道岔定位',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '道岔反位',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+                },
+                {
+                    label: '道岔反位',
+                    handler: this.reverse,
+                    cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.reversePosition === 1;
+                        } else {
+                            return switchDevice.reversePosition === 1;
+                        }
                     }
-                    // {
-                    //     label: '设备标签',
-                    //     handler: '',
-                    //     cmdType: '',
-                    //     children: [
-                    //         {
-                    //             label: '创建设备标签',
-                    //             handler: this.createDeviceLabel,
-                    //             cmdType: ''
-                    //         }
-                    //     ]
-                    // },
-                    // {
-                    //     label: '模拟',
-                    //     handler: '',
-                    //     cmdType: ''
-                    // },
-                    // {
-                    //     label: '选择设备',
-                    //     handler: '',
-                    //     cmdType: ''
-                    // },
-                    // {
-                    //     label: '帮助',
-                    //     handler: '',
-                    //     cmdType: ''
-                    // }
-                ]
-            },
+                },
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.singleLock !== 0;
+                        } else {
+                            return switchDevice.singleLock !== 0;
+                        }
+                    }
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.singleLock !== 1;
+                        } else {
+                            return switchDevice.singleLock !== 1;
+                        }
+                    }
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -165,8 +149,14 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -213,12 +203,13 @@ export default {
         lock() {
             const operate = {
                 start: true,
+                code: `${this.selected.code}`,
                 operation: OperationEvent.Switch.lock.menu.operation,
                 param: {
                     switchCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     // this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Switch.lock.menu.operation, name: '道岔单锁'}} );
@@ -230,12 +221,13 @@ export default {
         unlock() {
             const operate = {
                 start: true,
+                code: `${this.selected.code}`,
                 operation: OperationEvent.Switch.unlock.menu.operation,
                 param: {
                     switchCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     // this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔单解'}});
@@ -247,12 +239,13 @@ export default {
         locate() {
             const operate = {
                 start: true,
+                code: `${this.selected.code}`,
                 operation: OperationEvent.Switch.locate.menu.operation,
                 param: {
                     switchCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     // this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Switch.locate.menu.operation, name: '道岔定位',cmdType:CMD.Switch.CMD_SWITCH_TURN}});
@@ -264,12 +257,13 @@ export default {
         reverse() {
             const operate = {
                 start: true,
+                code: `${this.selected.code}`,
                 operation: OperationEvent.Switch.reverse.menu.operation,
                 param: {
                     switchCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     // this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Switch.reverse.menu.operation, name: '道岔反位',cmdType:CMD.Switch.CMD_SWITCH_TURN}});
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
index 3a83f1f7d..1476dda68 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuTrain.vue
@@ -15,7 +15,7 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 // import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
@@ -37,6 +37,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -238,7 +244,7 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             // this.menu = trainMenuFiltration(this.menuNormal);
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -390,7 +396,7 @@ export default {
 
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -408,7 +414,7 @@ export default {
 
                 operation: OperationEvent.Train.setPlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -425,7 +431,7 @@ export default {
 
                 operation: OperationEvent.Train.destinationTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -442,7 +448,7 @@ export default {
 
                 operation: OperationEvent.Train.artificialTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -459,7 +465,7 @@ export default {
 
                 operation: OperationEvent.Train.detailTrainInfo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
@@ -476,7 +482,7 @@ export default {
 
                 operation: OperationEvent.Train.createTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainCreateNumber.doShow(operate, this.selected);
@@ -491,7 +497,7 @@ export default {
 
                 operation: OperationEvent.Train.deleteTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeleteNumber.doShow(operate, this.selected);
@@ -506,7 +512,7 @@ export default {
 
                 operation: OperationEvent.Train.editTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(operate, this.selected);
@@ -521,7 +527,7 @@ export default {
 
                 operation: OperationEvent.Train.moveTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveNumber.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
index 68df99ba9..c9893cb76 100644
--- a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
@@ -78,7 +78,6 @@
         <span style="line-height:26px">未确认{{ level }}级报警数目：1</span>
       </el-col>
     </el-row>
-    </span>
   </el-dialog>
 </template>
 
@@ -129,8 +128,8 @@ export default {
             if (elem && elem.hasOwnProperty('success')) {
                 if (elem.success) {
                     const operate = this.$store.state.training.operate;
-                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                     const newOperate = {
                         type: operate.type,
                         name: station.name
@@ -175,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -187,7 +186,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/timeout.vue
index 289940271..db449866b 100644
--- a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/timeout.vue
@@ -42,8 +42,8 @@ export default {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
                 const operate = this.$store.state.training.operate;
-                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     type: operate.type,
                     name: station.name
@@ -82,7 +82,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -94,7 +94,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
index d298f8bc1..e7a5aba01 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue
@@ -104,7 +104,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -121,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
index d49556383..b92e21bb0 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -114,7 +114,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -133,7 +133,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/chengdu_03/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
index 494347b75..110e01e50 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
index 5d5a948dc..33ba9881c 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue
@@ -23,40 +23,40 @@
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">7</el-button>
+        <el-button @click="inputNum(7)">7</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">8</el-button>
+        <el-button @click="inputNum(8)">8</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">9</el-button>
+        <el-button @click="inputNum(9)">9</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">4</el-button>
+        <el-button @click="inputNum(4)">4</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">5</el-button>
+        <el-button @click="inputNum(5)">5</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">6</el-button>
+        <el-button @click="inputNum(6)">6</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">1</el-button>
+        <el-button @click="inputNum(1)">1</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">2</el-button>
+        <el-button @click="inputNum(2)">2</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">3</el-button>
+        <el-button @click="inputNum(3)">3</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">0</el-button>
+        <el-button @click="inputNum(0)">0</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
         <el-button @click="inputClear">C</el-button>
@@ -102,7 +102,7 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.password.domId : ''
+            return this.dialogShow ? OperationEvent.Command.cancel.password.domId : '';
         },
         domIdConfirm() {
             return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
@@ -137,9 +137,9 @@ export default {
             }
         },
         /* 软键盘输入*/
-        inputNum(e) {
+        inputNum(num) {
             this.showMistake = false;
-            this.passwordCheck += e.path[0].innerText;
+            this.passwordCheck += num;
             this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
         },
         /* 软键盘清除*/
@@ -165,7 +165,7 @@ export default {
                 operation: OperationEvent.Command.cancel.password.operation
             };
             this.$emit('checkCancel');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
index b6b925622..33b7e455b 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/popupAlarm.vue
@@ -75,7 +75,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
index b7211c025..b3e6a5282 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue
@@ -167,7 +167,7 @@ export default {
                 operation: OperationEvent.Signal.detail.menu.operation
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -183,7 +183,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
index 11cba9131..38a9d8c78 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue
@@ -201,7 +201,7 @@ export default {
                     operation: OperationEvent.Signal.guide.choose.operation,
                     val: row.code
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -221,7 +221,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -241,7 +241,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
index 69ce0d572..09860a94d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue
@@ -208,7 +208,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -256,7 +256,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
index 12014afb3..de45a16dd 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue
@@ -247,7 +247,7 @@ export default {
                     val: row.code
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -289,7 +289,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
index 7e6a03371..f15df91a8 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/sectionDetail.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Section.detail.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
index c6c29c830..263ac2925 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
@@ -514,7 +514,7 @@ export default {
             this.handleBreak(operate);
         },
         handleBreak(operate) { // 断点记录
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 valid && this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -580,7 +580,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
index efe048e52..cd5928315 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standDetail.vue
@@ -185,7 +185,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -199,7 +199,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
index 738d9509e..9f3096d8f 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue
@@ -246,7 +246,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -270,7 +270,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -294,7 +294,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -313,7 +313,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
index 59f7935b6..23f18154c 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue
@@ -104,7 +104,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
index e56f2f80d..d86b850d3 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
index 895d6024c..e075016e8 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue
@@ -118,7 +118,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
index 210e2dc87..57cfde74f 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
index 907727139..d3a11dc35 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
@@ -353,7 +353,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
index 570e22144..adca22a83 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainEditNumber.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
index 82c84dc13..0075a4d86 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue
@@ -158,7 +158,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
index 7e7635d23..bdfaa11fc 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
@@ -147,7 +147,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
index 583e53d8e..20a0b7ed0 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
@@ -166,7 +166,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -188,7 +188,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/index.vue b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue
similarity index 85%
rename from src/jmapNew/theme/chengdu_03/menus/index.vue
rename to src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue
index e83faddc5..e3fda315d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/index.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue
@@ -1,42 +1,41 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-    <menu-button ref="menuButton" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
+    <menu-bar ref="menuBar" :selected="selected" />
+
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'dispatchWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'dispatchWork'" />
+
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" pop-class="chengdou-03__systerm" />
     <passive-Timeout ref="passiveTimeout" />
   </div>
 </template>
-
 <script>
 import { mapGetters } from 'vuex';
+import MenuBar from './dispatchWorkMenuBar';
+
 import MenuSignal from './menuSignal';
-import MenuButton from './menuButton';
 import MenuStationStand from './menuStationStand';
 import MenuSwitch from './menuSwitch';
 import MenuSection from './menuSection';
-import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
-import MenuBar from './menuBar';
+import MenuTrain from './menuTrain';
+
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
-
 export default {
-    name: 'Menus',
+    name: 'DispatchWorkMenu',
     components: {
         MenuBar,
-        MenuButton,
         MenuSignal,
+        MenuStationStand,
         MenuSwitch,
         MenuSection,
-        MenuStationStand,
         MenuStation,
         MenuTrain,
         PassiveAlarm,
@@ -54,39 +53,15 @@ export default {
     computed: {
         ...mapGetters('config', [
             'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
-    },
-    watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        }
+        ])
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
-            const _that = this;
-            window.onclick = function (e) {
-                if (!_that.$store.state.training.trainingStart) {
-                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
-                }
-                _that.$refs.menuStationStand.doClose();
-                _that.$refs.menuSwitch.doClose();
-                _that.$refs.menuSignal.doClose();
-                _that.$refs.menuSection.doClose();
-                _that.$refs.menuTrain.doClose();
-                _that.$refs.menuStation.doClose();
-            };
         });
-    },
-    beforeDestroy() {
-        window.onclick = function (e) {};
     }
 };
 </script>
-
 <style>
     .menus .pop-menu {
         background: #F0F0F0;
diff --git a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..74c576be1
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,386 @@
+<template>
+  <div id="menuBarChengdu3">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <help-about ref="helpAbout" />
+    <set-limit-speed ref="setLimitSpeed" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import HelpAbout from './menuDialog/helpAbout';
+import SetLimitSpeed from './menuDialog/setLimitSpeed';
+import { mapGetters } from 'vuex';
+
+export default {
+    name: 'DispatchWorkMenuBar',
+    components: {
+        MenuBar,
+        HelpAbout,
+        SetLimitSpeed
+    },
+    data() {
+        return {
+            menuNormal:[
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '临时限速',
+                    operate: OperationEvent.Command.mBar.limitSpeed,
+                    children: [
+                        {
+                            title: '设置临时限速',
+                            operate: OperationEvent.Section.setLimitSpeed,
+                            click: this.setLimitSpeed
+                        },
+                        {
+                            title: '取消临时限速',
+                            operate: OperationEvent.Section.cancelSpeed,
+                            click: this.cancleLimitSpeed
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: '显示',
+                    operate: OperationEvent.Command.mBar.view,
+                    hide: true,
+                    children: [
+                        {
+                            title: '设置列车识别号显示',
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        },
+                        {
+                            title: '设置名称显示',
+                            click: this.setNameDisplay,
+                            operate: OperationEvent.Command.view.setNameDisplay
+                        },
+                        {
+                            title: '设置设备显示',
+                            click: this.setDeviceDisplay,
+                            operate: OperationEvent.Command.view.setDeviceDisplay
+                        }
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: '',
+                    children: [
+                        {
+                            title: '全线扣车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消全线扣车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: '',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+
+            ]
+        };
+    },
+    computed:{
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    mounted() {
+        this.initMenu();
+    },
+
+    methods:{
+        initMenu() {
+            if (this.menuNormal[3]) {
+                this.menuNormal[3].children = this.initStationList();
+            }
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.$refs.menuBar.doClose();
+            }
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        setLimitSpeed(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.setLimitSpeed.doShow(operate, true);
+                }
+            });
+        },
+        cancleLimitSpeed(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.setLimitSpeed.doShow(operate, false);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+    #menuBarChengdu3{
+        line-height:30px;
+    }
+    #menuBarChengdu3 #menuBar .menu-li-block .label{
+        padding: 0px 30px 0px 5px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
new file mode 100644
index 000000000..b3cb3a4df
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue
@@ -0,0 +1,314 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-button ref="menuButton" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import MenuTrain from './menuTrain';
+import MenuButton from './menuButton';
+import MenuBar from './localWorkMenuBar';
+export default {
+    name: 'LocalWorkMenu',
+    components: {
+        MenuTrain,
+        MenuButton,
+        MenuBar
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
+};
+</script>
+<style>
+.menus .pop-menu {
+    background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+    color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+    color: #B4B3B8;
+}
+
+.chengdou-03__systerm {
+    overflow: hidden !important;
+}
+
+.chengdou-03__systerm .el-dialog {
+    background: #0055E8;
+    box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+    border: 1px solid rgb(69, 134, 247);
+    border-radius: 6px;
+    font-size: 13px !important;
+    color: #000;
+}
+
+.chengdou-03__systerm .el-dialog span {
+    font-size: 13px !important;
+    line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog span .el-icon-arrow-up{
+    line-height: 18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__footer {
+    background: #ECE9D8;
+    opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__body {
+    padding: 20px;
+    margin: 0px 3px 3px;
+    border: 2px solid rgba(120, 121, 123, 0.5);
+    box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+    background: #ECE9D8;
+    opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__title {
+    font-size: 16px;
+    color: #fff;
+    position: absolute;
+    top: 4px;
+    left: 7px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn {
+    background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+    border: 1px solid #fff;
+    border-radius: 4px;
+    top: 6px;
+    right: 3px;
+    line-height: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+    font-size: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+    color: #fff;
+}
+
+.chengdou-03__systerm .el-dialog .el-button {
+    height: 24px;
+    line-height: 22px;
+    padding: 0px;
+    width: 80px;
+    border: 2px outset #E2E2E2;
+    border-radius: 4px !important;
+    color: #000;
+    background: #F0F0F0;
+}
+
+.chengdou-03__systerm .el-dialog .expand {
+    width: 120px;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:focus span {
+    border: 1px dashed gray;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:active {
+    border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled {
+    border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled span {
+    border: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-input {
+    border: 2px inset #E9E9E9;
+    height: 22px !important;
+    line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input__inner {
+    color: #000;
+    background: #fff !important;
+    border: 0px;
+    border-radius: 0px !important;
+    box-sizing: border-box;
+    height: 22px !important;
+    line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+    background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea {
+    border: 2px inset #E9E9E9;
+    border-radius: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea .el-textarea__inner {
+    color: #000;
+    background: #fff !important;
+    border: 0px;
+    border-radius: 0px !important;
+    box-sizing: border-box;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+    background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table--border th.gutter {
+    background: #EBEADB !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table {
+    border: 2px inset #E9E9E9;
+    color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .cell {
+    height: 22px;
+    line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table th.is-leaf {
+    background: #F0F0F0 !important;
+    border-right: 1px solid #BDBDBD !important;
+    border-bottom: 1px solid #BDBDBD !important;
+    color: #000 !important;
+    height: 20px !important;
+    padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table tr td {
+    height: 20px !important;
+    padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .el-table__empty-text {
+    top: 15px !important;
+}
+
+.chengdou-03__systerm .el-dialog .current-row>td {
+    background: #3399FF !important;
+    color: #fff !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__inner {
+    border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__label {
+    color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+    background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+    color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+    background: #fff !important;
+    border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+    position: absolute;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
+    content: "";
+    border: 1px solid #000;
+    border-left: 0;
+    border-top: 0;
+    height: 7px;
+    left: 4px;
+    top: 1px;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__inner {
+    border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__label {
+    color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+    background: #fff !important;
+    border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+    width: 4px;
+    height: 4px;
+    border-radius: 100%;
+    background-color: #000 !important;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+    background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+    color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .base-label {
+    background: rgba(0, 0, 0, x);
+    position: relative;
+    left: -15px;
+    top: -18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-form-item label {
+    font-weight: normal !important;
+    color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .context {
+    height: 100px;
+    border: 2px inset #E2E2E2;
+    overflow-y: scroll;
+}
+
+.chengdou-03__systerm .el-dialog .table {
+    margin-top: 10px;
+}
+
+.chengdou-03__systerm .el-dialog .notice {
+    margin-left: 62px;
+    line-height: 30px;
+}
+
+.chengdou-03__systerm .el-dialog .button-group {
+    margin-top: 20px;
+}
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue b/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..f6ecdebcf
--- /dev/null
+++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue
@@ -0,0 +1,342 @@
+<template>
+  <div id="menuBarChengdu3">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <help-about ref="helpAbout" />
+    <set-limit-speed ref="setLimitSpeed" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import HelpAbout from './menuDialog/helpAbout';
+import SetLimitSpeed from './menuDialog/setLimitSpeed';
+export default {
+    name: 'LocalWorkMenuBar',
+    components: {
+        MenuBar,
+        HelpAbout,
+        SetLimitSpeed
+    },
+    data() {
+        return {
+            menuNormal:[
+                {
+                    title: '系统',
+                    // operate: OperationEvent.Command.mBar.system,
+                    operate: '',
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '临时限速',
+                    operate: OperationEvent.Command.mBar.limitSpeed,
+                    children: [
+                        {
+                            title: '设置临时限速',
+                            operate: OperationEvent.Section.setLimitSpeed,
+                            click: this.setLimitSpeed
+                        },
+                        {
+                            title: '取消临时限速',
+                            operate: OperationEvent.Section.cancelSpeed,
+                            click: this.cancleLimitSpeed
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    // operate: OperationEvent.Command.mBar.check,
+                    operate: '',
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '显示',
+                    // operate: OperationEvent.Command.mBar.view,
+                    operate: '',
+                    hide: true,
+                    children: [
+                        {
+                            title: '设置列车识别号显示',
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        },
+                        {
+                            title: '设置名称显示',
+                            click: this.setNameDisplay,
+                            operate: OperationEvent.Command.view.setNameDisplay
+                        },
+                        {
+                            title: '设置设备显示',
+                            click: this.setDeviceDisplay,
+                            operate: OperationEvent.Command.view.setDeviceDisplay
+                        }
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: '',
+                    children: [
+                        {
+                            title: '全线扣车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消全线扣车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: '',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    methods:{
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        setLimitSpeed(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.setLimitSpeed.doShow(operate, true);
+                }
+            });
+        },
+        cancleLimitSpeed(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.setLimitSpeed.doShow(operate, false);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operate
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+    #menuBarChengdu3{
+        line-height:30px;
+    }
+    #menuBarChengdu3 #menuBar .menu-li-block .label{
+        padding: 0px 30px 0px 5px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue b/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
deleted file mode 100644
index e7be252ef..000000000
--- a/src/jmapNew/theme/chengdu_03/menus/menuBar.vue
+++ /dev/null
@@ -1,685 +0,0 @@
-<template>
-  <div id="menuBarChengdu3">
-    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
-    <station-control-convert ref="stationControlConvert" />
-    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
-    <view-name ref="viewName" />
-    <train-add ref="trainAdd" />
-    <train-transtalet ref="trainTranstalet" />
-    <train-delete ref="trainDelete" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-    <set-limit-speed ref="setLimitSpeed" />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import MenuBar from '@/jmapNew/theme/components/menus/menuBar';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import StationControlConvert from './menuDialog/stationControlConvert';
-import TrainAdd from './menuDialog/trainAdd';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-import TrainDelete from './menuDialog/trainDelete';
-import PasswordBox from './menuDialog/passwordBox';
-import ViewName from './menuDialog/viewName';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-import SetLimitSpeed from './menuDialog/setLimitSpeed';
-
-export default {
-    name: 'MenuBarChengdu03',
-    components: {
-        MenuBar,
-        StationControlConvert,
-        PasswordBox,
-        ViewName,
-        TrainAdd,
-        TrainTranstalet,
-        TrainDelete,
-        ManageUser,
-        HelpAbout,
-        SetLimitSpeed
-    },
-    data() {
-        return {
-            menuNormal: {
-                Local: [
-                    {
-                        title: '系统',
-                        // operate: OperationEvent.Command.mBar.system,
-                        operate: '',
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '临时限速',
-                        operate: OperationEvent.Command.mBar.limitSpeed,
-                        children: [
-                            {
-                                title: '设置临时限速',
-                                operate: OperationEvent.Section.setLimitSpeed,
-                                click: this.setLimitSpeed
-                            },
-                            {
-                                title: '取消临时限速',
-                                operate: OperationEvent.Section.cancelSpeed,
-                                click: this.cancleLimitSpeed
-                            }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        // operate: OperationEvent.Command.mBar.check,
-                        operate: '',
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    // {
-                    //     title: '车站定位',
-                    //     operate: '',
-                    //     children: [
-                    //     ]
-                    // },
-                    {
-                        title: '显示',
-                        // operate: OperationEvent.Command.mBar.view,
-                        operate: '',
-                        hide: true,
-                        children: [
-                            {
-                                title: '设置列车识别号显示',
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            },
-                            {
-                                title: '设置名称显示',
-                                click: this.setNameDisplay,
-                                operate: OperationEvent.Command.view.setNameDisplay
-                            },
-                            {
-                                title: '设置设备显示',
-                                click: this.setDeviceDisplay,
-                                operate: OperationEvent.Command.view.setDeviceDisplay
-                            }
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '批处理命令',
-                        operate: '',
-                        children: [
-                            {
-                                title: '全线扣车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消全线扣车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '信息管理',
-                        operate: '',
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        operate: '',
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ],
-                Center: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '临时限速',
-                        operate: OperationEvent.Command.mBar.limitSpeed,
-                        children: [
-                            {
-                                title: '设置临时限速',
-                                operate: OperationEvent.Section.setLimitSpeed,
-                                click: this.setLimitSpeed
-                            },
-                            {
-                                title: '取消临时限速',
-                                operate: OperationEvent.Section.cancelSpeed,
-                                click: this.cancleLimitSpeed
-                            }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: '显示',
-                        operate: OperationEvent.Command.mBar.view,
-                        hide: true,
-                        children: [
-                            {
-                                title: '设置列车识别号显示',
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            },
-                            {
-                                title: '设置名称显示',
-                                click: this.setNameDisplay,
-                                operate: OperationEvent.Command.view.setNameDisplay
-                            },
-                            {
-                                title: '设置设备显示',
-                                click: this.setDeviceDisplay,
-                                operate: OperationEvent.Command.view.setDeviceDisplay
-                            }
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '批处理命令',
-                        operate: '',
-                        children: [
-                            {
-                                title: '全线扣车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消全线扣车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '信息管理',
-                        operate: '',
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        operate: '',
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    created() {
-        this.menuNormal['Center'][3].children = this.initStationList();
-    },
-    methods: {
-        initStationList() {
-            const list = [];
-            this.stationList.forEach(station => {
-                if (station.visible) {
-                    const node = {
-                        title: station.name,
-                        operate: station.code,
-                        show: true,
-                        click: this.mapLocation,
-                        code: station.code
-                    };
-
-                    list.push(node);
-                }
-            });
-            return list;
-        },
-        // 设置地图定位
-        mapLocation(code) {
-            if (code) {
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
-
-            }
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                operation: order.operate
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        setLimitSpeed(order) {
-            const operate = {
-                operation: order.operate
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.setLimitSpeed.doShow(operate, true);
-                }
-            });
-        },
-        blankClickClose() {
-            this.$refs.menuBar.doClose();
-        },
-        cancleLimitSpeed(order) {
-            const operate = {
-                operation: order.operate
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.setLimitSpeed.doShow(operate, false);
-                }
-            });
-        },
-        undeveloped() {
-            this.$refs.menuBar.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-    #menuBarChengdu3{
-        line-height:30px;
-    }
-    #menuBarChengdu3 #menuBar .menu-li-block .label{
-        padding: 0px 30px 0px 5px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
index d840ffab2..110f27288 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height: 45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div id="menuButtons_box" class="menu menuButton" style="height: 45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button :id="Signal.arrangementRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.arrangementRoute.button.operation, ['Signal'])">
       <span style="color: black">
         <center><b>排</b><b>列</b></center>
@@ -111,7 +111,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import { getAutoReentryBySignalCode } from '@/utils/mapList';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -172,9 +172,6 @@ export default {
         Command() {
             return OperationEvent.Command;
         },
-        isShowBtn() {
-            return this.$store.state.training.prdType == '01';
-        },
         CMD() {
             return CMD;
         },
@@ -214,6 +211,11 @@ export default {
         },
         '$store.state.menuOperation.selectedCount': function (val) {
             this.selectedChange();
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (val && this.$store.state.menuOperation.buttonOperation) {
+                this.$store.dispatch('menuOperation/setButtonOperation', null);
+            }
         }
     },
     beforeDestroy() {
@@ -246,12 +248,12 @@ export default {
 
         },
         checkCancel() {
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', null);
         },
         // 执行操作
         trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -296,7 +298,7 @@ export default {
                     // this.MixinCommand.totalCancel.button.operation
                 ];
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.operation = operation;
                         this.commandTypeList = commandTypeList;
@@ -315,12 +317,12 @@ export default {
                     start: true,
                     operation: operation
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.commandTypeList = [];
                         this.$store.dispatch('menuOperation/setButtonOperation', null);
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        Handler.clear(); // 清空操作组
+                        // Handler.clear(); // 清空操作组
                     }
                 });
             }
@@ -328,7 +330,7 @@ export default {
         resetMbmButton() {
             this.commandTypeList = [];
             this.$store.dispatch('menuOperation/setButtonOperation', null);
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
         },
         // 排列进路 OR 信号重开操作
         arrangementRouteOperation(deviceList) {
@@ -354,12 +356,12 @@ export default {
                     operate.code = deviceList[0].code;
                     operate.param = {signalCode: deviceList[0].code};
                     this.deviceList = [];
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {}).catch(() => {
                         this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     operate.code = deviceList[0].code; // 进路排列
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch(() => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {}).catch(() => {
                         this.$refs.noticeInfo.doShow();
                     });
                 }
@@ -375,7 +377,7 @@ export default {
                         operate.param = {routeCode: item.code};
                         this.deviceList = [];
                         flag = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                         }).catch(() => {
                             this.$refs.noticeInfo.doShow();
                         });
@@ -415,33 +417,34 @@ export default {
                 switch (subType) {
                 case 'substation':
                     operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
+                    operate.subType = 'substation';
                     operate.param = {stationCodes: [model.code]};
                     operate.code = model.code;
                     break;
                 case 'center':
-                    // operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
-                    delete operate.over;
+                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
+                    // delete operate.over;
                     operate.subType = 'center';
                     operate.param = {stationCodes: [model.code]};
                     operate.code = model.code;
                     break;
                 case 'emergency':
-                    // operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
-                    delete operate.over;
+                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
+                    // delete operate.over;
                     operate.subType = 'emergency';
                     operate.param = {stationCodes: [model.code]};
                     operate.code = model.code;
                     break;
                 case 'interconnected':
-                    // operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
-                    delete operate.over;
+                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
+                    // delete operate.over;
                     operate.subType = 'interconnected';
                     operate.param = {stationCodes: [model.code]};
                     operate.code = model.code;
                     break;
                 }
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 // 判断是否需要 弹窗密码框
                 // const operate = Object.assign({}, operate);
                 if (subType == 'center ' || subType == 'emergency' || subType == 'interconnected' ) {
@@ -496,7 +499,7 @@ export default {
                 operate.param = {signalCode: route.startSignalCode};
                 operate.code = model.code;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {}).catch((error) => {
                 this.deviceList = [];
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
@@ -516,7 +519,7 @@ export default {
                         code: deviceList[0].code,
                         operation: this.$store.state.menuOperation.buttonOperation
                     };
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                             operate['operateNext'] = this.Command.close.password.operation;
@@ -533,7 +536,7 @@ export default {
                         overNext: true,
                         param: {routeCode: route.code, signalCode: deviceList[0].code}
                     };
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.deviceList = [];
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -560,7 +563,7 @@ export default {
                         operate.param = {routeCode: item.code, signalCode: deviceList[0].code};
                         this.deviceList = [];
                         flag = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {}).catch((error) => {
                             this.$refs.noticeInfo.doShow();
                             console.error(error);
                         });
@@ -584,13 +587,13 @@ export default {
                 operate.cmdType = CMD.Signal.CMD_SIGNAL_CLOSE_GUIDE;
                 operate.param = {signalCode: model.code};
                 this.deviceList = [];
-                this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {});
+                this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {});
             } else {
                 operate.cmdType = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
                 operate.param = {signalCode: model.code};
                 operate.val = model.code;
                 this.deviceList = [];
-                this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                     console.error(error);
                     this.$refs.noticeInfo.doShow();
                 });
@@ -612,7 +615,7 @@ export default {
             });
             operate.param = {signalCode: model.code, routeCodeList: routeCodeList};
             this.deviceList = [];
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
@@ -625,7 +628,7 @@ export default {
                 cmdType: this.cmdType,
                 param: { switchCode: model.code}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
@@ -652,7 +655,7 @@ export default {
                 operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
                 operate.param = {signalCode: model.code};
             }
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
@@ -670,7 +673,7 @@ export default {
             } else {
                 operate.cmdType = CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {
                 this.resetMbmButton();
             }).catch((error) => {
                 console.error(error);
@@ -685,17 +688,12 @@ export default {
                 cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
                 param: {sectionCode: model.code}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
         },
         selectedChange() {
-            // 按钮按下时
-            if (this.$store.state.training.prdType != '01') {
-                return '';
-            }
-
             const buttonOperation = this.$store.state.menuOperation.buttonOperation;
             const model = this.$store.state.menuOperation.selected; // 选择设备
             const subType = this.$store.state.menuOperation.subType; // 选择设备的子元素
@@ -743,7 +741,7 @@ export default {
             }
         },
         clearOperate() {
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.deviceList = [];
             this.$store.dispatch('menuOperation/setButtonOperation', null);
         }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
index c1f7b93a3..5068abbbf 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -90,7 +90,7 @@ export default {
             };
 
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -117,7 +117,7 @@ export default {
                 this.loading = true;
                 this.doClose();
                 this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         this.loading = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
index 6c98c5a53..9094641d7 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userAdd.vue
@@ -114,7 +114,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 if (this.model.password === this.model.confirm) {
@@ -136,7 +136,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
index e64aa49f3..b634b2eac 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userDelete.vue
@@ -91,7 +91,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -108,7 +108,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
index b03165a1b..dcca966bb 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/childDialog/userEdit.vue
@@ -127,7 +127,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid)
                                 if (this.selected.password !== this.model.oldPassword) {
@@ -152,7 +152,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
index 4dc26a4ce..e88828975 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/helpAbout.vue
@@ -89,7 +89,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -105,7 +105,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
index e416e68e0..82a113010 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue
@@ -95,7 +95,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
index deef68f43..daa8cc237 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/manageUser.vue
@@ -130,7 +130,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userAdd.doShow(operate);
@@ -148,7 +148,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userEdit.doShow(operate, this.selected);
@@ -170,7 +170,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userDelete.doShow(operate, this.selected);
@@ -190,7 +190,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                 }).catch(error => {
                     this.loading = false;
@@ -204,7 +204,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.selected = row;
                 }).catch(error => {
@@ -218,7 +218,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -234,7 +234,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
index 69fa03d70..1af1e9114 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue
@@ -122,7 +122,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -140,7 +140,7 @@ export default {
 
             if (this.model.password == '123456') {
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
index dfb5821b3..6ebe22260 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
@@ -222,7 +222,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -244,7 +244,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
index 046b66327..75139bf30 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
@@ -285,7 +285,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -326,7 +326,7 @@ export default {
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -351,7 +351,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -378,7 +378,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -405,7 +405,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
index fba049a10..93227cf2f 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainAdd.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
index b1139915a..e622ae48a 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainDelete.vue
@@ -108,7 +108,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -130,7 +130,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
index 97918ae44..f50209b87 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/trainTranstalet.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
index 4a32473d5..808210bde 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
index e4babd785..426490735 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSection.vue
@@ -21,9 +21,10 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SectionMenu',
@@ -42,27 +43,33 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '区故解',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    },
-                    {
-                        label: '属性',
-                        handler: this.detail,
-                        cmdType: CMD.Section.CMD_SECTION_DETAILS
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '区故解',
+                    handler: this.fault,
+                    cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
+                    isDisabled: (sectionDevice, work) => false,
+                    isShow: (sectionDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '属性',
+                    handler: this.detail,
+                    cmdType: CMD.Section.CMD_SECTION_DETAILS,
+                    isDisabled: (sectionDevice, work) => false,
+                    isShow: (sectionDevice, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -108,10 +115,12 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push( {
+            this.menuNormal.push({
                 label: '新建计划列车',
                 handler: this.createPlanTrain,
-                cmdType: CMD.Section.CMD_Train_Init_Plan
+                cmdType: CMD.Section.CMD_Train_Init_Plan,
+                isDisabled: (sectionDevice, work) => false,
+                isShow: (sectionDevice, work) => work === 'dispatchWork'
             });
         }
     },
@@ -119,7 +128,12 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    menuItem.disabled = !judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                    menuItem.show = menuItem.isShow(this.selected, this.work);
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
@@ -157,7 +171,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
index 9e40ee29b..27896bbc3 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSignal.vue
@@ -25,9 +25,10 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordInputBox';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SignalMenu',
@@ -48,102 +49,126 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '办理进路',
-                    //     handler: this.arrangementRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    // },
-                    // {
-                    //     label: '办理引导进路',
-                    //     handler: this.guide,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    // },
-                    // {
-                    //     label: '取消进路',
-                    //     handler: this.cancelTrainRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    // },
-                    // {
-                    //     label: '总人解', // 取消引导进路
-                    //     handler: this.humanTrainRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
-                    // },
-                    // {
-                    //     label: '进路收人工控',
-                    //     handler: this.humanControl,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    // },
-                    // {
-                    //     label: '进路交自动控',
-                    //     handler: this.atsAutoControl,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    // },
-                    // {
-                    //     label: '进路信息',
-                    //     handler: this.detail,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '办理进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '办理引导进路',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '总人解',
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '进路收人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '进路信息',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '办理进路',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '办理引导进路',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '总人解',
+                    handler: this.humanTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '信号封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => signal.blockade === 1,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '信号解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => signal.blockade !== 1,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '进路收人工控',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '进路交自动控',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '进路信息',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                }
+            //     Local: [
+            //         // {
+            //         //     label: '办理进路',
+            //         //     handler: this.arrangementRoute,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+            //         // },
+            //         // {
+            //         //     label: '办理引导进路',
+            //         //     handler: this.guide,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+            //         // },
+            //         // {
+            //         //     label: '取消进路',
+            //         //     handler: this.cancelTrainRoute,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+            //         // },
+            //         // {
+            //         //     label: '总人解', // 取消引导进路
+            //         //     handler: this.humanTrainRoute,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+            //         // },
+            //         // {
+            //         //     label: '进路收人工控',
+            //         //     handler: this.humanControl,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+            //         // },
+            //         // {
+            //         //     label: '进路交自动控',
+            //         //     handler: this.atsAutoControl,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+            //         // },
+            //         // {
+            //         //     label: '进路信息',
+            //         //     handler: this.detail,
+            //         //     cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+            //         // }
+            //     ],
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -190,7 +215,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -327,7 +357,7 @@ export default {
             const step = {
                 operation: data.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     switch (data.operation) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
index 237d412ef..5763bf8e7 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStation.vue
@@ -8,7 +8,6 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
@@ -16,6 +15,7 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'StationMenu',
@@ -33,17 +33,19 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
+            menuNormal: [
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -87,7 +89,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
index 32e96bc2f..08397f540 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuStationStand.vue
@@ -17,7 +17,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -35,52 +35,68 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '设置扣车',
-                        handler: this.setDetainTrain,
-                        cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: '设置停站时间',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '设置站间运行等级',
-                        handler: this.setRunLevel,
-                        cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: '显示站台信息',
-                        handler: this.detail,
-                        cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置扣车',
+                    handler: this.setDetainTrain,
+                    cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: stand => stand.centerHoldTrain === 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置跳停',
+                    handler: this.setJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 0,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消跳停',
+                    handler: this.cancelJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 1 && stand.assignSkip !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置停站时间',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置站间运行等级',
+                    handler: this.setRunLevel,
+                    cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '显示站台信息',
+                    handler: this.detail,
+                    cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -121,8 +137,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
index eb8ca985c..af199b865 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuSwitch.vue
@@ -20,8 +20,8 @@ import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLo
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SwitchMenu',
@@ -42,57 +42,76 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [],
-                Center: [
-                    {
-                        label: '单操到定位',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '单操到反位',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔解锁',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔封锁',
-                        handler: this.block,
-                        cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-                    },
-                    {
-                        label: '道岔解封',
-                        handler: this.unblock,
-                        cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
-                    },
-                    {
-                        label: '区故解',
-                        handler: this.fault,
-                        cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
-                    }
-                    // {
-                    // 	label: '属性',
-                    // 	handler: this.undeveloped,
-                    // 	auth: { station: true, center: true },
-                    //  cmdType: CMD.Switch.
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '单操到定位',
+                    handler: this.locate,
+                    cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: switchDevice => switchDevice.pos === 'N',
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '单操到反位',
+                    handler: this.reverse,
+                    cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: switchDevice => switchDevice.pos === 'R',
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: switchDevice => switchDevice.singleLock === 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔解锁',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: switchDevice => switchDevice.singleLock !== 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔封锁',
+                    handler: this.block,
+                    cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
+                    isDisabled: switchDevice => switchDevice.blockade === 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔解封',
+                    handler: this.unblock,
+                    cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
+                    isDisabled: switchDevice => switchDevice.blockade !== 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '区故解',
+                    handler: this.fault,
+                    cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
+                    isDisabled: (signal, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                }
+                // Center: [
+                //     // {
+                //     // 	label: '属性',
+                //     // 	handler: this.undeveloped,
+                //     // 	auth: { station: true, center: true },
+                //     //  cmdType: CMD.Switch.
+                //     // }
+                // ]
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -131,7 +150,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
index 8754f070f..f1cbb9119 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTrain.vue
@@ -28,7 +28,7 @@ import TrainDetailInfo from './dialog/trainDetailInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 
@@ -55,62 +55,86 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '新建计划列车',
-                        handler: this.createPlanTrain,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    }
-                ],
-                Center: [
-                    {
-                        label: '新建车组号',
-                        handler: this.createTrainNo
-                    },
-                    {
-                        label: '移动车组号',
-                        handler: this.moveTrainNo
-                    },
-                    {
-                        label: '删除车组号',
-                        handler: this.deleteTrainNo
-                    },
-                    {
-                        label: '修改车组号',
-                        handler: this.editTrainNo
-                    },
-                    {
-                        label: '设计划车',
-                        handler: this.setPlanTrainId
-                    },
-                    {
-                        label: '设目的地',
-                        handler: this.destinationTrainId
-                    },
-                    {
-                        label: '设人工车',
-                        handler: this.artificialTrainId
-                    },
-                    {
-                        label: '设特殊人工车',
-                        handler: this.undeveloped
-                    },
-                    {
-                        label: '详细列车信息',
-                        handler: this.detailTrainInfo
-                    },
-                    {
-                        label: '属性',
-                        handler: this.undeveloped
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '新建车组号',
+                    handler: this.createTrainNo,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '移动车组号',
+                    handler: this.moveTrainNo,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '删除车组号',
+                    handler: this.deleteTrainNo,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '修改车组号',
+                    handler: this.editTrainNo,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设计划车',
+                    handler: this.setPlanTrainId,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设目的地',
+                    handler: this.destinationTrainId,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设人工车',
+                    handler: this.artificialTrainId,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设特殊人工车',
+                    handler: this.undeveloped,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '详细列车信息',
+                    handler: this.detailTrainInfo,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '属性',
+                    handler: this.undeveloped,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '新建计划列车',
+                    handler: this.createPlanTrain,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isDisabled: (signal, work) => false,
+                    isShow: (trainDevice, work) => work === 'localWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -214,7 +238,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -361,7 +390,7 @@ export default {
 
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -379,7 +408,7 @@ export default {
 
                 operation: OperationEvent.Train.setPlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -396,7 +425,7 @@ export default {
 
                 operation: OperationEvent.Train.destinationTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -413,7 +442,7 @@ export default {
 
                 operation: OperationEvent.Train.artificialTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -430,7 +459,7 @@ export default {
 
                 operation: OperationEvent.Train.detailTrainInfo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
@@ -447,7 +476,7 @@ export default {
 
                 operation: OperationEvent.Train.createTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainCreateNumber.doShow(operate, this.selected);
@@ -462,7 +491,7 @@ export default {
 
                 operation: OperationEvent.Train.deleteTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeleteNumber.doShow(operate, this.selected);
@@ -477,7 +506,7 @@ export default {
 
                 operation: OperationEvent.Train.editTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(operate, this.selected);
@@ -492,7 +521,7 @@ export default {
 
                 operation: OperationEvent.Train.moveTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveNumber.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
index afbff9ddc..1484294d7 100644
--- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/alarm.vue
@@ -176,7 +176,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -188,7 +188,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
index e4ef062a6..9c0b3543d 100644
--- a/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue b/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
index 7c1686b6c..c67ac3039 100644
--- a/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
@@ -291,7 +291,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/components/menus/childDialog/confirmControlSpeed.vue
index 2e905614b..a49a968e8 100644
--- a/src/jmapNew/theme/components/menus/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/confirmControlSpeed.vue
@@ -119,7 +119,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -136,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/components/menus/childDialog/passwordInputBox.vue b/src/jmapNew/theme/components/menus/childDialog/passwordInputBox.vue
index 96e805279..e3bc9238b 100644
--- a/src/jmapNew/theme/components/menus/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/passwordInputBox.vue
@@ -23,40 +23,40 @@
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">7</el-button>
+        <el-button @click="inputNum(7)">7</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">8</el-button>
+        <el-button @click="inputNum(8)">8</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">9</el-button>
+        <el-button @click="inputNum(9)">9</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">4</el-button>
+        <el-button @click="inputNum(4)">4</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">5</el-button>
+        <el-button @click="inputNum(5)">5</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">6</el-button>
+        <el-button @click="inputNum(6)">6</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">1</el-button>
+        <el-button @click="inputNum(1)">1</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">2</el-button>
+        <el-button @click="inputNum(2)">2</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">3</el-button>
+        <el-button @click="inputNum(3)">3</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">0</el-button>
+        <el-button @click="inputNum(0)">0</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
         <el-button @click="inputClear">C</el-button>
@@ -144,9 +144,9 @@ export default {
             }
         },
         /* 软键盘输入*/
-        inputNum(e) {
+        inputNum(num) {
             this.showMistake = false;
-            this.passwordCheck += e.path[0].innerText;
+            this.passwordCheck += num;
             this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
         },
         /* 软键盘清除*/
@@ -170,7 +170,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
             this.$emit('checkCancel');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
index dc85e9f59..86e792777 100644
--- a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
@@ -191,7 +191,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = true;
@@ -207,7 +207,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = false;
@@ -229,7 +229,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -250,7 +250,7 @@ export default {
                 cmdType: menuOperate.LimitControl.cancelSpeed.cmdType
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -267,7 +267,7 @@ export default {
             const operate = {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (!this.isOpenMessage) {
                     this.messageText = '';
@@ -291,7 +291,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.ConfirmTip.doClose();
                 this.isOpenMessage = false;
diff --git a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
index 65b19d733..bfde97fa5 100644
--- a/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
+++ b/src/jmapNew/theme/components/menus/dialog/cmdManage.vue
@@ -91,8 +91,8 @@
       </div>
     </div>
     <div class="bottom-btn">
-      <el-button :disabled="!commandId || currentHasSigned" @click="signCmd(false)">拒签</el-button>
-      <el-button :disabled="!commandId || currentHasSigned" @click="signCmd(true)">签收</el-button>
+      <el-button :id="getDomObj('signCmdFalse').domId" :disabled="!commandId || currentHasSigned" @click="signCmd(false)">拒签</el-button>
+      <el-button :id="getDomObj('signCmdTrue').domId" :disabled="!commandId || currentHasSigned" @click="signCmd(true)">签收</el-button>
       <el-button @click="doClose">关闭</el-button>
     </div>
   </el-dialog>
@@ -101,6 +101,8 @@
 import { sendCommandNew } from '@/api/jmap/training';
 import shouxinxiang from '@/assets/dispatcherStation/shouxinxiang.png';
 import { mapState } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name:'CmdManage',
     data() {
@@ -223,6 +225,9 @@ export default {
         // this.searchCmd();
     },
     methods:{
+        getDomObj(key) {
+            return OperationEvent.DispatchCmd.menuButton[key];
+        },
         tableRowClassName({row, rowIndex}) {
             const status = this.getStateInfo(row.rcvCompanies).state;
             if (status === 'Signed') {
@@ -307,15 +312,25 @@ export default {
                 command = 'CTC_SIGN_REJECT_DIS_COMMAND';
                 delete data.proxySign;
             }
-            sendCommandNew(this.group, command, data).then((res) => {
-                console.log(res, '---res');
-                if (res.code == 200) {
-                    // this.searchCmd();
-                } else {
-                    this.$messageBox(`${status ? '签收' : '拒签'}调度命令失败：${res.message}`);
+            const key = status ? 'signCmdTrue' : 'signCmdFalse';
+            const operate = {
+                operation: this.getDomObj(key).operation,
+                param: data,
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    sendCommandNew(this.group, command, data).then((res) => {
+                        console.log(res, '---res');
+                        if (res.code == 200) {
+                            // this.searchCmd();
+                        } else {
+                            this.$messageBox(`${status ? '签收' : '拒签'}调度命令失败：${res.message}`);
+                        }
+                    }).catch(error => {
+                        this.$messageBox(`${status ? '签收' : '拒签'}调度命令失败：${error.message}`);
+                    });
                 }
-            }).catch(error => {
-                this.$messageBox(`${status ? '签收' : '拒签'}调度命令失败：${error.message}`);
             });
         },
         filterTableData() {
diff --git a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
index 98c970ce8..38d450976 100644
--- a/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
+++ b/src/jmapNew/theme/components/menus/dialog/loadSpareTrain.vue
@@ -152,7 +152,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/psl.vue b/src/jmapNew/theme/components/menus/dialog/psl.vue
index 98abbdd6c..4261837e8 100644
--- a/src/jmapNew/theme/components/menus/dialog/psl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/psl.vue
@@ -1,96 +1,95 @@
 <template>
-    <el-dialog
-        v-dialogDrag
-        class="xian-01__systerm psl-panel"
-        :title="title"
-        :visible.sync="show"
-        width="500px"
-        :before-close="doClose"
-        :z-index="2000"
-        :modal="false"
-        :close-on-click-modal="false"
-    >
-        <div class="psl-title">
-            <div>{{ title }}</div>
+  <el-dialog
+    v-dialogDrag
+    class="xian-01__systerm psl-panel"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="psl-title">
+      <div>{{ title }}</div>
+    </div>
+    <div class="psl-content">
+      <div class="content-row">
+        <div class="cell btn">
+          <div class="btn-text">所有滑动门/应急门关闭且锁紧指示灯</div>
+          <img :src="getIcon('top', indicators.qbgmLight ? 'on' : 'off')">
         </div>
-        <div class="psl-content">
-            <div class="content-row">
-                <div class="cell btn">
-                    <div class="btn-text">所有滑动门/应急门关闭且锁紧指示灯</div>
-                    <img :src="getIcon('top', indicators.qbgmLight ? 'on' : 'off')" />
-                </div>
-            </div>
-            <div class="content-row">
-                <div class="cell">
-                    <div class="btn-text">PSL操作指示灯</div>
-                    <img :src="getIcon('red', indicators.pslczLight ? 'on' : 'off')" />
-                </div>
-                <div class="cell">
-                    <div class="btn-text">互锁解除指示灯</div>
-                    <img :src="getIcon('red', indicators.hsjcLight ? 'on' : 'off')" />
-                </div>
-            </div>
-            <div class="content-row">
-                <div class="cell">
-                    <div class="btn-text">开门状态指示灯</div>
-                    <img :src="getIcon('red', indicators.kmLight ? 'on' : 'off')" />
-                </div>
-                <div class="cell">
-                    <div class="btn-text">关门状态指示灯</div>
-                    <img :src="getIcon('green', indicators.gmLight ? 'on' : 'off')" />
-                </div>
-            </div>
-            <div class="content-row">
-                <div class="cell btn">
-                    <div class="btn-text">禁止</div>
-                    <img
-                        :src="getIcon('key')"
-                        :class="['key', { 'key-on': indicators.yxjzKey }]"
-                        @click="btnClickHandler('YXJZ')"
-                    />
-                    <div class="btn-text-opt">允许</div>
-                </div>
-                <div class="cell btn">
-                    <div class="btn-text">禁止</div>
-                    <img
-                        :src="getIcon('key')"
-                        :class="['key', { 'key-on': indicators.hsjcKey }]"
-                        @click="btnClickHandler('HSJC')"
-                    />
-                    <div class="btn-text-opt">互锁解除</div>
-                </div>
-            </div>
-            <div class="content-row">
-                <div class="cell btn">
-                    <div class="btn-text">开门按钮</div>
-                    <img :src="getIcon('red', 'btn')" @click="btnClickHandler('KM')" />
-                </div>
-                <div class="cell btn">
-                    <div class="btn-text">关门按钮</div>
-                    <img :src="getIcon('green', 'btn')" @click="btnClickHandler('GM')" />
-                </div>
-            </div>
-            <div class="content-row">
-                <div class="cell btn">
-                    <div class="btn-text">试灯按钮</div>
-                    <img
-                        class="btn-sd btn-img"
-                        :src="getIcon('green', 'btn')"
-                        @mousedown.left="btnClickHandler('SD')"
-                        @mouseup.left="btnClickHandler('SD')"
-                    />
-                </div>
-            </div>
+      </div>
+      <div class="content-row">
+        <div class="cell">
+          <div class="btn-text">PSL操作指示灯</div>
+          <img :src="getIcon('red', indicators.pslczLight ? 'on' : 'off')">
         </div>
-    </el-dialog>
+        <div class="cell">
+          <div class="btn-text">互锁解除指示灯</div>
+          <img :src="getIcon('red', indicators.hsjcLight ? 'on' : 'off')">
+        </div>
+      </div>
+      <div class="content-row">
+        <div class="cell">
+          <div class="btn-text">开门状态指示灯</div>
+          <img :src="getIcon('red', indicators.kmLight ? 'on' : 'off')">
+        </div>
+        <div class="cell">
+          <div class="btn-text">关门状态指示灯</div>
+          <img :src="getIcon('green', indicators.gmLight ? 'on' : 'off')">
+        </div>
+      </div>
+      <div class="content-row">
+        <div class="cell btn">
+          <div class="btn-text">禁止</div>
+          <img
+            :src="getIcon('key')"
+            :class="['key', { 'key-on': indicators.yxjzKey }]"
+            @click="btnClickHandler('YXJZ')"
+          >
+          <div class="btn-text-opt">允许</div>
+        </div>
+        <div class="cell btn">
+          <div class="btn-text">禁止</div>
+          <img
+            :src="getIcon('key')"
+            :class="['key', { 'key-on': indicators.hsjcKey }]"
+            @click="btnClickHandler('HSJC')"
+          >
+          <div class="btn-text-opt">互锁解除</div>
+        </div>
+      </div>
+      <div class="content-row">
+        <div class="cell btn">
+          <div class="btn-text">开门按钮</div>
+          <img :src="getIcon('red', 'btn')" @click="btnClickHandler('KM')">
+        </div>
+        <div class="cell btn">
+          <div class="btn-text">关门按钮</div>
+          <img :src="getIcon('green', 'btn')" @click="btnClickHandler('GM')">
+        </div>
+      </div>
+      <div class="content-row">
+        <div class="cell btn">
+          <div class="btn-text">试灯按钮</div>
+          <img
+            class="btn-sd btn-img"
+            :src="getIcon('green', 'btn')"
+            @mousedown.left="btnClickHandler('SD')"
+            @mouseup.left="btnClickHandler('SD')"
+          >
+        </div>
+      </div>
+    </div>
+  </el-dialog>
 </template>
-
 <script>
-import icons from "@/assets/psl_images/psl_icons";
-import { getPslStatus, pressPslButton } from "@/api/simulation";
+import icons from '@/assets/psl_images/psl_icons';
+import { getPslStatus, pressPslButton } from '@/api/simulation';
 let standCode, group;
 export default {
-    name: "PSL",
+    name: 'PSL',
     data() {
         return {
             dialogShow: false,
@@ -107,18 +106,25 @@ export default {
     },
     computed: {
         title() {
-            return "PSL";
+            return 'PSL';
         },
 
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         }
     },
+    watch: {
+        '$store.state.socket.simulationPslStatus': function(val) {
+            if (val && val[standCode]) {
+                Object.assign(this.indicators, val[standCode]);
+            }
+        }
+    },
     methods: {
         doShow(selected) {
             this.dialogShow = true;
             this.$nextTick(function() {
-                this.$store.dispatch("training/emitTipFresh");
+                this.$store.dispatch('training/emitTipFresh');
             });
             standCode = selected.code;
             group = this.$route.query.group;
@@ -138,7 +144,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.$store.dispatch("training/emitTipFresh");
+            this.$store.dispatch('training/emitTipFresh');
         },
         getIcon(type, status) {
             return status !== undefined ? icons[`${type}_${status}`] : icons[type];
@@ -146,13 +152,6 @@ export default {
         btnClickHandler(btnType) {
             pressPslButton(group, standCode, btnType);
         }
-    },
-    watch: {
-        "$store.state.socket.simulationPslStatus": function(val) {
-            if (val && val[standCode]) {
-                Object.assign(this.indicators, val[standCode]);
-            }
-        }
     }
 };
 </script>
diff --git a/src/jmapNew/theme/components/menus/dialog/routeControl.vue b/src/jmapNew/theme/components/menus/dialog/routeControl.vue
index 3f659d704..6c91b31ed 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeControl.vue
@@ -38,7 +38,7 @@
     </el-row>
     <confirm-control ref="confirmControl" :pop-class="popClass" @close="doClose" />
     <ning-bo-confirm-tip ref="ningBoConfirmTip" @close="doClose" />
-	<password-box ref="password" :pop-class="popClass" @checkOver="passWordCommit" />
+    <password-box ref="password" :pop-class="popClass" @checkOver="passWordCommit" />
     <notice-info ref="noticeInfo" :pop-class="popClass" />
   </el-dialog>
 </template>
@@ -126,7 +126,7 @@ export default {
     },
     methods: {
         doShow(operate, selected) {
-			this.$root.$emit('dialogOpen', selected);
+            this.$root.$emit('dialogOpen', selected);
             this.selected = selected;
             if (!this.dialogShow) {
                 this.passModel = false;
@@ -157,7 +157,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.$root.$emit('dialogClose', this.selected);
+            this.$root.$emit('dialogClose', this.selected);
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
@@ -196,9 +196,9 @@ export default {
                 });
                 break;
             case 'fuzhou-01__systerm':
-                if (this.$store.state.training.prdType === '01') {
+                if (this.$store.state.map.picture === 'localWork') {
                     this.sendCommand(menuOperate.Signal.cancelTrainRoute);
-                } else if (this.$store.state.training.prdType === '02') {
+                } else if (this.$store.state.map.picture === 'dispatchWork') {
                     this.sendCommandNext(menuOperate.Signal.cancelTrainRoute).then(operate => {
                         operate['messages'] = [this.$t('tip.signalModeToManualModeTipPrefix') + this.signalName + this.$t('tip.signalModeToManualModeTipSuffix')];
                         this.$refs.confirmControl.doShow(operate);
@@ -206,9 +206,9 @@ export default {
                 }
                 break;
             case 'xian-01__systerm':
-                if (this.$store.state.training.prdType === '01') {
+                if (this.$store.state.map.picture === 'localWork') {
                     this.sendCommand(menuOperate.Signal.cancelTrainRoute);
-                } else if (this.$store.state.training.prdType === '02') {
+                } else if (this.$store.state.map.picture === 'dispatchWork') {
                     this.sendCommandNext(menuOperate.Signal.cancelTrainRoute).then(operate => {
                         operate['messages'] = `取消以信号机${this.selected.name}为始端的进路，该进路即将由自动信号模式转为人工模式!`;
                         this.$refs.confirmControl.doShow(operate);
@@ -378,7 +378,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
index fab1c9311..b669c37e8 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeDetail.vue
@@ -69,6 +69,7 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from '../childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteDetail',
@@ -153,12 +154,14 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                operation: OperationEvent.Signal.detail.menu.operation
+                // send: true,
+                over: true,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -174,7 +177,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
index d923fecdd..6c7534c17 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
@@ -293,7 +293,7 @@ export default {
                 /** 进路交自动控*/
                 operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -357,7 +357,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -459,7 +459,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/sectionControl.vue b/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
index 5441b10c3..412895542 100644
--- a/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/sectionControl.vue
@@ -208,7 +208,7 @@ export default {
                 operation: OperationEvent.Section.fault.confirm.operation
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -261,7 +261,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue
index 50dee18af..10061bb54 100644
--- a/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue
+++ b/src/jmapNew/theme/components/menus/dialog/sectionUnLock.vue
@@ -265,7 +265,7 @@ export default {
             } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
                 operate.operation = OperationEvent.Signal.unlock.choose.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -290,7 +290,7 @@ export default {
             } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
                 operate.operation = OperationEvent.Signal.unlock.confirm1.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     setTimeout(() => {
@@ -337,7 +337,7 @@ export default {
                     operate.operation = OperationEvent.Signal.unlock.confirm2.operation;
                     operate.cmdType = CMD.Signal.CMD_SIGNAL_UNBLOCK;
                 }
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.messageText2 = '*****';
@@ -374,7 +374,7 @@ export default {
             } else if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
                 operate.operation = OperationEvent.Signal.unlock.confirm.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.doClose();
             }).catch(() => {
diff --git a/src/jmapNew/theme/components/menus/dialog/setFault.vue b/src/jmapNew/theme/components/menus/dialog/setFault.vue
index 93200a45d..661e9dc9b 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFault.vue
@@ -380,7 +380,7 @@ export default {
         },
         sendCommand(setp) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', setp).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', setp).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -401,7 +401,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/setFaultNew.vue b/src/jmapNew/theme/components/menus/dialog/setFaultNew.vue
index 48ae49b77..ddf777ad6 100644
--- a/src/jmapNew/theme/components/menus/dialog/setFaultNew.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setFaultNew.vue
@@ -311,7 +311,7 @@ export default {
         },
         sendCommand(setp) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', setp).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', setp).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -332,7 +332,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
index e46314d37..633771413 100644
--- a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
@@ -190,7 +190,7 @@ export default {
         },
         sendCommand(setp) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', setp).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', setp).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -211,7 +211,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/signedCmd.vue b/src/jmapNew/theme/components/menus/dialog/signedCmd.vue
index 371aaa5f1..045d44bda 100644
--- a/src/jmapNew/theme/components/menus/dialog/signedCmd.vue
+++ b/src/jmapNew/theme/components/menus/dialog/signedCmd.vue
@@ -81,8 +81,8 @@
       </div>
     </div>
     <div class="bottom-btn">
-      <el-button :disabled="!commandId || currentHasSigned" @click="signCmd(false)">拒签</el-button>
-      <el-button :disabled="!commandId || currentHasSigned" @click="signCmd(true)">签收</el-button>
+      <el-button :id="getDomObj('signCmdFalse').domId" :disabled="!commandId || currentHasSigned" @click="signCmd(false)">拒签</el-button>
+      <el-button :id="getDomObj('signCmdTrue').domId" :disabled="!commandId || currentHasSigned" @click="signCmd(true)">签收</el-button>
       <el-button @click="doClose">关闭</el-button>
     </div>
   </el-dialog>
@@ -91,6 +91,8 @@
 import { sendCommandNew } from '@/api/jmap/training';
 import { mapState } from 'vuex';
 import { parseTime } from '@/utils/index';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name:'CmdManage',
     data() {
@@ -181,6 +183,9 @@ export default {
     beforeDestroy() {},
     mounted() {},
     methods:{
+        getDomObj(key) {
+            return OperationEvent.DispatchCmd.menuButton[key];
+        },
         getDeviceName(receiverId) {
             let name = '';
             if (receiverId) {
@@ -239,12 +244,22 @@ export default {
                 command = 'CTC_SIGN_REJECT_DIS_COMMAND';
                 delete data.proxySign;
             }
-            sendCommandNew(this.group, command, data).then((res) => {
-                console.log(res, '---res');
-                // this.$emit('changeSignedStatus', signInfo);
-                this.doClose();
-            }).catch(error => {
-                this.$messageBox('查询调度命令失败：' + error.message);
+            const key = status ? 'signCmdTrue' : 'signCmdFalse';
+            const operate = {
+                operation: this.getDomObj(key).operation,
+                param: data,
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    sendCommandNew(this.group, command, data).then((res) => {
+                        console.log(res, '---res');
+                        // this.$emit('changeSignedStatus', signInfo);
+                        this.doClose();
+                    }).catch(error => {
+                        this.$messageBox('查询调度命令失败：' + error.message);
+                    });
+                }
             });
         },
         searchCmd() {
diff --git a/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
index 48a65baa8..a46c4d707 100644
--- a/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/speedCmdControl.vue
@@ -362,7 +362,7 @@ export default {
             }
 
             this.setMessage('请点击“下达”按钮，下达命令！');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -400,7 +400,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.editRecord({ order: this.order, date: now(), context: '点击下达命令', result: '执行成功' });
@@ -433,7 +433,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -478,7 +478,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -515,7 +515,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -532,7 +532,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
             this.writeRecord({ order: ++this.order, date: now(), context: '点击关闭', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue
index 4f7117315..e04c42425 100644
--- a/src/jmapNew/theme/components/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue
@@ -290,7 +290,7 @@ export default {
                 operate.operation = OperationEvent.StationStand.earlyDeparture.downSelect.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -399,7 +399,7 @@ export default {
             };
 
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/standDetail.vue b/src/jmapNew/theme/components/menus/dialog/standDetail.vue
index d59091ede..8f88bafc2 100644
--- a/src/jmapNew/theme/components/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standDetail.vue
@@ -220,7 +220,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -234,7 +234,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
index 417b03bcc..c1323bf37 100644
--- a/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue
@@ -296,7 +296,7 @@ export default {
             };
 
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -312,7 +312,7 @@ export default {
             const operate = {
                 operation: operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -326,7 +326,7 @@ export default {
                 operation: operation
             };
             this.model.val2 = '';
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -340,7 +340,7 @@ export default {
                 operation: operation,
                 val:val
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
index 7044beffa..8a32580be 100644
--- a/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standRunLevel.vue
@@ -257,7 +257,7 @@ export default {
             this.time = Number(time);
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -271,7 +271,7 @@ export default {
             this.time = row.time = this.timeList[row.level][0].value;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -283,7 +283,7 @@ export default {
                 val: `${!!check}`
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -317,7 +317,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/standStopTime.vue b/src/jmapNew/theme/components/menus/dialog/standStopTime.vue
index 38280e40b..fbd96f7a7 100644
--- a/src/jmapNew/theme/components/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standStopTime.vue
@@ -176,7 +176,7 @@ export default {
                 val: `${control}`
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -188,7 +188,7 @@ export default {
                 val: `${effective}`
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -200,7 +200,7 @@ export default {
                 val: `${time}`
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -225,7 +225,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
index 9a5548663..117eaa915 100644
--- a/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationCmdControl.vue
@@ -284,7 +284,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -309,7 +309,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -340,7 +340,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -369,7 +369,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -386,7 +386,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
index 3e644b204..7f72b26f7 100644
--- a/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationHumanControlAll.vue
@@ -100,7 +100,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -116,7 +116,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
index b431535cc..29b601588 100644
--- a/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/components/menus/dialog/stationSetRouteControlAll.vue
@@ -121,7 +121,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -137,7 +137,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/switchControl.vue b/src/jmapNew/theme/components/menus/dialog/switchControl.vue
index fa9ca33da..86751faa1 100644
--- a/src/jmapNew/theme/components/menus/dialog/switchControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/switchControl.vue
@@ -320,7 +320,7 @@ export default {
                 operation: operator.confirm.operation
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -379,7 +379,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue b/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue
index 36251a6eb..d3e2bbcf3 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainAddPlan.vue
@@ -183,7 +183,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -204,7 +204,7 @@ export default {
             };
 
             this.$store
-                .dispatch('training/nextNew', operate)
+                .dispatch('trainingNew/next', operate)
                 .then(({ valid }) => {
                     if (valid) {
                         this.doClose();
diff --git a/src/jmapNew/theme/components/menus/dialog/trainControl.vue b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
index b3d17ff8f..a5b477add 100644
--- a/src/jmapNew/theme/components/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/trainControl.vue
@@ -96,7 +96,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import { getTrainDetailBytripNumber, getTrainDetailByStNumber } from '@/api/simulation';
 import NoticeInfo from '../childDialog/noticeInfo';
@@ -366,7 +366,7 @@ export default {
                 operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -387,7 +387,7 @@ export default {
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -403,7 +403,7 @@ export default {
             } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
                 operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
             }
-            Handler.undo(1);
+            // Handler.undo(1);
             try {
                 if (this.popClass === 'foshan-01__systerm') {
                     getTrainDetailByStNumber(this.$route.query.group, {
@@ -431,7 +431,7 @@ export default {
             } catch (e) {
                 this.$message.error('获取列车信息失败！');
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -525,7 +525,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$store
-                .dispatch('training/nextNew', operate)
+                .dispatch('trainingNew/next', operate)
                 .then(({ valid }) => {
                     if (valid) {
                         this.doClose();
diff --git a/src/jmapNew/theme/components/menus/eachChildMenu.vue b/src/jmapNew/theme/components/menus/eachChildMenu.vue
index ba248971c..9958f4eef 100644
--- a/src/jmapNew/theme/components/menus/eachChildMenu.vue
+++ b/src/jmapNew/theme/components/menus/eachChildMenu.vue
@@ -105,10 +105,10 @@ export default {
         },
         hookClick(item, event) {
             this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            if (item && typeof item.click == 'function') {
+            if (item ) {
                 if (item.children && item.children.length > 0) {
                     this.selectedClass(item, this.id);
-                } else {
+                } else if (typeof item.click == 'function') {
                     item.click(item.operate);
                     this.doClose(-1);
                     this.$store.dispatch('menuOperation/changeMenuBar', '');
@@ -129,9 +129,9 @@ export default {
                 operation: item.operate.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$emit('active', index);
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
-                    this.$emit('active', index);
                     this.$store.dispatch('menuOperation/changeMenuBar', index);
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/components/menus/menuBar.vue b/src/jmapNew/theme/components/menus/menuBar.vue
index 488d953e6..1e4d321fb 100644
--- a/src/jmapNew/theme/components/menus/menuBar.vue
+++ b/src/jmapNew/theme/components/menus/menuBar.vue
@@ -16,9 +16,8 @@
   </div>
 </template>
 <script>
-import { TrainingMode } from '@/scripts/ConstDic';
 import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import EachChildMenu from './eachChildMenu';
 
 export default {
@@ -70,7 +69,7 @@ export default {
         },
         initMenu(menu) {
             const type = State2SimulationMap[this.$store.state.training.prdType];
-            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
+            // this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
             // this.clickEvent();
         },
         // clickEvent() {
diff --git a/src/jmapNew/theme/components/menus/menuBarNew.vue b/src/jmapNew/theme/components/menus/menuBarNew.vue
new file mode 100644
index 000000000..88020390f
--- /dev/null
+++ b/src/jmapNew/theme/components/menus/menuBarNew.vue
@@ -0,0 +1,120 @@
+<template>
+  <div id="menuBar" :style="{'z-index': zIndex}">
+    <div class="nav">
+      <each-child-menu
+        v-for="(item,i) in menu"
+        :id="i"
+        :key="i"
+        ref="eachChildMenu"
+        :item="item"
+        :is-next-btn="isNextBtn"
+        :index="index"
+        @active="doActie"
+        @close="doClose"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { menuBarConvert } from '@/scripts/MenuContextHandler';
+import EachChildMenu from './eachChildMenu';
+
+export default {
+    name: 'MenuBar',
+    components:{
+        EachChildMenu
+    },
+    props: {
+        zIndex: {
+            type: Number,
+            default: 11
+        },
+        menuNormal:{
+            type: Array,
+            default() {
+                return [];
+            }
+        },
+        isNextBtn:{
+            type: Boolean,
+            default() {
+                return false;
+            }
+        }
+    },
+    data() {
+        return {
+            index: -1,
+            menu: []
+        };
+    },
+    watch: {
+        '$store.state.training.operatemode': function () {
+            this.initMenu();
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        handleShow(item) {
+            if (item.hide) {
+                return false;
+            }
+            return true;
+        },
+        initMenu() {
+            this.menu = menuBarConvert(this.menuNormal, this.$store.state.training.operatemode);
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        doActie(index) {
+            this.index = index;
+        },
+        doClose() {
+            this.index = -1;
+        },
+        closeMenu() {
+            // 兼容以前
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    $height: 30px;
+    $menuItemHeight: 30px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+        background: linear-gradient(#FDFDFE, #DEE3F3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+    }
+</style>
diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
index 9e9ba8a30..8ce6f1148 100644
--- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
@@ -222,16 +222,16 @@ export default {
                         this.requestInfo = info;
                         this.disabledAgree = true;
                         this.updateTableData(controlTransferList);
-                        const operate = {
-                            start: true,
-                            operation: OperationEvent.StationControl.controlResponse.menu.operation
-                        };
-                        this.$store.dispatch('training/emitTipFresh');
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            if (valid) {
-                                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                            }
-                        });
+                        // const operate = {
+                        //     start: true,
+                        //     operation: OperationEvent.StationControl.controlResponse.menu.operation
+                        // };
+                        // this.$store.dispatch('training/emitTipFresh');
+                        // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                        //     if (valid) {
+                        //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        //     }
+                        // });
                     }
                 } else {
                     // 后端倒计时
@@ -263,7 +263,7 @@ export default {
                     val: this.serializeCodeListWithSeparator('::')
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -294,7 +294,7 @@ export default {
             };
 
             this.disabledAgree = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -323,7 +323,7 @@ export default {
                 }
             };
             this.disabledAgree = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/components/utils/menuJudge.js b/src/jmapNew/theme/components/utils/menuJudge.js
new file mode 100644
index 000000000..1147fbb12
--- /dev/null
+++ b/src/jmapNew/theme/components/utils/menuJudge.js
@@ -0,0 +1,20 @@
+import store from '@/store/index';
+/**
+ * 判断菜单行值控制全
+ * @param {String} stationCode 所属车站code
+ * @param {String} centralStationCode 所属集中站code
+ * @param {String} work 当前客户端
+ * */
+export function judgeStationControl(stationCode, centralStationCode, work) {
+    const centralStation = store.getters['map/getDeviceByCode'](centralStationCode);
+    // 角色车站是 设备所属车站或所属集中站
+    if (work === 'localWork') {
+        const flag1 = store.state.training.roleDeviceCode === stationCode || store.state.training.roleDeviceCode === centralStationCode;
+        const flag2 = centralStation.controlMode === 'Local' || centralStation.controlMode === 'Emergency';
+        return flag1 && flag2;
+    } else if ( work === 'dispatchWork' ) {
+        return centralStation.controlMode === 'Center';
+    } else {
+        return true;
+    }
+}
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 74342d199..d9b244b3d 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -907,6 +907,10 @@ export const menuOperate = {
         Chat: {
             operation: OperationEvent.Conversation.Chat.menu.operation,
             cmdType: CMD.Conversation.CMD_Conversation_Chat_Text
+        },
+        Record: {
+            operation: OperationEvent.Conversation.Chat.record.operation,
+            cmdType: CMD.Conversation.CMD_Conversation_Chat_Audio_Base64
         }
     }
 
@@ -922,7 +926,7 @@ export const menuOperate = {
 export function commitOperate(operate, paramList, over, fillStep = {}) {
     const step = {
         start: true,
-        userOperationType: operate.userOperationType || 'leftClick',
+        userOperationType: operate.userOperationType,
         operation: operate.operation,
         param:{}
     };
@@ -947,7 +951,7 @@ export function commitOperate(operate, paramList, over, fillStep = {}) {
 
     Object.assign(step, fillStep);
     return new Promise(function(resolve, reject) {
-        store.dispatch('training/nextNew', step).then(({ valid, response }) => {
+        store.dispatch('trainingNew/next', step).then(({ valid, response }) => {
             if (valid) {
                 store.dispatch('menuOperation/handleBreakFlag', { break: true });
             }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControl.vue
index d298f8bc1..e7a5aba01 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControl.vue
@@ -104,7 +104,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -121,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControlSpeed.vue
index d49556383..b92e21bb0 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -114,7 +114,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -133,7 +133,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/datie_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmTrain.vue
index 494347b75..110e01e50 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/confirmTrain.vue
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/passwordInputBox.vue
index 2f41411df..33ba9881c 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/passwordInputBox.vue
@@ -23,40 +23,40 @@
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">7</el-button>
+        <el-button @click="inputNum(7)">7</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">8</el-button>
+        <el-button @click="inputNum(8)">8</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">9</el-button>
+        <el-button @click="inputNum(9)">9</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">4</el-button>
+        <el-button @click="inputNum(4)">4</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">5</el-button>
+        <el-button @click="inputNum(5)">5</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">6</el-button>
+        <el-button @click="inputNum(6)">6</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">1</el-button>
+        <el-button @click="inputNum(1)">1</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">2</el-button>
+        <el-button @click="inputNum(2)">2</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">3</el-button>
+        <el-button @click="inputNum(3)">3</el-button>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">0</el-button>
+        <el-button @click="inputNum(0)">0</el-button>
       </el-col>
       <el-col :span="4" :offset="4">
         <el-button @click="inputClear">C</el-button>
@@ -137,9 +137,9 @@ export default {
             }
         },
         /* 软键盘输入*/
-        inputNum(e) {
+        inputNum(num) {
             this.showMistake = false;
-            this.passwordCheck += e.path[0].innerText;
+            this.passwordCheck += num;
             this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
         },
         /* 软键盘清除*/
@@ -165,7 +165,7 @@ export default {
                 operation: OperationEvent.Command.cancel.password.operation
             };
             this.$emit('checkCancel');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/popupAlarm.vue
index b6b925622..33b7e455b 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/childDialog/popupAlarm.vue
@@ -75,7 +75,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/datie_01/menus/dialog/routeDetail.vue
index b7211c025..b3e6a5282 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/routeDetail.vue
@@ -167,7 +167,7 @@ export default {
                 operation: OperationEvent.Signal.detail.menu.operation
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -183,7 +183,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_01/menus/dialog/routeGuide.vue
index 11cba9131..38a9d8c78 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/routeGuide.vue
@@ -201,7 +201,7 @@ export default {
                     operation: OperationEvent.Signal.guide.choose.operation,
                     val: row.code
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -221,7 +221,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -241,7 +241,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue
index 69ce0d572..09860a94d 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/routeHandControl.vue
@@ -208,7 +208,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -256,7 +256,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/datie_01/menus/dialog/routeSelection.vue
index 12014afb3..de45a16dd 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/routeSelection.vue
@@ -247,7 +247,7 @@ export default {
                     val: row.code
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -289,7 +289,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/datie_01/menus/dialog/sectionDetail.vue
index 7e6a03371..f15df91a8 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/sectionDetail.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/sectionDetail.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Section.detail.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/standControl.vue b/src/jmapNew/theme/datie_01/menus/dialog/standControl.vue
index c6c29c830..263ac2925 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/standControl.vue
@@ -514,7 +514,7 @@ export default {
             this.handleBreak(operate);
         },
         handleBreak(operate) { // 断点记录
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 valid && this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -580,7 +580,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/datie_01/menus/dialog/standDetail.vue
index efe048e52..cd5928315 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/standDetail.vue
@@ -185,7 +185,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -199,7 +199,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainControl.vue
index 738d9509e..9f3096d8f 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainControl.vue
@@ -246,7 +246,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -270,7 +270,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -294,7 +294,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -313,7 +313,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainCreate.vue
index 59f7935b6..23f18154c 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainCreate.vue
@@ -104,7 +104,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainCreateNumber.vue
index e56f2f80d..d86b850d3 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainCreateNumber.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainCreateNumber.vue
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainDelete.vue
index 895d6024c..e075016e8 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainDelete.vue
@@ -118,7 +118,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainDeleteNumber.vue
index 210e2dc87..57cfde74f 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainDeleteNumber.vue
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainDetailInfo.vue
index 907727139..d3a11dc35 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainDetailInfo.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainDetailInfo.vue
@@ -353,7 +353,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainEditNumber.vue
index 570e22144..adca22a83 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainEditNumber.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainMove.vue
index 82c84dc13..0075a4d86 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainMove.vue
@@ -158,7 +158,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainMoveNumber.vue
index 7e7635d23..bdfaa11fc 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainMoveNumber.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainMoveNumber.vue
@@ -147,7 +147,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/datie_01/menus/dialog/trainSwitch.vue
index 583e53d8e..20a0b7ed0 100644
--- a/src/jmapNew/theme/datie_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/datie_01/menus/dialog/trainSwitch.vue
@@ -166,7 +166,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -188,7 +188,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/menuBar.vue b/src/jmapNew/theme/datie_01/menus/menuBar.vue
index e7be252ef..77c3b5433 100644
--- a/src/jmapNew/theme/datie_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuBar.vue
@@ -623,7 +623,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.helpAbout.doShow(operate);
@@ -643,7 +643,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.setLimitSpeed.doShow(operate, true);
@@ -657,7 +657,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.setLimitSpeed.doShow(operate, false);
diff --git a/src/jmapNew/theme/datie_01/menus/menuButton.vue b/src/jmapNew/theme/datie_01/menus/menuButton.vue
index 31e7f0bb8..c95248095 100644
--- a/src/jmapNew/theme/datie_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuButton.vue
@@ -108,7 +108,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
@@ -283,7 +283,7 @@ export default {
         },
         // 执行操作
         trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     /* 引导总锁输入面后 处理按钮选中状态 */
                     if (operate.operationPre === this.Switch.guideLock.leftButton.operation || operate.operation === this.Switch.guideLock.leftButton.operation) {
@@ -323,7 +323,7 @@ export default {
             const operate = {
                 operation: this.Switch.guideLock.leftButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     if (this.guideLockRightFlag) {
@@ -341,7 +341,7 @@ export default {
             const operate = {
                 operation: this.Switch.guideLock.rightButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     if (this.guideLockRightFlag) {
@@ -362,7 +362,7 @@ export default {
                 };
                 // 以下 会弹出密码框 （总人解，区故解） 铅封按钮
                 const operationList = [this.Signal.humanTrainRoute.button.operation, this.Section.fault.button.operation];
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.operation = operation;
                         this.commandTypeList = commandTypeList;
@@ -383,7 +383,7 @@ export default {
                     start: true,
                     operation: operation
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.commandTypeList = [];
                         this.$store.dispatch('menuOperation/setButtonOperation', null);
@@ -425,7 +425,7 @@ export default {
             const signal = this.$store.getters['map/getDeviceByCode'](deviceList[0].signalCode || deviceList[0].code);// deviceList[0] 为 SignalButton || Signal
             if (deviceList.length === 1 && !signal.routeLock) { // 排列进路 处理始端信号机状态
                 operate.code = deviceList[0].code;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         // 仅信号按钮调车信号机有状态
                         if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) {
@@ -441,7 +441,7 @@ export default {
                 operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
                 operate.code = signal.code;
                 operate.param = {signalId: signal.code};
-                this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {
                     this.clearOperate();
                 }).catch(() => this.$refs.noticeInfo.doShow() );
             } else if (deviceList.length > 1) {
@@ -455,7 +455,7 @@ export default {
                     operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
                     operate.code = deviceList[deviceList.length - 1].code;
                     operate.param = {routeId: route.code};
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                         this.deviceTimeNode = 0;
                     }).catch(() => {
                         this.deviceTimeNode = 0;
@@ -475,7 +475,7 @@ export default {
                     signalId: model._type === 'Signal' ? model.code : model.signalCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.clearOperate();
             }).catch((error) => {
                 this.clearOperate();
@@ -531,7 +531,7 @@ export default {
         },
         // 发送指令
         sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             }).finally(() =>{ this.clearOperate(); });
@@ -654,7 +654,7 @@ export default {
         clearOperate() { // 清除操作
             this.deviceList && this.deviceList.length && this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}]);
             this.deviceList = [];
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', null);
         }
     }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/twoConfirmation.vue
index c1f7b93a3..5068abbbf 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -90,7 +90,7 @@ export default {
             };
 
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -117,7 +117,7 @@ export default {
                 this.loading = true;
                 this.doClose();
                 this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         this.loading = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userAdd.vue
index 6c98c5a53..9094641d7 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userAdd.vue
@@ -114,7 +114,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 if (this.model.password === this.model.confirm) {
@@ -136,7 +136,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userDelete.vue
index e64aa49f3..b634b2eac 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userDelete.vue
@@ -91,7 +91,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -108,7 +108,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userEdit.vue
index b03165a1b..dcca966bb 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/childDialog/userEdit.vue
@@ -127,7 +127,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid)
                                 if (this.selected.password !== this.model.oldPassword) {
@@ -152,7 +152,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue
index 4dc26a4ce..e88828975 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/helpAbout.vue
@@ -89,7 +89,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -105,7 +105,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/limitSpeed.vue
index e416e68e0..82a113010 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/limitSpeed.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/limitSpeed.vue
@@ -95,7 +95,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/manageUser.vue
index deef68f43..daa8cc237 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/manageUser.vue
@@ -130,7 +130,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userAdd.doShow(operate);
@@ -148,7 +148,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userEdit.doShow(operate, this.selected);
@@ -170,7 +170,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userDelete.doShow(operate, this.selected);
@@ -190,7 +190,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                 }).catch(error => {
                     this.loading = false;
@@ -204,7 +204,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.selected = row;
                 }).catch(error => {
@@ -218,7 +218,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -234,7 +234,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/passwordBox.vue
index 69fa03d70..1af1e9114 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/passwordBox.vue
@@ -122,7 +122,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -140,7 +140,7 @@ export default {
 
             if (this.model.password == '123456') {
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/setLimitSpeed.vue
index dfb5821b3..6ebe22260 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/setLimitSpeed.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/setLimitSpeed.vue
@@ -222,7 +222,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -244,7 +244,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/stationControlConvert.vue
index 046b66327..75139bf30 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/stationControlConvert.vue
@@ -285,7 +285,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -326,7 +326,7 @@ export default {
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -351,7 +351,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -378,7 +378,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -405,7 +405,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/trainAdd.vue
index fba049a10..93227cf2f 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/trainAdd.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/trainDelete.vue
index b1139915a..e622ae48a 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/trainDelete.vue
@@ -108,7 +108,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -130,7 +130,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/trainTranstalet.vue
index 97918ae44..f50209b87 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/trainTranstalet.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/datie_01/menus/menuDialog/viewName.vue
index 4a32473d5..808210bde 100644
--- a/src/jmapNew/theme/datie_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuDialog/viewName.vue
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_01/menus/menuSection.vue b/src/jmapNew/theme/datie_01/menus/menuSection.vue
index 210aa664a..a5ff56711 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSection.vue
@@ -174,7 +174,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/datie_01/menus/menuSignal.vue b/src/jmapNew/theme/datie_01/menus/menuSignal.vue
index 06e046f46..08f637ffe 100644
--- a/src/jmapNew/theme/datie_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuSignal.vue
@@ -343,7 +343,7 @@ export default {
             const step = {
                 operation: data.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     switch (data.operation) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuStationStand.vue b/src/jmapNew/theme/datie_01/menus/menuStationStand.vue
index 252b55010..fa47db556 100644
--- a/src/jmapNew/theme/datie_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuStationStand.vue
@@ -17,7 +17,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFaultNew';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -121,7 +121,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_01/menus/menuTrain.vue b/src/jmapNew/theme/datie_01/menus/menuTrain.vue
index 215595047..0856bdfe3 100644
--- a/src/jmapNew/theme/datie_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_01/menus/menuTrain.vue
@@ -27,7 +27,7 @@ import TrainDetailInfo from './dialog/trainDetailInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -170,7 +170,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
@@ -254,7 +254,7 @@ export default {
 
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -272,7 +272,7 @@ export default {
 
                 operation: OperationEvent.Train.setPlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -289,7 +289,7 @@ export default {
 
                 operation: OperationEvent.Train.destinationTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -306,7 +306,7 @@ export default {
 
                 operation: OperationEvent.Train.artificialTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -323,7 +323,7 @@ export default {
 
                 operation: OperationEvent.Train.detailTrainInfo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
@@ -340,7 +340,7 @@ export default {
 
                 operation: OperationEvent.Train.createTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainCreateNumber.doShow(operate, this.selected);
@@ -355,7 +355,7 @@ export default {
 
                 operation: OperationEvent.Train.deleteTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeleteNumber.doShow(operate, this.selected);
@@ -370,7 +370,7 @@ export default {
 
                 operation: OperationEvent.Train.editTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(operate, this.selected);
@@ -385,7 +385,7 @@ export default {
 
                 operation: OperationEvent.Train.moveTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveNumber.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue
index afbff9ddc..1484294d7 100644
--- a/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/datie_01/menus/passiveDialog/alarm.vue
@@ -176,7 +176,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -188,7 +188,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/datie_01/menus/passiveDialog/timeout.vue
index e4ef062a6..9c0b3543d 100644
--- a/src/jmapNew/theme/datie_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/datie_01/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
new file mode 100644
index 000000000..848511866
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue
@@ -0,0 +1,1016 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <div class="title">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${this.dateString}第一班 18:00 管理员代--` }}</div>
+    <menu-bar ref="menuBar" :selected="selected" />
+    <div style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
+      <div style="display: flex;">
+        <img :src="ctcBarIcon1" class="img-box" @click="zhanjiantouming">
+        <img :src="ctcBarIcon2" class="img-box" @click="danzhanxianshi">
+        <img :src="ctcBarIcon3" class="img-box">
+        <img :src="ctcBarIcon4" class="img-box">
+        <img :src="ctcBarIcon5" class="img-box">
+        <img :src="ctcBarIcon6" class="img-box">
+        <img :src="ctcBarIcon7" class="img-box">
+        <img :src="ctcBarIcon8" class="img-box">
+        <img :src="ctcBarIcon9" class="img-box">
+        <img :src="ctcBarIcon10" class="img-box">
+        <img :src="ctcBarIcon11" class="img-box">
+        <img :src="ctcBarIcon12" class="img-box">
+        <img :src="ctcBarIcon13" class="img-box">
+        <img :src="ctcBarIcon14" class="img-box">
+        <img :src="ctcBarIcon15" class="img-box">
+        <img :src="ctcBarIcon16" class="img-box">
+        <img :src="ctcBarIcon17" class="img-box">
+        <img :src="ctcBarIcon18" class="img-box" @click="handleRunplan">
+      </div>
+      <div style="display: flex;padding: 2px;border-top: 2px solid #D1D1D1;margin-top: 3px">
+        <div class="img-box" :class="{flicker: hasCommandMsg, redFlick: hasCommandMsg}" style="width: 100px;height: 25px;line-height: 21px;text-align: center;" @click="showCmdManage">调度命令</div>
+        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;" />
+        <div id="stageRunplanOut" class="img-box" @click="stageRunplan">阶段计划</div>
+        <div class="img-box" style="width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 5px;">阶段记事</div>
+        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">{{ dateString1 + '  ' + time }}</div>
+        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">同步站机通信中断</div>
+        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
+      </div>
+    </div>
+    <menu-button-ctc ref="menuButtonCtc" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'ctcWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'ctcWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'ctcWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'ctcWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'ctcWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'ctcWork'" />
+    <passive-contorl ref="passiveControl" pop-class="chengdou-03__systerm" />
+    <runplan-pane ref="runplanPane" />
+    <bottom-table ref="bottomTable" />
+    <menu-panel ref="menuPanel" />
+    <stage-runplan ref="stageRunplan" @closeFlash="closeStageFlash" @noticeInfo="noticeInfo" />
+    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+    <cmdManage ref="cmdManage" />
+    <signedCmd ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
+    <div id="playBtn" />
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapState } from 'vuex';
+import { btts } from '@/utils/baidu_tts_cors';
+import { getBaiduToken } from '@/api/voice';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './ctcWorkMenuBar';
+import MenuButtonCtc from './menuButtonCtc';
+import RunplanPane from './runplanPane';
+import StageRunplan from './dialog/stageRunplan';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import { timestampFormat } from '@/utils/date';
+import BottomTable from './bottomTable';
+import MenuPanel from './menuPanel';
+import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png';
+import CtcBarIcon2 from '@/assets/ctc_icon/pic2.png';
+import CtcBarIcon3 from '@/assets/ctc_icon/pic3.png';
+import CtcBarIcon4 from '@/assets/ctc_icon/pic4.png';
+import CtcBarIcon5 from '@/assets/ctc_icon/pic5.png';
+import CtcBarIcon6 from '@/assets/ctc_icon/pic6.png';
+import CtcBarIcon7 from '@/assets/ctc_icon/pic7.png';
+import CtcBarIcon8 from '@/assets/ctc_icon/pic8.png';
+import CtcBarIcon9 from '@/assets/ctc_icon/pic9.png';
+import CtcBarIcon10 from '@/assets/ctc_icon/pic10.png';
+import CtcBarIcon11 from '@/assets/ctc_icon/pic11.png';
+import CtcBarIcon12 from '@/assets/ctc_icon/pic12.png';
+import CtcBarIcon13 from '@/assets/ctc_icon/pic13.png';
+import CtcBarIcon14 from '@/assets/ctc_icon/pic14.png';
+import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
+import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
+import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
+import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
+import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
+import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
+import {getRunplanInStation} from '@/api/runplan';
+import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveContorl,
+        MenuButtonCtc,
+        RunplanPane,
+        StageRunplan,
+        NoticeInfo,
+        // DispatcherLoger,
+        BottomTable,
+        MenuPanel,
+        cmdManage,
+        signedCmd
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            currentRailwaySimulationRunplan:{},
+            tipContentList:[],
+            time: '00:00:00',
+            dateString: '',
+            dateString1: '',
+            ctcBarIcon1: CtcBarIcon1,
+            ctcBarIcon2: CtcBarIcon2,
+            ctcBarIcon3: CtcBarIcon3,
+            ctcBarIcon4: CtcBarIcon4,
+            ctcBarIcon5: CtcBarIcon5,
+            ctcBarIcon6: CtcBarIcon6,
+            ctcBarIcon7: CtcBarIcon7,
+            ctcBarIcon8: CtcBarIcon8,
+            ctcBarIcon9: CtcBarIcon9,
+            ctcBarIcon10: CtcBarIcon10,
+            ctcBarIcon11: CtcBarIcon11,
+            ctcBarIcon12: CtcBarIcon12,
+            ctcBarIcon13: CtcBarIcon13,
+            ctcBarIcon14: CtcBarIcon14,
+            ctcBarIcon15: CtcBarIcon15,
+            ctcBarIcon16: CtcBarIcon16,
+            ctcBarIcon17: CtcBarIcon17,
+            ctcBarIcon18: CtcBarIcon18,
+            audio: null,
+            voiceBroadcastToken: ''
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        ...mapState('socket', [
+            'dispatchCommandMsg'
+        ]),
+        hasCommandMsg() {
+            let status = false;
+            if (this.dispatchCommandMsg) {
+                status = true;
+            }
+            return status;
+        },
+        isDispStation() {
+            return this.$route.query.dispatcherStation;
+        },
+        roleDeviceCode() {
+            return this.$store.state.training.roleDeviceCode;
+        }
+    },
+    watch: {
+        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
+        },
+        '$store.state.socket.railwaySimulationRunplanSendChange': function (val) {
+            this.getRailwaySimulationRunplanSend();
+        },
+        '$store.state.training.roleDeviceCode': function (val) {
+            this.getRailwaySimulationRunplanSend();
+        },
+        '$store.state.socket.voiceBroadcastChange': function() {
+            this.$store.state.socket.voiceBroadcastMsgs.forEach(msgCode => {
+                const msg = this.$store.state.socket.railCtcRunplanInitMsg[msgCode];
+                const station = this.$store.getters['map/getDeviceByCode'](msg.arriveRunPlan.stationCode);
+                const text = station.name + msg.arriveRunPlan.tripNumber + '次发车预告';
+                this.speechSynthesis(text);
+            });
+        },
+        '$store.state.socket.simulationAlarmInfo': function(val) {
+            (val || []).forEach(item => {
+                if (!item.confirmed) {
+                    const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
+                    let fault = '';
+                    deviceFaultType[device._type].forEach(deviceFault=>{
+                        if (deviceFault.value == item.description) {
+                            fault = deviceFault.label;
+                        }
+                    });
+                    if ( item.description == 'FAULT_LOCK' ) { fault = '故障锁闭'; }
+                    this.tipContentList.push({time:item.time, message:deviceType[device._type] + (device.name || device.groupNumber) + fault});
+                    if (this.tipContentList.length > 15) {
+                        this.tipContentList.shift();
+                    }
+                }
+            });
+        },
+        '$store.state.socket.simulationReset':function(val) {
+            this.tipContentList = [];
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            this.getRunplanInStationData();
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
+        this.$store.dispatch('map/setPictureDeviceMap', {});
+    },
+    methods: {
+        getRunplanInStationData() {
+            getRunplanInStation(this.group).then(response => {
+                // debugger;
+                this.$store.dispatch('socket/initRailCtcRunplanInitMsg', response.data || []);
+            }).catch(()=>{
+            });
+        },
+        async speechSynthesis(text) {
+            if (!this.voiceBroadcastToken) {
+                const resp = await getBaiduToken();
+                this.voiceBroadcastToken = resp.data;
+            }
+            const that = this;
+            // 调用语音合成接口
+            // 参数含义请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
+            this.audio = btts({
+                tex: text,
+                tok: that.voiceBroadcastToken,
+                spd: 5,
+                pit: 5,
+                vol: 15,
+                per: 4
+            }, {
+                volume: 0.3,
+                autoDestory: true,
+                timeout: 10000,
+                hidden: false,
+                onInit: function (htmlAudioElement) {},
+                onSuccess: function(htmlAudioElement) {
+                    this.audio = htmlAudioElement;
+                    this.audio.play();
+                    // playBtn.innerText = '播放';
+                },
+                onError: function(text) { that.$message.error(text); that.voiceBroadcastToken = ''; },
+                onTimeout: function () { that.$message.error('合成语音超时！'); }
+            });
+        },
+        changeSignedStatus(info) {
+            this.$refs.cmdManage.changeSignedStatus(info);
+        },
+        signedCmdClose() {
+            this.$refs.cmdManage.doShow();
+        },
+        showCmdManage() {
+            if (this.hasCommandMsg) {
+                this.$refs.signedCmd.doShow();
+            } else {
+                this.$refs.cmdManage.doShow();
+            }
+        },
+        zhanjiantouming() {
+            this.$store.dispatch('map/setPictureDeviceMap', {});
+            const mapDevice = this.$store.state.map.mapDevice;
+            const list = [];
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'lucency');
+                if (picture) {
+                    this.$jlmap.updateShowStation(list, '');
+                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                    const deviceList = [];
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    for (const deviceCode in mapDevice) {
+                        deviceList.push(deviceCode);
+                    }
+                    this.$jlmap.updatePicture(deviceList);
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+            }
+        },
+        danzhanxianshi() {
+            this.$store.dispatch('map/setPictureDeviceMap', {});
+            const mapDevice = this.$store.state.map.mapDevice;
+            const list = [];
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'chainStation');
+                if (picture) {
+                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                    const deviceList = [];
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    for (const deviceCode in mapDevice) {
+                        deviceList.push(deviceCode);
+                    }
+                    this.$jlmap.updatePicture(deviceList);
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+            }
+        },
+        getRailwaySimulationRunplanSend() {
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            const railwaySimulationRunplanSendMap = this.$store.state.socket.railwaySimulationRunplanSendMap;
+            if (railwaySimulationRunplanSendMap[stationCode] && railwaySimulationRunplanSendMap[stationCode].dataList.length > 0) {
+                // 阶段计划
+                document.getElementById('stageRunplanOut').classList.add('active');
+                this.currentRailwaySimulationRunplan = railwaySimulationRunplanSendMap;
+            } else {
+                const sendRunplan = document.getElementById('stageRunplanOut').className;
+                document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', '');
+            }
+        },
+        initDate(date) {
+            this.time = timestampFormat('HH:mm:ss', date);
+            this.dateString = timestampFormat('YYYYMMDD', date);
+            this.dateString1 = timestampFormat('YYYY年MM月DD日', date);
+        },
+        handleRunplan() {
+            this.$refs.runplanPane.doShow();
+        },
+        stageRunplan() {
+            if (document.getElementById('stageRunplanOut').className.includes('active')) {
+                const stationCode = this.$store.state.training.roleDeviceCode;
+                this.$refs.stageRunplan.doShow(this.currentRailwaySimulationRunplan[stationCode]);
+            }
+        },
+        noticeInfo() {
+            this.$refs.noticeInfo.doShow();
+        },
+        closeStageFlash() {
+            const sendRunplan = document.getElementById('stageRunplanOut').className;
+            document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', '');
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            this.$store.dispatch('socket/deleteRailwaySimulationRunplan', stationCode);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.redFlick {
+	background: red;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.2;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+.flicker {
+	animation: fade 600ms infinite;
+}
+.title {
+	font-size: 14px;
+	padding: 0 10px;
+	background: #DEE3F3;
+	line-height: 30px;
+	position: absolute;
+	width: 100%;
+	z-index: 9;
+}
+</style>
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.chengdou-03__systerm {
+	overflow: hidden !important;
+}
+
+.chengdou-03__systerm .el-dialog {
+	background: #0055E8;
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	border: 1px solid rgb(69, 134, 247);
+	border-radius: 6px;
+	font-size: 13px !important;
+	color: #000;
+}
+
+.chengdou-03__systerm .el-dialog span {
+	font-size: 13px !important;
+	line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog span .el-icon-arrow-up{
+	line-height: 18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__footer {
+	background: #ECE9D8;
+	opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__body {
+	padding: 20px;
+	margin: 0px 3px 3px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #ECE9D8;
+	opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__title {
+	font-size: 16px;
+	color: #fff;
+	position: absolute;
+	top: 4px;
+	left: 7px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 6px;
+	right: 3px;
+	line-height: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.chengdou-03__systerm .el-dialog .el-button {
+	height: 24px;
+	line-height: 22px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 4px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.chengdou-03__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .cell {
+	height: 22px;
+	line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.chengdou-03__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+.fuzhou-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.fuzhou-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .base-label {
+	background: rgb(240 240 240);
+	position: relative;
+}
+
+.fuzhou-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.fuzhou-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.fuzhou-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.fuzhou-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+.img-box{
+	width: 28px;
+	height: 28px;
+	border: 2px #ccc outset;
+	margin-top: 0;
+	background: #fff;
+	cursor: pointer;
+}
+.img-box:active{
+	border: 2px #ccc inset;
+}
+.img-box:hover{
+	border: 2px #ccc inset;
+}
+#stageRunplanOut{
+	width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 100px;
+}
+#stageRunplanOut.active{
+	animation:changeColor 1s infinite;
+	-moz-animation:changeColor 1s infinite; /* Firefox */
+	-webkit-animation:changeColor 1s infinite; /* Safari and Chrome */
+}
+@keyframes changeColor
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+@-moz-keyframes changeColor /* Firefox */
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+@-webkit-keyframes changeColor /* Safari and Chrome */
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+.simulationAlarmInfo{
+	position: absolute;
+	width: 320px;
+	background: #cb204d;
+	height: 100px;
+	z-index: 2;
+	top: 0px;
+	left: 0px;
+	padding: 5px;
+	overflow:auto;
+}
+.eachTipContent{margin-top:5px;font-size:14px;}
+
+.simulationAlarmInfo::-webkit-scrollbar {
+	width: 5px;
+}
+.simulationAlarmInfo::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	background: #c3c3c3;
+}
+
+.simulationAlarmInfo::-webkit-scrollbar-track {
+	border-radius: 0;
+	background: #cb204d;
+}
+.simulationTellInfo{
+	position: absolute;
+	width: 328px;
+	top: 0px;
+	right: 0px;
+	padding: 0px 0px 0px 0px;
+	overflow: auto;
+	background: #c3c3c3;
+	z-index: 2;
+	display: inline-block;
+	font-size: 0;
+}
+.simulationDeviceInfo{
+	position: absolute;
+	width: 328px;
+	height: 100px;
+	top: 33px;
+	right:0px;
+	padding: 5px;
+	overflow:auto;
+	background: #c3c3c3;
+	z-index: 2;
+}
+.simulationTellInfoTop{
+	display: inline-block;
+	font-size: 0;
+}
+.simulationTellInfoTopEach{
+	padding: 6px 11px;
+	display: inline-block;
+	background: #dedede;
+	font-size: 15px;
+	border-top:2px #9c868b solid;
+	border-left:2px #9c868b solid;
+	border-right:2px #ecfbe2 solid ;
+	border-bottom:2px #ecfbe2 solid;
+
+}
+.backRed{background: #ff0000;}
+.backYellow{background: #ffff00;}
+.backGreen{background: #00ff00;}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/ctcWorkMenuBar.vue b/src/jmapNew/theme/datie_02/menus/ctcWorkMenuBar.vue
new file mode 100644
index 000000000..79fde7f7b
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/ctcWorkMenuBar.vue
@@ -0,0 +1,256 @@
+<template>
+  <div id="menuBarDatie">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%;top: 30px;" />
+    <train-fixed-path-pane ref="trainFixedPathPane" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import TrainFixedPathPane from './menuDialog/trainFixedPathPane';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'CtcWorkMenuBar',
+    components: {
+        MenuBar,
+        TrainFixedPathPane
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: '登录',
+                    operate: '',
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '显示',
+                    operate: '',
+                    children: [
+                        {
+                            title: '工具栏',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '标准按钮',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '签收栏',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '显示系统信息窗口',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '显示进路序列管理窗口',
+                                    click: this.bottomTableShowOrHidden
+                                },
+                                {
+                                    title: '显示信号员计划表',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '显示信号员注意事项',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '站场图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '行车日志',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '工具',
+                    operate: '',
+                    hide: true,
+                    children: [
+                        {
+                            title: '调度命令管理',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '甩挂车作业',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '列车编组(速报表)',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '站存车(现存车)',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '列控命令',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '车站直接限速',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '运统46',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '站场图回放',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '列控区间占用逻辑检查',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '更新数据',
+                            click: this.updateTrainFixedPath
+                        },
+                        {
+                            title: '列车固定径路',
+                            click: this.trainFixedPathPane
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '用户管理',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '选项',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            type: '时钟显示',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '调试',
+                    operate: '',
+                    children: []
+                },
+                {
+                    title: '窗口',
+                    operate: '',
+                    children: []
+                },
+                {
+                    title: '帮助',
+                    operate: '',
+                    children: []
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    methods: {
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+            }
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        },
+        updateTrainFixedPath() {
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            const operate = {
+                over: true,
+                userOperationType: 'rightClick',
+                operation: menuOperate.CTC.updateTrainFixedPath2Station.operation,
+                cmdType: menuOperate.CTC.updateTrainFixedPath2Station.cmdType,
+                param: {
+                    stationCode: stationCode
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$nextTick(() => { this.$store.dispatch('training/emitTipFresh'); });
+                }
+            }).catch(e => {
+                console.error(e);
+            });
+        },
+        trainFixedPathPane() {
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            this.$refs.trainFixedPathPane.doShow(stationCode);
+        },
+        bottomTableShowOrHidden() {
+            EventBus.$emit('bottomTableShowOrHidden');
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+    #menuBarDatie{
+        line-height:30px;
+    }
+    #menuBarDatie #menuBar .menu-li-block .label{
+        padding: 0px 30px 0px 5px !important;
+    }
+	.img-box{
+		width: 20px;
+		height: 20px;
+		margin-top: 30px;
+	}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
index f2964cbb2..431ddbfa1 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
@@ -43,9 +43,9 @@
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'TrainSetPlan',
     components: {
@@ -147,23 +147,25 @@ export default {
                 result = true;
             }
             if (this.addModel.tripNumber && result) {
-                // if (this.addModel.right === '') {
-                //     this.messageTip2 = '请选择上下行';
-                //     return;
-                // }
-                const params = {
-                    tripNumber: this.addModel.tripNumber,
-                    sectionCode: this.addModel.sectionCode,
-                    right: this.addModel.right
+
+                const operate = {
+                    over: true,
+                    userOperationType: UserOperationType.LEFTCLICK,
+                    operation: menuOperate.Section.addSpareTrain.operation,
+                    cmdType: menuOperate.Section.addSpareTrain.cmdType,
+                    param: {
+                        tripNumber: this.addModel.tripNumber,
+                        sectionCode: this.addModel.sectionCode,
+                        right: this.addModel.right
+                    }
                 };
-                this.messageTip1 = '';
                 this.loading = true;
-                commitOperate(menuOperate.Section.addSpareTrain, params, 2).then(({valid})=>{
-                    this.loading = false;
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
+                        this.loading = false;
                         this.doClose();
                     }
-                }).catch(() => {
+                }).catch(()=>{
                     this.loading = false;
                     this.doClose();
                     this.$refs.noticeInfo.doShow();
@@ -178,13 +180,15 @@ export default {
         },
         cancel() {
             const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControl.vue
deleted file mode 100644
index d298f8bc1..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControl.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm confirm-control"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <template v-for="(message, index) in messages">
-        <span :key="index">{{ message }}</span>
-      </template>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'ConfirmControl',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: {},
-            messages: '',
-            operation: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                return '信号关灯';
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                    /** 信号关灯*/
-                    return OperationEvent.Signal.signalClose.confirm.domId;
-                }
-            }
-            return '';
-        }
-    },
-    methods: {
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.messages = operate.messages;
-                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() {
-            if (this.operation === OperationEvent.Signal.signalClose.menu.operation) {
-                /** 信号关灯*/
-                this.signalClose();
-            }
-        },
-        // 信号关灯
-        signalClose() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Signal.signalClose.confirm.operation,
-                cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .confirm-control .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControlSpeed.vue
deleted file mode 100644
index d49556383..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmControlSpeed.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm confirm-control-speed"
-    :title="title"
-    :visible.sync="show"
-    width="540px"
-    :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="6" :offset="6">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'ConfirmControlSpeed',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            type: '',
-            operation: '',
-            message: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                return '区段设置限速';
-            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                return '区段取消限速';
-            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                return '道岔设置限速';
-            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                return '道岔取消限速';
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                /** 区段设置限速*/
-                return OperationEvent.Section.setSpeed.confirm.domId;
-            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                /** 区段取消限速*/
-                return OperationEvent.Section.cancelSpeed.confirm.domId;
-            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                /** 道岔设置限速*/
-                return OperationEvent.Switch.setSpeed.confirm.domId;
-            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                /** 道岔取消限速*/
-                return OperationEvent.Switch.cancelSpeed.confirm.domId;
-            }
-            return '';
-        }
-    },
-    methods: {
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.type = operate.type;
-                this.operation = operate.operation;
-                this.message = operate.message;
-            }
-
-            this.loading = false;
-            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.type
-            };
-
-            if (this.operation === OperationEvent.Section.setSpeed.order.operation) {
-                /** 区段设置限速*/
-                operate.operation = OperationEvent.Section.setSpeed.confirm.operation;
-            } else if (this.operation === OperationEvent.Section.cancelSpeed.order.operation) {
-                /** 区段取消限速*/
-                operate.operation = OperationEvent.Section.cancelSpeed.confirm.operation;
-            } else if (this.operation === OperationEvent.Switch.setSpeed.order.operation) {
-                /** 道岔设置限速*/
-                operate.operation = OperationEvent.Switch.setSpeed.confirm.operation;
-            } else if (this.operation === OperationEvent.Switch.cancelSpeed.order.operation) {
-                /** 道岔取消限速*/
-                operate.operation = OperationEvent.Switch.cancelSpeed.confirm.operation;
-            }
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.$emit('setOperate', { step: 1, success: true });
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.$emit('setOperate', { step: 0, success: false });
-                this.doClose();
-            });
-        },
-        cancel() {
-            const operate = {
-                type: this.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.$emit('setOperate', { step: 0, success: false });
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .confirm-control-speed .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmTrain.vue
deleted file mode 100644
index 494347b75..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/confirmTrain.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm confirm-control"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <template v-for="(message, index) in messages">
-        <span :key="index">{{ message }}</span>
-      </template>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'ConfirmTrain',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: {},
-            messages: '',
-            operation: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
-                return '添加列车识别号';
-            } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
-                return '修改列车识别号';
-            } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
-                return '删除列车识别号';
-            } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
-                return '移动列车识别号';
-            } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
-                return '交换列车识别号';
-            } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
-                return '修改车组号';
-            }
-            return '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
-                /** 添加列车识别号*/
-                return OperationEvent.Train.addTrainId.confirm.domId;
-            } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
-                /** 修改列车识别号*/
-                return OperationEvent.Train.editTrainId.confirm.domId;
-            } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
-                /** 删除列车识别号*/
-                return OperationEvent.Train.delTrainId.confirm.domId;
-            } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
-                /** 移动列车识别号*/
-                return OperationEvent.Train.moveTrainId.confirm.domId;
-            } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
-                /** 交换列车识别号*/
-                return OperationEvent.Train.switchTrainId.confirm.domId;
-            } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
-                /** 修改车组号*/
-                return OperationEvent.Train.editTrainNo.confirm.domId;
-            }
-            return '';
-        }
-    },
-    methods: {
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operate = operate || {};
-                this.messages = operate.messages;
-                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('map/setTrainWindowShow', false);
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            if (this.operation === OperationEvent.Train.addTrainId.menu.operation) {
-                this.routeSetting();
-            } else if (this.operation === OperationEvent.Train.editTrainId.menu.operation) {
-                this.routeSetting();
-            } else if (this.operation === OperationEvent.Train.delTrainId.menu.operation) {
-                this.routeSetting();
-            } else if (this.operation === OperationEvent.Train.moveTrainId.menu.operation) {
-                this.routeSetting();
-            } else if (this.operation === OperationEvent.Train.switchTrainId.menu.operation) {
-                this.routeSetting();
-            } else if (this.operation === OperationEvent.Train.editTrainNo.menu.operation) {
-                this.routeSetting();
-            }
-        },
-        // 进路设置
-        routeSetting() {
-            const operate = {
-                send: true,
-                type: this.operate.type,
-                operation: OperationEvent.Train.addTrainId.confirm.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();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        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>
-    .confirm-control .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
index 36cef2924..bee9c4f32 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/passwordInputBox.vue
@@ -11,7 +11,7 @@
     :close-on-click-modal="false"
   >
     <!-- 密码校验 -->
-    <el-row>
+    <el-row style="display: flex;justify-content: space-around;align-items: center;">
       <el-input v-model="encryptionPassword" placeholder="" size="medium" :disabled="true" style="width: 180px;display: inline-block;float: left;" />
       <el-button @click="backSpace">退格</el-button>
     </el-row>
@@ -21,73 +21,21 @@
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
-      <el-button @click="inputNum">0</el-button>
-      <el-button @click="inputNum">1</el-button>
-      <el-button @click="inputNum">2</el-button>
-      <el-button @click="inputNum">3</el-button>
-      <el-button @click="inputNum">4</el-button>
+      <el-button @click="inputNum('0')">0</el-button>
+      <el-button @click="inputNum('1')">1</el-button>
+      <el-button @click="inputNum('2')">2</el-button>
+      <el-button @click="inputNum('3')">3</el-button>
+      <el-button @click="inputNum('4')">4</el-button>
       <el-button :id="domIdConfirm" :loading="loading" @click="commit">确认</el-button>
     </el-row>
     <el-row justify="center" class="button-group">
-      <el-button @click="inputNum">5</el-button>
-      <el-button @click="inputNum">6</el-button>
-      <el-button @click="inputNum">7</el-button>
-      <el-button @click="inputNum">8</el-button>
-      <el-button @click="inputNum">9</el-button>
+      <el-button @click="inputNum('5')">5</el-button>
+      <el-button @click="inputNum('6')">6</el-button>
+      <el-button @click="inputNum('7')">7</el-button>
+      <el-button @click="inputNum('8')">8</el-button>
+      <el-button @click="inputNum('9')">9</el-button>
       <el-button :id="domIdCancel" @click="cancel">取消</el-button>
     </el-row>
-    <!--
-      <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">7</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">8</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">9</el-button>
-      </el-col>
-
-    <el-row justify="center" class="button-group">
-      <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">4</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">5</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">6</el-button>
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">1</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">2</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputNum">3</el-button>
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="4" :offset="1">
-        <el-button @click="inputNum">0</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="inputClear">C</el-button>
-      </el-col>
-      <el-col :span="4" :offset="4">
-        <el-button @click="backSpace"> &lt; </el-button>
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="4" :offset="1">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="4" :offset="12">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row> -->
   </el-dialog>
 </template>
 
@@ -130,7 +78,7 @@ export default {
             this.title = title;
             this.operate = operate || {};
             if (operate.operateNext) {
-				console.log(this.operation , operate.operation)
+                console.log(this.operation, operate.operation);
                 this.operation = operate.operateNext;
             } else {
                 this.operation = operate.operation;
@@ -142,7 +90,6 @@ export default {
             });
         },
         doClose() {
-            this.loading = false;
             this.dialogShow = false;
             this.showMistake = false;
             this.title = '';
@@ -158,9 +105,9 @@ export default {
             }
         },
         /* 软键盘输入*/
-        inputNum(e) {
+        inputNum(num) {
             this.showMistake = false;
-            this.passwordCheck += e.path[0].innerText;
+            this.passwordCheck += num;
             this.encryptionPassword = this.passwordCheck.replace(/./g, '*');
         },
         /* 软键盘清除*/
@@ -184,20 +131,16 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.cancel.password.operation
             };
-            this.$emit('checkCancel');
-            if (this.operate.nextCmdType == CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE) {
-                this.$store.dispatch('training/updateMapState', [{code: this.operate.code, _type:'SignalButton', pressDown: 0}]);
-            }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
-                    this.doClose();
-                    this.inputClear();
+                    if (this.operate.nextCmdType === CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE) {
+                        this.$store.dispatch('training/updateMapState', [{code: this.operate.code, _type: 'SignalButton', pressDown: 0}]);
+                    }
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$emit('checkCancel');
+                    this.inputClear();
+                    this.doClose();
                 }
-            }).catch(() => {
-                this.loading = false;
-                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow();
             });
         }
     }
@@ -287,8 +230,10 @@ export default {
     }
 
     .datie-02__systerm .el-dialog .button-group {
-      font-size:0;
-      margin-top:2px;
+		font-size:0;
+		margin-top:2px;
+		display: flex;
+		justify-content: space-around;
     }
     /*
 
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/datie_02/menus/dialog/childDialog/popupAlarm.vue
deleted file mode 100644
index b6b925622..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/childDialog/popupAlarm.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'PopupAlarm',
-    data() {
-        return {
-            dialogShow: false,
-            messages: [],
-            operate: null,
-            operation: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '弹出式告警';
-        },
-        domIdSure() {
-            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-        }
-    },
-    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;
-            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>
-    .popup-alarm .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
index d559b0d71..9534fb63b 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/defectiveShunting.vue
@@ -33,6 +33,7 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'DefectiveShunting',
     components: {
@@ -96,12 +97,12 @@ export default {
             });
             const operate = {
                 operation: OperationEvent.Section.defectiveShunting.shuntingTypeListChange.operation,
-                userOperationType: 'leftClick',
-                shuntingTypeList: shuntingTypeList
+                userOperationType: UserOperationType.LEFTCLICK,
+                param: {
+                    shuntingTypeList: shuntingTypeList
+                }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                // if (valid) {}
-            }).catch((error) => { console.error(error); });
+            this.$store.dispatch('trainingNew/next', operate);
         },
         commit() {
             const shuntingTypeList = [];
@@ -114,30 +115,29 @@ export default {
                 over: true,
                 cmdType:CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING,
                 operation: OperationEvent.Section.defectiveShunting.confirm.operation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 param:{
                     sectionCode:this.sectionCode,
                     shuntingTypeList:shuntingTypeList
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                     this.$emit('clearOperate');
                 }
-            }).catch((error) => { this.doClose(); this.$refs.noticeInfo.doShow(); console.log(error); });
+            });
         },
         cancel() {
             const operate = {
                 over: true,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         }
     }
 };
@@ -146,7 +146,7 @@ export default {
 .shuntingName{
     display: inline-block;
     width: 90px;
-    padding: 4px 0px;
+    padding: 4px 0;
     background: #fff;
     border-radius: 5px;
     border: 1px #bfbfbf solid;
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
index 91d546f4d..9beb036c3 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue
@@ -25,7 +25,8 @@
 </template>
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'DeleteRunplan',
     data() {
@@ -70,13 +71,18 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.CTCCommand.setDeleteRunplanLabel.menu.operation,
+                userOperationType: UserOperationType.LEFTCLICK,
+                cmdType: CMD.CTC.CTC_LOG_SET_DELETE_LABEL,
+                param: this.model
+            };
             this.loading = true;
-            // 设置删除标识
-            // deleteRunplan;
-            commitOperate(menuOperate.CTC.setDeleteRunplanLabel, this.model, 2).then(({valid})=>{
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 this.loading = false;
-                this.$emit('clearRpRow');
                 if (valid) {
+                    this.$emit('clearRpRow');
                     this.doClose();
                 }
             }).catch(() => {
@@ -90,12 +96,12 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
+                    this.$emit('clearRpRow');
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
index 53bf85a71..8d9b026b8 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
@@ -61,7 +61,8 @@
 <script>
 // import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'ModifyAdjacentStation',
     data() {
@@ -113,11 +114,18 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
+            const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.CTC.modifyAdjacentStation.operation,
+                cmdType: menuOperate.CTC.modifyAdjacentStation.cmdType,
+                param: { ...this.model }
+            };
             this.loading = true;
-            commitOperate(menuOperate.CTC.modifyAdjacentStation, this.model, 2).then(({valid})=>{
-                this.loading = false;
-                this.$emit('clearRpRow');
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
+                    this.loading = false;
+                    this.$emit('clearRpRow');
                     this.doClose();
                 }
             }).catch(() => {
@@ -129,14 +137,16 @@ export default {
         },
         cancel() {
             const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
+                    this.$emit('clearRpRow');
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
index dd92fc91d..a97102a40 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyTripNumber.vue
@@ -80,6 +80,7 @@
 // import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'ModifyTripNumber',
     data() {
@@ -178,10 +179,11 @@ export default {
         },
         cancel() {
             const operate = {
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue
index 0ddcd4775..d022f2322 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/regionBatchOperation.vue
@@ -99,7 +99,7 @@ export default {
     doShow(stationCode) {
       this.show = true
       this.$nextTick(() => {
-        const picData = this.mapData.pictureList.find(pic => pic.stationCode === stationCode && pic.type === 'regionBatchOperation')
+        const picData = this.mapData.pictureList.find(pic => pic.stationCodes.includes(stationCode) && pic.type === 'regionBatchOperation')
         this.$store.dispatch('map/setPictureDeviceMap', picData.deviceMap)
         const list = []
         for (const deviceCode in picData.deviceMap) {
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeDetail.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeDetail.vue
deleted file mode 100644
index b7211c025..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeDetail.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="chengdou-03__systerm route-detail"
-      :title="title"
-      :visible.sync="show"
-      width="460px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <el-row>
-        <el-col :span="2"><span>车站</span></el-col>
-        <el-col :span="6">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-col>
-        <el-col :span="6" :offset="1"><span>始端信号机</span></el-col>
-        <el-col :span="6">
-          <el-input v-model="signalName" size="small" disabled />
-        </el-col>
-      </el-row>
-      <div style="margin-top: 20px">
-        <el-table
-          ref="tempTable"
-          :data="tempData"
-          border
-          style="width: 100%"
-          size="mini"
-          highlight-current-row
-          :height="140"
-        >
-
-          <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ handleRouteName(scope.row.name) }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ handleDirection(scope.row.startSignalCode) }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ scope.row.turnBack ? '折返': '直通' }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-row justify="center" class="button-group">
-        <el-col :span="10" :offset="2">
-          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-        </el-col>
-        <el-col :span="8" :offset="4">
-          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-        </el-col>
-      </el-row>
-      <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CancelMouseState from '@/mixin/CancelMouseState';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteDetail',
-    components: {
-        NoticeInfo
-    },
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            tempData: [],
-            stationName: '',
-            signalName: '',
-            domIdChoose: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'signalList',
-            'mapConfig'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.detail.menu.domId : '';
-        },
-        title() {
-            return '查询进路状态';
-        }
-    },
-    methods: {
-        doShow(operate, selected, tempData) {
-            this.selected = selected;
-            // 如果不是因为断点激活则需要，初始化菜单初始值
-            if (!this.dialogShow) {
-                this.signalName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                    this.signalName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.tempData = tempData || [];
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        handleRouteName(name) {
-            return name.replace(/-/, '-->');
-        },
-        handleDirection(signalCode) {
-            let signalDirection = '';
-            this.signalList.some(item => {
-                if (item.code === signalCode) {
-                    signalDirection = item.right;
-                    return true;
-                }
-            });
-            if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
-                return '上行';
-            } else {
-                return '下行';
-            }
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                operation: OperationEvent.Signal.detail.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();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
index 11cba9131..2af0f769d 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeGuide.vue
@@ -77,6 +77,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 // import PasswordBox from './childDialog/passwordInputBox.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
+import { UserOperationType } from '@/scripts/ConstDic';
 
 export default {
     name: 'RouteSelection',
@@ -201,7 +202,7 @@ export default {
                     operation: OperationEvent.Signal.guide.choose.operation,
                     val: row.code
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -213,6 +214,7 @@ export default {
             if (this.row && this.row.code) {
                 const operate = {
                     over: true,
+                    userOperationType: UserOperationType.LEFTCLICK,
                     operation: OperationEvent.Signal.guide.confirm.operation,
                     cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
                     param: {
@@ -221,15 +223,12 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
+                        this.loading = false;
                         this.doClose();
-                    } else {
-                        this.doClose();
-                        this.$refs.noticeInfo.doShow();
                     }
-                }).catch(() => {
+                }).catch(e => {
                     this.loading = false;
                     this.doClose();
                     this.$refs.noticeInfo.doShow();
@@ -238,15 +237,14 @@ export default {
         },
         cancel() {
             const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(() => {
-                this.doClose();
             });
         }
     }
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeHandControl.vue
deleted file mode 100644
index 69ce0d572..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeHandControl.vue
+++ /dev/null
@@ -1,267 +0,0 @@
-<template>
-  <div>
-    <el-dialog v-dialogDrag class="chengdou-03__systerm route-hand-control" :title="title" :visible.sync="show" width="500px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-      <el-row class="header">
-        <el-col :span="11"><span>车站</span></el-col>
-        <el-col :span="11" :offset="2"><span>始端信号机</span></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="11">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-col>
-        <el-col :span="11" :offset="2">
-          <el-input v-model="signalName" size="small" disabled />
-        </el-col>
-      </el-row>
-      <div class="table">
-        <el-table ref="tempTable" :data="tempData" border style="width: 100%" size="mini" :highlight-current-row="highlight" :height="140" @row-click="clickEvent">
-          <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ handleRouteName(scope.row.name) }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ handleDirection(scope.row.startSignalCode) }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ scope.row.turnBack ? '折返': '直通' }}
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
-            <template slot-scope="scope">
-              <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-                {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-row justify="center" class="button-group">
-        <el-col :span="10" :offset="2">
-          <el-button :id="domIdConfirm" type="primary" :disabled="commitDisabled" :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>
-      <confirm-control ref="confirmControl" />
-      <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import ConfirmControl from './childDialog/confirmControl';
-import CancelMouseState from '@/mixin/CancelMouseState';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'RouteHandControl',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            tempData: [],
-            operation: null,
-            selection: [],
-            stationName: '',
-            signalName: '',
-            highlight: true,
-            row: '',
-            commitDisabled: true
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'signalList',
-            'mapConfig'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                return OperationEvent.Signal.humanControl.choose.domId;
-            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                return OperationEvent.Signal.atsAutoControl.choose.domId;
-            }
-            return '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                return '进路收人工控';
-            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                return '进路交自动控';
-            }
-            return '';
-        }
-    },
-    methods: {
-        doShow(operate, selected, tempData) {
-            this.selected = selected;
-            this.selection = [];
-            this.commitDisabled = true;
-            // 如果不是断点激活，而是第一次显示则初始化
-            if (!this.dialogShow) {
-                this.signalName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                    this.signalName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                if (tempData && tempData.length > 0) {
-                    tempData.forEach(elem => {
-                        elem.check = false;
-                        elem.disabled = false;
-                        // 设置禁用状态
-                        if (operate.operation === OperationEvent.Signal.humanControl.menu.operation &&
-                            (elem.atsControl == '0') ) {
-                            elem.disabled = true;
-                        } if (operate.operation === OperationEvent.Signal.atsAutoControl.menu.operation &&
-                            (elem.atsControl == '1') ) {
-                            elem.disabled = true;
-                        }
-                    });
-                }
-
-                this.tempData = tempData || [];
-                this.operation = operate.operation;
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        handleRouteName(name) {
-            return name.replace(/-/, '-->');
-        },
-        handleDirection(signalCode) {
-            let signalDirection = '';
-            this.signalList.some(item => {
-                if (item.code === signalCode) {
-                    signalDirection = item.right;
-                    return true;
-                }
-            });
-            if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
-                return '上行';
-            } else {
-                return '下行';
-            }
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$refs.tempTable.setCurrentRow();
-            this.$store.dispatch('training/emitTipFresh');
-        },
-
-        clickEvent(row, event, column) {
-            this.highlight = false;
-            if (row && row.code) {
-                this.highlight = true;
-                this.selection = [row];
-                this.beforeSectionList = row.containSectionList || [];
-                this.row = row;
-                // 设置选中指令
-                const operate = {
-                    operation: '',
-                    val: row.code
-                };
-                if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                    /** 进路交人工控*/
-                    operate.operation = OperationEvent.Signal.humanControl.choose.operation;
-                    this.commitDisabled = !row.atsControl;
-                } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                    /** 进路交自动控*/
-                    this.commitDisabled = Boolean(row.atsControl);
-                    operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            }
-        },
-        commit() {
-            if (this.operation == OperationEvent.Signal.humanControl.menu.operation) {
-                /** 进路交人工控*/
-                this.humanControl();
-            } else if (this.operation == OperationEvent.Signal.atsAutoControl.menu.operation) {
-                /** 进路交自动控*/
-                this.atsAutoControl();
-            }
-        },
-        // 进路交人工控
-        humanControl() {
-            commitOperate(menuOperate.Signal.humanControl, {routeCodeList: [this.row.code]}, 2).then(({valid, operate}) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        // 进路交自动控
-        atsAutoControl() {
-            commitOperate(menuOperate.Signal.atsAutoControl, {routeCodeList: [this.row.code]}, 2).then(({valid, operate}) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                over: true,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection.vue
deleted file mode 100644
index 12014afb3..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm route-setting"
-    :title="title"
-    :visible.sync="show"
-    width="500px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-col :span="2"><span class="item-lable">车站</span></el-col>
-      <el-col :span="6">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="4" :offset="1"><span class="item-lable">始端信号机</span></el-col>
-      <el-col :span="6">
-        <el-input v-model="signalName" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div class="route-table-box">
-      <span class="route-table-tip">进路列表</span>
-      <el-table
-        ref="table"
-        :data="tempData"
-        border
-        :cell-style="tableStyle"
-        style="width: 99%;"
-        size="mini"
-        height="150"
-        highlight-current-row
-        @row-click="clickEvent"
-      >
-        <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px">
-          <template slot-scope="scope">
-            <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-              {{ handleRouteName(scope.row.name) }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column :id="domIdChoose" prop="startSignalCode" label="方向" style="margin-left: 30px">
-          <template slot-scope="scope">
-            <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-              {{ handleDirection(scope.row.startSignalCode) }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column :id="domIdChoose" prop="turnBack" label="属性" style="margin-left:30px">
-          <template slot-scope="scope">
-            <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-              {{ scope.row.turnBack ? '折返': '直通' }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column :id="domIdChoose" prop="controlType" label="控制" style="margin-left:30px">
-          <template slot-scope="scope">
-            <div :style="{color: scope.row.turnBack? '#00FFFF':'#000000'}">
-              {{ scope.row.atsControl == '0' ? '人工' : '自动' }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <el-row justify="center" style="margin-top: 70px">
-      <el-col :span="12" :offset="12">
-        <el-button
-          :id="domIdConfirm"
-          type="primary"
-          :loading="loading"
-          :disabled="commitDisabled"
-          @click="commit"
-        >执行</el-button>
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    <password-box ref="passwordBox" @checkOver="passWordCommit" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CancelMouseState from '@/mixin/CancelMouseState';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { mapGetters } from 'vuex';
-import { deepAssign } from '@/utils/index';
-import PasswordBox from './childDialog/passwordInputBox.vue';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'RouteSelection',
-    components: {
-        NoticeInfo,
-        PasswordBox
-    },
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            tempData: [],
-            beforeSectionList: [],
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            row: null,
-            operation: '',
-            display: true,
-            stationName: '',
-            signalName: '',
-            commitDisabled:true,
-            tableStyle: {
-                'border-bottom': 'none'
-            }
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.confirm.domId : '';
-        },
-        title() {
-            return '办理进路';
-        },
-        ...mapGetters('map', [
-            'signalList',
-            'sectionList',
-            'mapConfig'
-        ])
-    },
-    methods: {
-        getProtectedSectionName(row) {
-            let name = '';
-            if (row &&
-                    row.overlapSectionList &&
-                    row.overlapSectionList &&
-                    row.overlapSectionList.length > 0) {
-
-                const protect = row.overlapSectionList[0];
-                name = `${protect.name}`;
-                const station = this.$store.getters['map/getDeviceByCode'](protect.stationCode);
-                if (station) {
-                    name = `${name}(${station.name})`;
-                }
-            }
-            return name;
-        },
-        handleRouteName(name) {
-            return name.replace(/-/, '-->');
-        },
-        handleDirection(signalCode) {
-            let signalDirection = '';
-            this.signalList.some(item => {
-                if (item.code === signalCode) {
-                    signalDirection = item.right;
-                    return true;
-                }
-            });
-            if ((signalDirection && this.mapConfig.upRight) || (!signalDirection && !this.mapConfig.upRight)) {
-                return '上行';
-            } else {
-                return '下行';
-            }
-        },
-        doShow(operate, selected, tempData) {
-            this.selected = selected;
-            this.commitDisabled = true;
-            // 如果不是断点激活，而是第一次显示，则需要设置初始值
-            if (!this.dialogShow) {
-                this.signalName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-                    this.signalName = selected.name;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.tempData = tempData || [];
-                this.operation = operate.operation;
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.restoreBeforeDevices();
-            this.$refs.table.setCurrentRow();
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        restoreBeforeDevices() {
-            // 恢复之前选中设备
-            if (this.beforeSectionList && this.beforeSectionList.length) {
-                this.beforeSectionList.forEach(elem => {
-                    elem.cutOff = false;
-                });
-            }
-
-            this.$store.dispatch('training/updateMapState', [...this.beforeSectionList]);
-            this.beforeSectionList = [];
-        },
-        clickEvent(row, event, column) {
-            this.row = row;
-            if (row) {
-                // 恢复进路区段的切除状态
-                this.restoreBeforeDevices();
-                row.canSetting = true;
-                this.commitDisabled = false;
-                // 设置选中区段为切除状态
-                const containSectionList = [];
-                if (row.routeSectionList && row.routeSectionList.length) {
-                    // 设置新选的进路区段为切除状态
-                    row.routeSectionList.forEach(elem => {
-                        const section = deepAssign({}, this.$store.getters['map/getDeviceByCode'](elem));
-                        if (section.logicSectionCodeList && section.logicSectionCodeList.length) {
-                            section.logicSectionCodeList.forEach(item => {
-                                const sec = deepAssign({}, this.$store.getters['map/getDeviceByCode'](item));
-                                sec.cutOff = true;
-                                containSectionList.push(sec);
-                            });
-                        } else {
-                            section.cutOff = true;
-                            containSectionList.push(section);
-                        }
-                    });
-                }
-
-                this.$store.dispatch('training/updateMapState', [...containSectionList]);
-                this.beforeSectionList = containSectionList || [];
-
-                // 设置选中指令
-                const operate = {
-                    operation: OperationEvent.Signal.arrangementRoute.choose.operation,
-                    val: row.code
-                };
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            }
-        },
-        commit() {
-            if (this.row && this.row.canSetting) {
-                this.loading = true;
-                commitOperate({operation:OperationEvent.Signal.arrangementRoute.confirm.operation}, {routeCode: this.row.code}, 1).then(({valid, operate})=>{
-                    this.loading = false;
-                    if (valid) {
-                        this.$refs.passwordBox.doShow({operation:OperationEvent.Signal.arrangementRoute.menu.operation});
-                        this.doClose();
-                    }
-                }).catch((error) => {
-                    this.loading = false;
-                    this.doClose();
-                    console.error(error);
-                    this.$refs.noticeInfo.doShow();
-                });
-            }
-        },
-        passWordCommit(data) {
-            this.loading = true;
-            commitOperate(menuOperate.Signal.arrangementRoute, {}, 2).then(({valid, operate})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style scoped>
-    .route-table-tip {
-        position: relative !important;
-        color: #3C72DF !important;
-        background: #ECE9D8 !important;
-        font-size: 12px;
-        top: -7px;
-        left: 7px;
-    }
-
-    .route-table-box {
-        margin-top: 15px !important;
-        line-height: 10px !important;
-        border: 2px solid #FFFFFF !important;
-        border-radius: 5px !important;
-        z-index: 1;
-    }
-
-    .item-lable {
-        line-height: 26px !important;
-        font-size: 13px;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
index 8b84cf582..4e0e6b736 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/routeSelection1.vue
@@ -79,7 +79,7 @@ import { mapGetters } from 'vuex';
 import ConfirmTip from './childDialog/confirmTip';
 import MapVisual from './mapVisual';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'RouteSelection',
     components: {
@@ -249,11 +249,12 @@ export default {
 
                     // 设置选中指令
                     const operate = {
+                        userOperationType: UserOperationType.LEFTCLICK,
                         operation: OperationEvent.Signal.arrangementRoute.choose.operation,
                         val: route.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -282,9 +283,10 @@ export default {
         },
         cancel() {
             const operate = {
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/datie_02/menus/dialog/sectionDetail.vue
deleted file mode 100644
index 7e6a03371..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/sectionDetail.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-dialogDrag
-      class="chengdou-03__systerm section-detail"
-      :title="title"
-      :visible.sync="show"
-      width="320px"
-      :before-close="doClose"
-      :z-index="2000"
-      :modal="false"
-      :close-on-click-modal="false"
-    >
-      <el-form ref="form" label-position="left" :model="formModel" label-width="100px">
-        <el-form-item label="区段名称">
-          <el-input v-model="formModel.sectionName" disabled />
-        </el-form-item>
-        <el-form-item label="车站名称">
-          <el-input v-model="formModel.stationName" disabled />
-        </el-form-item>
-        <el-form-item label="公里标(Km)">
-          <el-input v-model="formModel.kmPost" disabled />
-        </el-form-item>
-        <el-form-item label="长度(m)">
-          <el-input v-model="formModel.lengthFact" disabled />
-        </el-form-item>
-      </el-form>
-      <el-row justify="center" style="margin-top: 50px">
-        <el-col :span="7" :offset="17">
-          <el-button :id="domIdConfirm" @click="commit">确定</el-button>
-        </el-col>
-      </el-row>
-      <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'RouteDetail',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            formModel: {
-                sectionName: '',
-                stationName: '',
-                kmPost: '',
-                lengthFact: ''
-            }
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Section.detail.menu.domId : '';
-        },
-        title() {
-            return '无岔区段属性对话框';
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是因为断点激活则需要，初始化菜单初始值
-            if (!this.dialogShow) {
-                if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
-                    const hasParentCode = (this.selected.type == '02');
-                    this.formModel.sectionName = hasParentCode ? selected.parentName + '-' + selected.name : selected.name;
-                    this.formModel.lengthFact = selected.lengthFact;
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.formModel.stationName = station.name;
-                        this.formModel.kmPost = station.kmPost;
-                    }
-                }
-            }
-
-            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 = {
-                operation: OperationEvent.Section.detail.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue
index 49760bb61..fa69c2959 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/sendRunplan.vue
@@ -125,6 +125,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic'; ;
 export default {
     name:'SendRunplan',
     data() {
@@ -227,9 +228,10 @@ export default {
         },
         cancel() {
             const operate = {
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue
index 89b7b22ee..9189c018d 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue
@@ -114,7 +114,8 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name:'StageRunplan',
     data() {
@@ -163,10 +164,19 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         commit() {
+            const operate = {
+                start: true,
+                over: true,
+                operation: menuOperate.CTC.stationSignRunplan.operation,
+                cmdType: menuOperate.CTC.stationSignRunplan.cmdType,
+                param: {
+                    stationCode: this.stationCode
+                }
+            };
             this.loading = true;
-            commitOperate(menuOperate.CTC.stationSignRunplan, {stationCode:this.stationCode}, 3).then(({valid})=>{
-                this.loading = false;
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
+                    this.loading = false;
                     this.$emit('closeFlash');
                     this.doClose();
                 }
@@ -178,13 +188,15 @@ export default {
         },
         cancel() {
             const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/standControl.vue b/src/jmapNew/theme/datie_02/menus/dialog/standControl.vue
deleted file mode 100644
index c6c29c830..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/standControl.vue
+++ /dev/null
@@ -1,603 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-detain-train"
-    :title="title"
-    :visible.sync="show"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="11">
-        <span>车站</span>
-        <el-input v-model="stationName" style="width: 110px; margin-left: 10px;" size="small" disabled />
-      </el-col>
-      <el-col :span="11" :offset="1">
-        <span>站台</span>
-        <el-input v-model="standName" style="width: 110px; margin-left: 10px;" size="small" disabled />
-      </el-col>
-    </el-row>
-    <div v-if="DetainTrain">
-      <div
-        style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray;"
-      >
-        <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
-        <el-row style="margin-top: -13px;">
-          <el-radio-group  v-model="radio" @change="choose">
-            <el-col :span="24">
-              <el-radio
-			   :id="domIdDetainCar"
-                label="01"
-                style="display: block; text-align: left; float: left; margin-right: 10px;"
-              >本站台
-              </el-radio>
-              <el-radio
-			    :id="isUpDirection? domIdDetainChoose: ''"
-                v-if="radio1 == 2"
-                :disabled="!isUpDirection"
-                :label="`${isUpDirection}`"
-                style="display: block; text-align: left; float: left; margin-right: 10px;"
-              >上行全线
-              </el-radio>
-              <el-radio
-			    :id="isUpDirection ? '': domIdDetainChoose"
-                v-if="radio1 == 2"
-                :label="`${!isUpDirection}`"
-                :disabled="isUpDirection"
-                style="display: block; text-align: left; float: left;"
-              >下行全线</el-radio>
-            </el-col>
-          </el-radio-group>
-        </el-row>
-      </div>
-      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              v-model="radio1"
-              label="1"
-              :disabled="radio1 == '2'"
-              style="display: block; text-align: left;"
-            >
-              扣车</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              v-model="radio1"
-              label="2"
-              :disabled="radio1 == '1'"
-              style="display: block; text-align: left;"
-            >
-              取消扣车</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div v-if="JumpStop">
-      <div
-        style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray; height: 115px;"
-      >
-        <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="24">
-            <el-radio-group v-model="radio" @change="chooseJumpStop">
-              <el-radio
-                :id="radio == '02' ? domIdChoose : ''"
-                label="01"
-                style="display: block; text-align: left; margin-right: 10px; margin-bottom: 20px; width: 80px;"
-              >
-                站台跳停
-              </el-radio>
-              <el-radio
-                :id="radio == '01' ? domIdChoose : ''"
-                label="02"
-                style="display: block; text-align: left; margin-left: 0; float: left;"
-              >
-                指定列车跳停</el-radio>
-              <div style="float: left;">
-                <span>车组号</span>
-                <el-select
-                  :id="domIdCancelJumpStop"
-                  v-model="tripNumber"
-                  style="width: 120px; margin-left: 20px;"
-                  size="mini"
-                  :disabled="radio == '01'"
-                  @change="trainNoSelectChange"
-                >
-                  <el-option
-                    v-for="option in trainList"
-                    :key="option.groupNumber"
-                    :label="option.groupNumber"
-                    :value="option.groupNumber"
-                  />
-                </el-select>
-              </div>
-            </el-radio-group>
-          </el-col>
-        </el-row>
-      </div>
-      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
-        <el-row style="margin-top: -13px;">
-          <el-col :span="11">
-            <el-radio
-              v-model="radio1"
-              label="1"
-              :disabled="radio1 == 2"
-              style="display: block; text-align: left;"
-            >
-              跳停</el-radio>
-          </el-col>
-          <el-col :span="11" :offset="2">
-            <el-radio
-              v-model="radio1"
-              label="2"
-              :disabled="radio1 == 1"
-              style="display: block; text-align: left;"
-            >
-              取消跳停</el-radio>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div v-if="RunLevel">
-      <div
-        style="padding: 15px; margin-bottom: 25px; margin-top: 20px; border: 1px solid lightgray; height: 105px;"
-      >
-        <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
-        <el-row style="margin-top: -13px;">
-          <el-radio-group v-model="radio" @change="chooseStopTime">
-            <el-col :span="24">
-              <el-radio
-                :id="radio == '02' ? domIdChoose1 : ''"
-                label="01"
-                style="display: block; text-align: left; margin-right: 10px; margin-bottom:10px; width: 60px;"
-              >
-                自动
-              </el-radio>
-              <el-radio
-                :id="radio == '01' ? domIdChoose1 : ''"
-                label="02"
-                style="display: block; text-align: left; margin-left: 0; float: left;"
-              >
-                人工</el-radio>
-              <div v-if="radio2 == 2" style="float: left; margin-left: 20px;">
-                <span>运行等级</span>
-                <el-select
-                  :id="domIdRunLevel"
-                  v-model="trainRunlevel"
-                  style="width: 120px; margin-left: 20px;"
-                  size="mini"
-                  :disabled="radio == '01'"
-                  @change="trainNoSelectLevel"
-                >
-                  <el-option
-                    v-for="option in runLevelList"
-                    :key="option.value"
-                    :label="option.label"
-                    :value="option.value"
-                  />
-                </el-select>
-              </div>
-              <div v-if="radio2 == 1" style="float: left; margin-left: 20px;">
-                <span>停站时间</span>
-                <el-input-number
-                  :id="domIdStopTime"
-                  v-model="trainStopTime"
-                  :min="15"
-                  :max="300"
-                  :step="1"
-                  size="mini"
-                  :controls="false"
-                  style="width:100px;display:inline-block;margin-left:10px;height:34px;"
-                  :disabled="radio == '01'"
-                  @blur="handleTrainStopTime"
-                />
-                <div style="margin-left: 5px;display: inline-block;font-size: 14px;">秒</div>
-              </div>
-            </el-col>
-          </el-radio-group>
-        </el-row>
-      </div>
-      <div style="padding: 15px; margin-top: 20px; border: 1px solid lightgray;">
-        <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">功能</span>
-        <el-row style="margin-top: -13px;">
-          <el-radio-group v-model="effective" :disabled="disabledTime" @change="chooseEffective">
-            <el-radio :id="effective === false? '': domIdChoose2" :label="false">一次有效</el-radio>
-            <el-radio :id="effective === true? '': domIdChoose2" :label="true">一直有效</el-radio>
-          </el-radio-group>
-          <!-- <el-radio-group v-model="effective" :disabled="disabledTime" @change="chooseEffective">
-            <el-col :span="11">
-              <el-radio
-                :id="effective == '02' ? '': domIdChoose2"
-                label="01"
-                style="display: block; text-align: left;"
-              >
-                一次有效</el-radio>
-            </el-col>
-            <el-col :span="11" :offset="2">
-              <el-radio
-                :id="effective == '01' ? '': domIdChoose2"
-                label="02"
-                style="display: block; text-align: left;"
-              >
-                一直有效</el-radio>
-            </el-col>
-          </el-radio-group> -->
-        </el-row>
-      </div>
-    </div>
-    <el-row 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>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'StandDetainTrain',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            standName: '',
-            stationName: '',
-            selected: null,
-            operation: null,
-            isUpDirection:true,
-            radio: '01',
-            radio1: '1',
-            radio2: '1',
-            DetainTrain: false,
-            JumpStop: false,
-            RunLevel: false,
-            trainList: [],
-            runLevelList: [
-                { value: 2, label: '常速' },
-                { value: 1, label: '低速' },
-                { value: 3, label: '高速' }
-            ],
-            tripNumber: '',
-            effective: '01',
-            trainRunlevel: 2,
-            trainStopTime: 30,
-            disabledTime: true
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map',
-            'mapConfig'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-        },
-        domIdDetainCar() {
-            return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
-		},
-		domIdDetainChoose() {
-			return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
-		},
-        domIdChoose() {
-            if (this.radio1 == '1') { // 跳停
-                return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
-            } else { // 取消跳停
-                return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.select.domId : '';
-            }
-        },
-        // domIdJumpStop() {
-        //     return this.dialogShow ? OperationEvent.StationStand.setJumpStop.choose.domId : '';
-        // },
-        domIdCancelJumpStop() {
-            return this.dialogShow ? OperationEvent.StationStand.cancelJumpStop.choose.domId : '';
-        },
-        domIdChoose1() {
-            if (this.radio2 == '1') { // 设置停站时间
-                return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose1.domId : '';
-            } else { // 设置站间运行等级
-                return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose1.domId : '';
-            }
-        },
-        domIdChoose2() {
-            if (this.radio2 == '1') { // 设置停站时间
-                return this.dialogShow ? OperationEvent.StationStand.setStopTime.choose2.domId : '';
-            } else { // 设置站间运行等级
-                return this.dialogShow ? OperationEvent.StationStand.setRunLevel.choose2.domId : '';
-            }
-        },
-        domIdStopTime() {
-            return this.dialogShow ? OperationEvent.StationStand.setStopTime.input.domId : '';
-        },
-        domIdRunLevel() {
-            return this.dialogShow ? OperationEvent.StationStand.setRunLevel.chooseTrain.domId : '';
-        },
-        title() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                return '扣车';
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation || this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) {
-                return '取消扣车';
-            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                return '设置跳停';
-            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                return '取消跳停';
-            } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
-                return '设置停站时间';
-            } else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
-                return '设置站间运行等级';
-            }
-            return '';
-        }
-    },
-    watch: {
-        operation(data) {
-            if (data != OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) {
-                this.JumpStop = false;
-                this.RunLevel = false;
-                this.DetainTrain = false;
-                this.radio = '01';
-                this.radio1 = '1';
-                this.radio2 = '1';
-                if (data == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                    this.radio1 = '1';
-                    this.radio = '01';
-                    this.DetainTrain = true;
-                } else if (data == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                    this.radio1 = '2';
-                    this.radio = '01';
-                    this.DetainTrain = true;
-                } else if (data == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                    this.JumpStop = true;
-                    this.radio1 = '1';
-                } else if (data == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                    this.JumpStop = true;
-                    this.radio1 = '2';
-                } else if (data == OperationEvent.StationStand.setStopTime.menu.operation) {
-                    this.RunLevel = true;
-                    this.radio2 = '1';
-                } else if (data == OperationEvent.StationStand.setRunLevel.menu.operation) {
-                    this.RunLevel = true;
-                    this.radio2 = '2';
-                }
-            }
-        }
-    },
-    methods: {
-        doShow(operate, selected, tempDate = null) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.tripNumber = '';
-                this.standName = '';
-                this.stationName = '';
-                this.operation = operate.operation;
-                if (selected) {
-                    this.getDirection(selected);
-                }
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    this.getDirection(selected);
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation || this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                    this.radio = selected.direction;
-                }
-                this.effective = false;
-                this.radio = '01';
-                this.disabledTime = true;
-                this.trainList = this.map.trainList; // 加载列车数据
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        getDirection(selected) {
-            if (this.mapConfig.upRight) {
-                this.standName = selected.right ? '上行' : '下行';
-                this.isUpDirection = selected.right;
-            } else if (!this.mapConfig.upRight) {
-                this.standName = selected.right ? '下行' : '上行';
-                this.isUpDirection = !selected.right;
-            }
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.operation = '';
-            this.trainStopTime = 30;
-        },
-        choose(upDown) { // 取消扣车 请求code码
-            const operate = {
-				operation: upDown == '01'
-					? OperationEvent.StationStand.cancelDetainTrain.choose.operation
-					: OperationEvent.Command.common.choose.operation,
-                val: this.radio
-            };
-            if (this.radio == '02' || this.radio == '03') {
-                this.operation = OperationEvent.StationStand.cancelDetainTrainAll.menu.operation;
-            } else {
-                this.operation = OperationEvent.StationStand.cancelDetainTrain.menu.operation;
-            }
-            this.handleBreak(operate);
-        },
-        trainNoSelectChange(upDown) { // 跳停 选择车组号
-            const operate = {
-                operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation
-            };
-            this.handleBreak(operate);
-        },
-        chooseJumpStop(upDown) {
-            const operate = {
-                operation: ''
-            };
-            if (this.radio1 == '1') { // 跳停选择
-                operate.operation = OperationEvent.StationStand.setJumpStop.select.operation;
-            } else { // 取消跳停选择
-                operate.operation = OperationEvent.StationStand.cancelJumpStop.select.operation;
-            }
-            this.handleBreak(operate);
-        },
-        chooseEffective(effective) {
-            const operate = {
-                operation: '',
-                val: effective
-            };
-            if (this.radio2 == '1') { // 设置停站时间
-                operate.operation = OperationEvent.StationStand.setStopTime.choose2.operation;
-            } else { // 设置站间运行等级
-                operate.operation = OperationEvent.StationStand.setRunLevel.choose2.operation;
-            }
-            this.handleBreak(operate);
-        },
-        chooseStopTime(upDown) {
-            const operate = {
-                operation: '',
-                val: this.radio
-            };
-            if (this.radio2 == '1') { // 设置停站时间
-                operate.operation = OperationEvent.StationStand.setStopTime.choose1.operation;
-            } else { // 设置站间运行等级
-                operate.operation = OperationEvent.StationStand.setRunLevel.choose1.operation;
-            }
-            if (this.radio === '01') {
-                this.disabledTime = true;
-                this.trainRunlevel = 2;
-                this.effective = false;
-            } else {
-                this.disabledTime = false;
-                this.effective = true;
-            }
-            this.handleBreak(operate);
-        },
-        trainNoSelectLevel(upDown) {
-            const operate = {
-                operation: OperationEvent.StationStand.setRunLevel.chooseTrain.operation,
-                val: `${upDown}`,
-                param: {
-                    standRunLevel: `${upDown}`
-                }
-            };
-            this.handleBreak(operate);
-        },
-        handleTrainStopTime() {
-            const operate = {
-                operation: OperationEvent.StationStand.setStopTime.input.operation,
-                val: `${this.trainStopTime}`
-            };
-            this.handleBreak(operate);
-        },
-        handleBreak(operate) { // 断点记录
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                valid && this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-            });
-        },
-        commit() {
-            if (this.operation == OperationEvent.StationStand.setDetainTrain.menu.operation) {
-                this.setDetainTrain(); /** 设置扣车*/
-            } else if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation || this.operation == OperationEvent.StationStand.cancelDetainTrainAll.menu.operation) {
-                this.cancelDetainTrain(); /** 取消扣车*/
-            } else if (this.operation == OperationEvent.StationStand.setJumpStop.menu.operation) {
-                this.setJumpStop(); /** 设置跳停*/
-            } else if (this.operation == OperationEvent.StationStand.cancelJumpStop.menu.operation) {
-                this.cancelJumpStop(); /** 取消跳停*/
-            } else if (this.operation == OperationEvent.StationStand.setStopTime.menu.operation) {
-                this.setStopTime(); /** 设置停站时间*/
-            } else if (this.operation == OperationEvent.StationStand.setRunLevel.menu.operation) {
-                this.setRunLevel(); /** 设置站间运行等级*/
-            }
-        },
-        // 设置扣车
-        setDetainTrain() {
-            this.sendCommand(menuOperate.StationStand.setDetainTrain);
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            if (this.operation == OperationEvent.StationStand.cancelDetainTrain.menu.operation) {
-                this.sendCommand(menuOperate.StationStand.cancelDetainTrain);
-            } else {
-                this.sendCommand(menuOperate.StationStand.cancelDetainTrainAll);
-            }
-        },
-        // 设置跳停
-        setJumpStop() {
-            this.sendCommand(menuOperate.StationStand.setJumpStop, {trainGroupNumber:this.tripNumber});
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            this.sendCommand(menuOperate.StationStand.cancelJumpStop, {trainGroupNumber:this.tripNumber});
-        },
-        // 设置停站时间
-        setStopTime() {
-            this.sendCommand(menuOperate.StationStand.setStopTime, {parkingTime: this.radio == '01' ? -1 : this.trainStopTime, parkingAlwaysValid: this.effective});
-        },
-        // 设置运行速度
-        setRunLevel() {
-            this.sendCommand(menuOperate.StationStand.setRunLevel, {runLevelTime:this.radio === '02' ? this.trainRunlevel : 2, runLevelTimeForever: this.effective});
-        },
-        sendCommand(operate, param) {
-            this.loading = true;
-            commitOperate(operate, param, 2).then(({valid})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch((error) => {
-                this.loading = false;
-                this.doClose();
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-            this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .stand-detain-train .context {
-        height: 80px !important;
-    }
-	/deep/ {
-		.el-input--mini .el-input__icon{
-			line-height: 100%;
-		}
-	}
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/standDetail.vue b/src/jmapNew/theme/datie_02/menus/dialog/standDetail.vue
deleted file mode 100644
index efe048e52..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/standDetail.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-detail"
-    :title="title"
-    :visible.sync="show"
-    width="380px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row class="header">
-      <el-col :span="10">
-        <span>车站</span>
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <span>站台</span>
-      </el-col>
-    </el-row>
-    <el-row class="header">
-      <el-col :span="10">
-        <el-input v-model="stationName" size="small" disabled />
-      </el-col>
-      <el-col :span="10" :offset="2">
-        <el-input v-model="standName" style="padding: 0 3px;" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row class="content">
-      <el-col :span="6">
-        <span>停站时间</span>
-      </el-col>
-      <el-col :span="18">
-        <el-input v-model="modelData.stopTime" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row class="content">
-      <el-col :span="6">
-        <span>运行等级</span>
-      </el-col>
-      <el-col :span="18">
-        <el-input v-model="modelData.runLevel" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row class="content">
-      <el-col :span="6">
-        <span>扣车</span>
-      </el-col>
-      <el-col :span="18">
-        <el-input v-model="modelData.detainCar" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row class="content">
-      <el-col :span="6">
-        <span>跳停</span>
-      </el-col>
-      <el-col :span="18">
-        <el-input v-model="modelData.jumpStop" size="small" disabled />
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="18">
-        <span style="opacity: 0;">1</span>
-      </el-col>
-      <el-col :span="4">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">退出</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-// import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import CancelMouseState from '@/mixin/CancelMouseState';
-
-export default {
-    name: 'StandDetail',
-    components: {
-        NoticeInfo
-    },
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            tempData: [],
-            stationName: '',
-            standName: '',
-            runLevelList: [
-                '自动',
-                '低速',
-                '常速',
-                '高速'
-            ],
-            modelData: {
-                stopTime: '自动',
-                runLevel: '自动',
-                detainCar: '无扣车',
-                jumpStop: '无跳停'
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'mapConfig',
-            'stationList'
-        ]),
-        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 '站台信息';
-        }
-    },
-    methods: {
-        loadInitData(selected, opts) {
-            this.tempData = [];
-
-            // const stationList = this.stationList.slice();
-            // const index = this.stationList.findIndex(n => n.code == selected.stationCode);
-            // let stationStand, station;
-            // if (selected.direction == '01') { // 下行
-            //     // 下行时，此站不是最后一站
-            //     if (index != 0) {
-            //         stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index - 1].code);
-            //         station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
-            //     }
-            // } else {
-            //     // 上行时，此站不是最后一站
-            //     if (index != this.stationList.length - 1) {
-            //         stationStand = this.$store.getters['map/getDeviceByCode'](this.stationList[index + 1].code);
-            //         station = this.$store.getters['map/getDeviceByCode'](stationStand.stationCode);
-            //     }
-            // }
-            this.modelData = {
-                stopTime: selected.parkingTime < 0 ? '自动' : `${selected.parkingTime} 秒`,
-                runLevel: this.runLevelList[selected.runLevelTime],
-                detainCar: selected.stationHoldTrain || selected.centerHoldTrain ? '已设置' : '无扣车',
-                jumpStop: selected.allSkip || selected.assignSkip ? '已设置' : '无跳停'
-            };
-        },
-        doShow(operate, selected, opts) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.standName = '';
-                this.stationName = '';
-                if (selected && selected._type.toUpperCase() === 'StationStand'.toUpperCase()) {
-                    if (this.mapConfig.upRight) {
-                        this.standName = selected.right ? '上行' : '下行';
-                    } else if (!this.mapConfig.upRight) {
-                        this.standName = selected.right ? '下行' : '上行';
-                    }
-                    const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode);
-                    if (station) {
-                        this.stationName = station.name;
-                    }
-                }
-                this.loadInitData(selected, opts);
-            }
-            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 = {
-                operation: OperationEvent.Command.close.confirm.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 = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style>
-    .content {
-        margin-top: 20px;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainControl.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainControl.vue
deleted file mode 100644
index 738d9509e..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainControl.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm train-control"
-    :title="title"
-    :visible.sync="show"
-    width="480px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="el-dialog-div">
-      <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item prop="stationName">
-              <span slot="label">车站</span>
-              <el-input v-model="addModel.stationName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item v-if="operation != '70c'" prop="sectionCode">
-              <span slot="label">轨道</span>
-              <el-input v-model="addModel.sectionCode" />
-            </el-form-item>
-            <el-form-item v-else prop="trainWindowCode">
-              <span slot="label">车次窗</span>
-              <el-input v-model="addModel.trainWindowCode" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="车组号:" prop="groupNumber">
-              <el-select v-model="addModel.groupNumber" filterable>
-                <el-option
-                  v-for="train in trainList"
-                  :key="train.groupNumber"
-                  :label="train.groupNumber"
-                  :value="train.groupNumber"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item v-if="operation == '708'" prop="serviceNumber">
-              <span slot="label">服务号</span>
-              <el-input v-model="addModel.serviceNumber" />
-            </el-form-item>
-            <el-form-item v-else-if="operation == '70c'" prop="targetCode">
-              <span slot="label">目的地</span>
-              <el-input v-model="addModel.targetCode" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item v-if="operation == '708'" prop="trainCode">
-              <span slot="label">序列号</span>
-              <el-input v-model="addModel.trainCode" />
-            </el-form-item>
-            <el-form-item v-else-if="operation == '70c'" prop="serviceNumber">
-              <span slot="label">服务号</span>
-              <el-input v-model="addModel.serviceNumber" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col>
-            <el-form-item v-if="operation == '70c'" prop="trainType">
-              <span slot="label">运行模式</span>
-              <br>
-              <el-radio-group v-model="addModel.runningMode" style="margin-left: 15px;">
-                <el-radio :label="'01'">普通</el-radio>
-                <el-radio :label="'02'">专列</el-radio>
-                <el-radio :label="'03'">不停站直达</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <confirm-train ref="confirmTrain" />
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CancelMouseState from '@/mixin/CancelMouseState';
-import ConfirmTrain from './childDialog/confirmTrain';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'TrainControl',
-    components: {
-        ConfirmTrain,
-        NoticeInfo
-    },
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainList: [],
-            selected: null,
-            addModel: {
-                stationName: '',
-                sectionCode: '',
-                trainWindowCode: '',
-                groupNumber: '',
-                serviceNumber: '',
-                targetCode: '',
-                trainCode: '',
-                runningMode: ''
-            },
-
-            rules: {
-                stationName: [
-                    { required: true, message: '请输入车站', trigger: 'blur'}
-                ],
-                sectionCode: [
-                    { required: true, message: '请输入轨道', trigger: 'blur'}
-                ],
-                trainWindowCode: [
-                    { required: true, message: '请输入车次窗', trigger: 'blur'}
-                ],
-                groupNumber: [
-                    { required: true, message: '请选择车组号', trigger: 'change' }
-                ],
-                serviceNumber: [
-                    { required: true, message: '请输入服务号', trigger: 'blur'}
-                ],
-                targetCode: [
-                    { required: true, message: '请输入目的地号', trigger: 'blur'}
-                ],
-                trainCode: [
-                    { required: true, message: '请输入序列号', trigger: 'blur'}
-                ],
-                runningMode: [
-                    { required: true, message: '请选择运行模式', trigger: 'blur'}
-                ]
-            },
-            operation: null,
-
-            dialogShow: false,
-            loading: false,
-            direction: 0
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            if (this.dialogShow) {
-                if (this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
-                    /* 设目的地*/
-                    return OperationEvent.Train.destinationTrainId.menu.domId;
-                } else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation) {
-                    /* 设计划车*/
-                    return OperationEvent.Train.setPlanTrainId.menu.domId;
-                } else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation) {
-                    /* 设人工车*/
-                    return OperationEvent.Train.artificialTrainId.menu.domId;
-                }
-                return '';
-            }
-            return '';
-        },
-        title() {
-            if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
-                return '设目的地车';
-            } else if ( this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
-                return '设计划车';
-            } else if ( this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
-                return '设人工车';
-            }
-            return '';
-
-        }
-    },
-    methods: {
-        loadInitData(map) {
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.operation = operate.operation;
-            }
-            this.addModel = {
-                tripNumber: '',
-                groupNumber: '',
-                trainType: '01',
-                serviceNumber: '',
-                targetCode: ''
-            };
-            /** 加载列车数据*/
-            this.loadInitData(this.map);
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            this.mouseCancelState(this.selected);
-        },
-        commit() {
-            if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation ) {
-                this.destinationTrainId();
-            } else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
-                this.setPlanTrainId();
-            } else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
-                this.artificialTrainId();
-            }
-        },
-        // 设目的地车
-        destinationTrainId() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-
-                        operation: OperationEvent.Train.destinationTrainId.menu.operation,
-                        message: [`设目的地车：成功`],
-                        val: ''
-                    };
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        this.$refs.noticeInfo.doShow();
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 设计划车
-        setPlanTrainId() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-
-                        operation: OperationEvent.Train.setPlanTrainId.menu.operation,
-                        message: [`设计划车：成功`],
-                        val: ''
-                    };
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        this.$refs.noticeInfo.doShow();
-                    });
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 设人工车
-        artificialTrainId() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-
-                        operation: OperationEvent.Train.artificialTrainId.menu.operation,
-                        message: [`设人工车：成功`],
-                        val: ''
-                    };
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.doClose();
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }).catch(() => {
-                        this.loading = false;
-                        this.doClose();
-                        this.$refs.noticeInfo.doShow();
-                    });
-                } 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(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
-<style scoped>
-  .el-dialog-div {
-    height: 400px;
-    overflow: auto;
-  }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainCreate.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainCreate.vue
deleted file mode 100644
index 59f7935b6..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainCreate.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="chengdou-03__systerm route-create" :title="title" :visible.sync="show" width="380px" label-position="top" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <div style="padding: 10px 20px; border: 1px solid lightgray;">
-      <el-form size="small" label-width="100px">
-        <el-form-item label="列车:" prop="trainCode">
-          <el-select v-model="trainCode" filterable placeholder="列车">
-            <el-option
-              v-for="item in trainList"
-              :key="item.code"
-              :label="item.groupNumber"
-              :value="item.code"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="列车方向:" prop="direction">
-          <el-select v-model="direction" filterable placeholder="列车方向">
-            <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value" />
-          </el-select>
-          <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
-        </el-form-item>
-      </el-form>
-      <el-row>
-        <el-col style="text-align: right;">
-          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-        </el-col>
-      </el-row>
-    </div>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-
-export default {
-    name: 'RouteCreate',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            trainList: [],
-            trainNoList: [],
-            directionList: [
-                {
-                    value: '2',
-                    label: '上行'
-                },
-                {
-                    value: '1',
-                    label: '下行'
-                }
-            ],
-            trainCode: '',
-            tripNumber: '',
-            direction: '',
-            selected: null
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return OperationEvent.Section.newtrain.menu.domId;
-        },
-        title() {
-            return '设置列车';
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.dialogShow = true;
-            this.selected = selected;
-
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.trainCode = '';
-            this.direction = '';
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                operation: OperationEvent.Section.newtrain.menu.operation,
-                cmdType: CMD.Section.CMD_NEW_TRAIN,
-                val: '' + this.direction + '::' + this.trainCode
-            };
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainCreateNumber.vue
deleted file mode 100644
index e56f2f80d..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainCreateNumber.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="480px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="el-dialog-div">
-      <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item prop="stationName">
-              <span slot="label">车站</span>
-              <el-input v-model="addModel.stationName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item prop="trainWindowCode">
-              <span slot="label">车次窗</span>
-              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-              <el-select v-model="addModel.groupNumber" filterable>
-                <el-option
-                  v-for="train in trainList"
-                  :key="train.groupNumber"
-                  :label="train.groupNumber"
-                  :value="train.groupNumber"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CancelMouseState from '@/mixin/CancelMouseState';
-
-export default {
-    name: 'TrainCreateNumber',
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            trainList: [],
-            selected: null,
-            addModel: {
-                stationName:'',
-                trainWindowCode: '',
-                groupNumber:''
-            },
-
-            rules: {
-                groupNumber: [
-                    { required: true, message: '请输入车组号', trigger: 'blur'}
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-        },
-        title() {
-            return '新建车组号';
-        }
-    },
-    methods: {
-        loadInitData(map) {
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.addModel = {
-                    stationName:'',
-                    trainWindowCode: '',
-                    groupNumber:''
-                };
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$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.createTrainNo.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();
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-    .el-dialog-div {
-      height: 400px;
-      overflow: auto;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainDelete.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainDelete.vue
deleted file mode 100644
index 895d6024c..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainDelete.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="90px" :model="addModel" :rules="rules">
-      <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>
-    <confirm-control ref="confirmControl" />
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import { getPublishMapTrainNos } from '@/api/runplan';
-import CancelMouseState from '@/mixin/CancelMouseState';
-import ConfirmControl from './childDialog/confirmControl';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'TrainDelete',
-    components: {
-        ConfirmControl,
-        NoticeInfo
-    },
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            addModel: {
-                groupNumber: ''
-            },
-
-            rules: {
-                groupNumber: [
-                    { required: true, message: '请输入车组号', trigger: 'blur' }
-                ]
-            },
-            operation: null,
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.delTrainId.menu.domId : '';
-        },
-        title() {
-            return '删除列车识别号';
-        }
-    },
-    methods: {
-        loadInitData(map) {
-            if (map) {
-                // getPublishMapTrainNos(map.skinCode).then(response => {
-                // 	this.trainNoList = response.data;
-                // }).catch(() => {
-                // 	this.$messageBox(`获取列车车组号失败`);
-                // });
-            }
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                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');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-
-                        operation: OperationEvent.Train.delTrainId.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();
-                        this.$refs.noticeInfo.doShow();
-                    });
-                } 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(() => { this.doClose(); });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainDeleteNumber.vue
deleted file mode 100644
index 210e2dc87..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainDeleteNumber.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="480px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="el-dialog-div">
-      <el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item prop="stationName">
-              <span slot="label">车站</span>
-              <el-input v-model="addModel.stationName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item prop="trainWindowCode">
-              <span slot="label">车次窗</span>
-              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-              <el-select v-model="addModel.groupNumber" filterable disabled>
-                <el-option
-                  v-for="train in trainList"
-                  :key="train.groupNumber"
-                  :label="train.groupNumber"
-                  :value="train.groupNumber"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CancelMouseState from '@/mixin/CancelMouseState';
-
-export default {
-    name: 'TrainDeleteNumber',
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            trainList: [],
-            selected: null,
-            addModel: {
-                stationName:'',
-                trainWindowCode: '',
-                groupNumber:''
-            },
-
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-        },
-        title() {
-            return '删除车组号';
-        }
-    },
-    methods: {
-        loadInitData(map) {
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.addModel = {
-                    stationName:'',
-                    trainWindowCode: '',
-                    groupNumber:''
-                };
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$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.deleteTrainNo.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();
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-    .el-dialog-div {
-      height: 400px;
-      overflow: auto;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainDetailInfo.vue
deleted file mode 100644
index 907727139..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainDetailInfo.vue
+++ /dev/null
@@ -1,378 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="480px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="el-dialog-div">
-      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-        <el-tab-pane :id="domIdBasicInfo" label="基本信息" name="first">
-          <el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="groupNumber">
-                  <span slot="label">车组号</span>
-                  <el-input v-model="addModel.groupNumber" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="type">
-                  <span slot="label">服务类型</span>
-                  <el-input v-model="addModel.type" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="serviceNumber">
-                  <span slot="label">服务号</span>
-                  <el-input v-model="addModel.serviceNumber" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="trainCode">
-                  <span slot="label">序列号</span>
-                  <el-input v-model="addModel.trainCode" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="driverCode">
-                  <span slot="label">司机号</span>
-                  <el-input v-model="addModel.driverCode" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="targetCode">
-                  <span slot="label">目的地号</span>
-                  <el-input v-model="addModel.targetCode" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="stationName">
-                  <span slot="label">车站</span>
-                  <el-input v-model="addModel.stationName" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="sectionCode">
-                  <span slot="label">轨道</span>
-                  <el-input v-model="addModel.sectionCode" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="nextStation">
-                  <span slot="label">下一站</span>
-                  <el-input v-model="addModel.nextStation" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="targetName">
-                  <span slot="label">目的地</span>
-                  <el-input v-model="addModel.targetName" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="trackingMode">
-                  <span slot="label">跟踪模式</span>
-                  <el-input v-model="addModel.trackingMode" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="runStatus">
-                  <span slot="label">运行状态</span>
-                  <el-input v-model="addModel.runStatus" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="departureTime">
-                  <span slot="label">出发时刻</span>
-                  <el-input v-model="addModel.departureTime" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="arrivedTime">
-                  <span slot="label">到达时刻</span>
-                  <el-input v-model="addModel.arrivedTime" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="planDeviation">
-                  <span slot="label">计划偏离</span>
-                  <el-input v-model="addModel.planDeviation" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :id="domIdMarshalInfo" label="编组信息" name="second">
-          <el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="marshallingNo">
-                  <span slot="label">编组号</span>
-                  <el-input v-model="addModel.marshallingNo" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="carNo1">
-                  <span slot="label">车头号1</span>
-                  <el-input v-model="addModel.carNo1" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="carNo2">
-                  <span slot="label">车头号2</span>
-                  <el-input v-model="addModel.carNo2" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-          <el-table :data="tableData" style="width: 100%" height="250">
-            <el-table-column prop="carriage" label="车厢" width="80" />
-            <el-table-column prop="carriageNumber" label="车厢号" width="80" />
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane :id="domIdAtpInfo" label="ATP信息" name="third">
-          <el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="trainId">
-                  <span slot="label">车载ID</span>
-                  <el-input v-model="addModel.trainId" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="directionType">
-                  <span slot="label">运行方向</span>
-                  <el-input v-model="addModel.directionType" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="drivingMode">
-                  <span slot="label">驾驶模式</span>
-                  <el-input v-model="addModel.drivingMode" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="speed">
-                  <span slot="label">速度</span>
-                  <el-input v-model="addModel.speed" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="stopQuasiState">
-                  <span slot="label">停准状态</span>
-                  <el-input v-model="addModel.stopQuasiState" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="doorStatus">
-                  <span slot="label">车门状态</span>
-                  <el-input v-model="addModel.doorStatus" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="runLevel">
-                  <span slot="label">运行等级</span>
-                  <el-input v-model="addModel.runLevel" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="stopState">
-                  <span slot="label">停跳状态</span>
-                  <el-input v-model="addModel.stopState" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="position">
-                  <span slot="label">车头位置</span>
-                  <el-input v-model="addModel.position" :disabled="true" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="loadingRate">
-                  <span slot="label">载重率</span>
-                  <el-input v-model="addModel.loadingRate" :disabled="true" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane :id="domIdCarAlarm" label="车辆报警" name="fourth" />
-      </el-tabs>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="4" :offset="19">
-        <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';
-
-export default {
-    name: 'TrainDetailInfo',
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            trainList: [],
-            selected: null,
-            addModel: {
-                stationName:'',
-                groupNumber:'',
-                type:'',
-                serviceNumber:'',
-                trainCode:'',
-                driverCode:'',
-                targetCode:'',
-                sectionCode:'',
-                nextStation:'',
-                targetName:'',
-                trackingMode:'',
-                runStatus:'',
-                departureTime:'',
-                arrivedTime:'',
-                planDeviation:'',
-                marshallingNo:'',
-                carNo1:'',
-                carNo2:'',
-                trainId:'',
-                directionType:'',
-                drivingMode:'',
-                speed:'',
-                stopQuasiState:'',
-                doorStatus:'',
-                runLevel:'',
-                stopState:'',
-                position:'',
-                loadingRate:''
-            },
-            activeName:'first',
-            dialogShow: false,
-            loading: false,
-            tableData:[
-                {carriage:'1', carriageNumber:'101'},
-                {carriage:'2', carriageNumber:'102'},
-                {carriage:'3', carriageNumber:'103'},
-                {carriage:'4', carriageNumber:'104'},
-                {carriage:'5', carriageNumber:'105'},
-                {carriage:'6', carriageNumber:'106'}
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdCarAlarm() {
-            return this.dialogShow ? OperationEvent.Train.detailTrainInfo.carAlarm.domId : '';
-        },
-        domIdBasicInfo() {
-            return this.dialogShow ? OperationEvent.Train.detailTrainInfo.basicInfo.domId : '';
-        },
-        domIdMarshalInfo() {
-            return this.dialogShow ? OperationEvent.Train.detailTrainInfo.marshalInfo.domId : '';
-        },
-        domIdAtpInfo() {
-            return this.dialogShow ? OperationEvent.Train.detailTrainInfo.atpInfo.domId : '';
-        },
-        title() {
-            return '列车信息显示';
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.addModel = {
-                    stationName:'',
-                    tripNumber: '',
-                    groupNumber:''
-                };
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            this.mouseCancelState(this.selected);
-        },
-        handleClick() {
-
-        },
-        cancel() {
-            const operate = {
-
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-    .el-dialog-div {
-      height: 400px;
-      overflow: auto;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainEditNumber.vue
deleted file mode 100644
index 570e22144..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainEditNumber.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
-    <div class="el-dialog-div">
-      <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
-        <el-form-item>
-          <el-col :span="11">
-            <el-form-item prop="stationName">
-              <span slot="label">车站</span>
-              <el-input v-model="addModel.stationName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item prop="trainWindowCode">
-              <span slot="label">车次窗</span>
-              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-form-item>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="旧车组号" prop="oldGroupNumber">
-              <el-select v-model="addModel.oldGroupNumber" filterable disabled>
-                <el-option v-for="train in trainList" :key="train.oldGroupNumber" :label="train.oldGroupNumber" :value="train.oldGroupNumber" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item label="新车组号" prop="newGroupNumber">
-              <el-select v-model="addModel.newGroupNumber">
-                <el-option v-for="train in trainList" :key="train.newGroupNumber" :label="train.newGroupNumber" :value="train.newGroupNumber" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group-train">
-      <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';
-
-export default {
-    name: 'TrainEditNumber',
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            trainList: [],
-            selected: null,
-            addModel: {
-                stationName: '',
-                trainWindowCode: '',
-                oldGroupNumber: '',
-                newGroupNumber: ''
-            },
-
-            rules: {
-                newGroupNumber: [
-                    { required: true, message: '请输入新车组号', trigger: 'blur'}
-                ]
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-        },
-        title() {
-            return '修改车组号';
-        }
-    },
-    methods: {
-        loadInitData(map) {
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.addModel = {
-                    stationName: '',
-                    trainWindowCode: '',
-                    oldGroupNumber: '',
-                    newGroupNumber: ''
-                };
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            this.mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-
-                        operation: OperationEvent.Train.editTrainNo.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();
-                    });
-                } 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(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-    .el-dialog-div {
-      height: 400px;
-      overflow: auto;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainMove.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainMove.vue
deleted file mode 100644
index 82c84dc13..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainMove.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <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="width: 46%;">
-        <el-form-item label="车 组 号:" label-width="95px" prop="tripNumber">
-          <el-input v-model="addModel.tripNumber" disabled />
-        </el-form-item>
-      </div>
-      <div style="overflow: hidden;">
-        <div
-          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px; margin-right: 4%;"
-        >
-          <span class="base-label">源车次窗</span>
-          <div style="position: relative; top:-10px;">
-            <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: 120px;"
-        >
-          <span class="base-label">目的车次窗</span>
-          <div style="position: relative; top:-10px;">
-            <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';
-
-export default {
-    name: 'TrainMove',
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            addModel: {
-                tripNumber: '',
-                trainSource: '',
-                stationStandSource: '',
-                trainGoal: '',
-                stationStandGoal: ''
-            },
-
-            rules: {
-                tripNumber: [
-                    { required: true, message: '请输入车组号', trigger: 'blur' }
-                ],
-                trainSource: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
-                ],
-                stationStandSource: [
-                    { required: true, message: '请选择车站', trigger: 'change' }
-                ],
-                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 '移动列车识别号';
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            this.mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-
-                        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(() => {
-                        this.loading = false;
-                        this.doClose();
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainMoveNumber.vue
deleted file mode 100644
index 7e7635d23..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainMoveNumber.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="480px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="el-dialog-div">
-      <el-form ref="form" size="small" label-width="90px" :model="addModel" label-position="left">
-        <el-row>
-          <el-col :span="11">
-            <el-form-item prop="stationName">
-              <span slot="label">车站</span>
-              <el-input v-model="addModel.stationName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item prop="trainWindowCode">
-              <span slot="label">车次窗</span>
-              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="车 组 号:" prop="groupNumber">
-              <el-select v-model="addModel.groupNumber" filterable disabled>
-                <el-option
-                  v-for="train in trainList"
-                  :key="train.groupNumber"
-                  :label="train.groupNumber"
-                  :value="train.groupNumber"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item prop="purposeStationName">
-              <span slot="label">车站</span>
-              <el-input v-model="addModel.purposeStationName" :disabled="true" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="11" :offset="1">
-            <el-form-item prop="purposeTrainWindowCode">
-              <span slot="label">目的车次窗</span>
-              <el-input v-model="addModel.purposeTrainWindowCode" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import CancelMouseState from '@/mixin/CancelMouseState';
-
-export default {
-    name: 'TrainMoveNumber',
-    mixins: [
-        CancelMouseState
-    ],
-    data() {
-        return {
-            trainNoList: [],
-            trainList: [],
-            selected: null,
-            addModel: {
-                stationName: '',
-                trainWindowCode: '',
-                groupNumber: '',
-                purposeStationName: '',
-                purposeTrainWindowCode: ''
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-        },
-        title() {
-            return '移动车组号';
-        }
-    },
-    methods: {
-        loadInitData(map) {
-        },
-        doShow(operate, selected) {
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            if (!this.dialogShow) {
-                this.addModel = {
-                    stationName: '',
-                    trainWindowCode: '',
-                    groupNumber: '',
-                    purposeStationName: '',
-                    purposeTrainWindowCode: ''
-                };
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            this.mouseCancelState(this.selected);
-        },
-        commit() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    const operate = {
-                        send: true,
-
-                        operation: OperationEvent.Train.moveTrainNo.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();
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-    .el-dialog-div {
-      height: 400px;
-      overflow: auto;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainRunplan.vue
index 011c1c209..80feabc6e 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainRunplan.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/trainRunplan.vue
@@ -156,9 +156,10 @@
 </template>
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { mapGetters } from 'vuex';
 import { transfiniteList, trainTypeList } from '@/scripts/ConstDic';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'TrainRunplan',
     data() {
@@ -347,12 +348,20 @@ export default {
                     this.loading = true;
                     if (!this.model.runPlanCode) { delete this.model.runPlanCode; }
                     const stationCode = this.$store.state.training.roleDeviceCode;
-                    commitOperate(menuOperate.CTC.logSaveRunplan, {stationCode:stationCode, runPlanParam:this.model, force:1}, 3).then(({valid, response})=>{
-                        if (valid) {
-                            // this.$emit('addDisLoger', response.data);
-                            this.$emit('clearRpRow');
-                            this.doClose();
+                    const operate = {
+                        over: true,
+                        userOperationType: UserOperationType.LEFTCLICK,
+                        operation: menuOperate.CTC.logSaveRunplan.operation,
+                        cmdType: menuOperate.CTC.logSaveRunplan.cmdType,
+                        param: {
+                            stationCode: stationCode,
+                            runPlanParam: this.model,
+                            force: 1
                         }
+                    };
+                    this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                        this.$emit('clearRpRow');
+                        this.doClose();
                     }).catch(() => {
                         this.$emit('clearRpRow');
                         this.doClose();
@@ -363,10 +372,11 @@ export default {
         },
         cancel() {
             const operate = {
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainSetPlan.vue
deleted file mode 100644
index 17421e391..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainSetPlan.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="ningbo-01__systerm train-set-plan"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row>
-      <el-col :span="11">车组号</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="11">
-        <el-input v-model="addModel.groupNumber" size="mini" :disabled="true" />
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="11">服务号</el-col>
-      <el-col :span="11" :offset="2">序列号</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="11">
-        <el-input :id="domIdServerNoChange" v-model="addModel.serviceNumber" size="mini" />
-        <div style="color:red;font-size:13px;margin-top:5px;">{{ messageTip1 }}</div>
-      </el-col>
-      <el-col :span="11" :offset="2">
-        <el-input :id="domIdTrainNoChange" v-model="addModel.tripNumber" size="mini" />
-        <div style="color:red;font-size:13px;margin-top:5px;">{{ messageTip2 }}</div>
-      </el-col>
-    </el-row>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="5">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
-
-export default {
-    name: 'TrainSetPlan',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            trainNoList: [],
-            selected: null,
-            messageTip1:'',
-            messageTip2:'',
-            addModel: {
-                groupNumber: '',
-                tripNumber: '',
-                serviceNumber: ''
-            },
-            dialogShow: false,
-            loading: false
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationStandList'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdServerNoChange() {
-            return this.dialogShow ? OperationEvent.Train.setPlanTrainId.serverNoChange.domId : '';
-        },
-        domIdTrainNoChange() {
-            return this.dialogShow ? OperationEvent.Train.setPlanTrainId.trainNoChange.domId : '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Train.editTrainId.menu.domId : '';
-        },
-        title() {
-            return '设置计划车';
-        }
-    },
-    watch:{
-        '$store.state.map.keyboardEnterCount': function (val) {
-            if (this.dialogShow) {
-                this.commit();
-            }
-        }
-    },
-    methods: {
-        doShow(operate, selected) {
-			this.$root.$emit('dialogOpen', selected);
-            this.selected = selected;
-            // 如果不是断点激活，则需要对初始值进行初始化
-            // if (!this.dialogShow) {
-            // }
-            this.addModel.groupNumber = selected.groupNumber;
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-			this.$root.$emit('dialogClose', this.selected);
-            this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            mouseCancelState(this.selected);
-        },
-        commit() {
-            if (!this.addModel.serviceNumber) {
-                this.messageTip1 = '请输入服务号';
-                return;
-            }
-            if (!this.addModel.tripNumber) {
-                this.messageTip1 = '';
-                this.messageTip2 = '请输入序列号';
-                return;
-            }
-            const params = {
-                groupNumber: this.addModel.groupNumber,
-                tripNumber: this.addModel.tripNumber,
-                serviceNumber: this.addModel.serviceNumber
-            };
-            this.messageTip1 = '';
-            this.messageTip2 = '';
-            this.loading = true;
-            commitOperate(menuOperate.TrainWindow.setPlanTrainId, params, 2).then(({valid})=>{
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => { this.doClose(); });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    /deep/ .el-row {
-        margin: 10px
-    }
-
-    .ningbo-01__systerm .el-dialog .base-label {
-        // background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/datie_02/menus/dialog/trainSwitch.vue
deleted file mode 100644
index 583e53d8e..000000000
--- a/src/jmapNew/theme/datie_02/menus/dialog/trainSwitch.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-<template>
-  <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';
-
-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 '移动列车识别号';
-        }
-    },
-    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.$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
-                    };
-
-                    this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                        this.doClose();
-                        console.error(error);
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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 {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
index 49a60e088..6efc7cd46 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
@@ -31,7 +31,8 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'UpdateTrip',
     components: {
@@ -97,14 +98,20 @@ export default {
         commit() {
             const result = this.judgeTripNumber();
             if (this.tripNumber && result) {
-                const params = {
-                    tripNumber: this.tripNumber
+                const operate = {
+                    over: true,
+                    operation: menuOperate.Train.updateTripCommit.operation,
+                    userOperationType: UserOperationType.LEFTCLICK,
+                    cmdType: menuOperate.Train.updateTripCommit.cmdType,
+                    param: {
+                        tripNumber: this.tripNumber
+                    }
                 };
-                this.messageTip1 = '';
                 this.loading = true;
-                commitOperate(menuOperate.Train.updateTripCommit, params, 2).then(({valid})=>{
-                    this.loading = false;
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
+                        this.loading = false;
+                        this.messageTip1 = '';
                         this.doClose();
                     }
                 }).catch(() => {
@@ -116,13 +123,15 @@ export default {
         },
         cancel() {
             const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         },
         doClose() {
             this.loading = false;
@@ -130,7 +139,6 @@ export default {
             this.tripNumber = '';
             this.$store.dispatch('training/emitTipFresh');
         }
-
     }
 };
 </script>
diff --git a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..0c66c6945
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenu.vue
@@ -0,0 +1,829 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :date-strin="dateString1" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'dispatchWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'dispatchWork'" />
+    <passive-contorl ref="passiveControl" pop-class="chengdou-03__systerm" />
+    <bottom-table ref="bottomTable" />
+    <div id="playBtn" />
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapState } from 'vuex';
+import { btts } from '@/utils/baidu_tts_cors';
+import { getBaiduToken } from '@/api/voice';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './dispatchWorkMenuBar';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import { timestampFormat } from '@/utils/date';
+import BottomTable from './bottomTable';
+import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveContorl,
+        BottomTable
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            showCentralizedStationCode: '',
+            tipContentList:[],
+            time: '00:00:00',
+            dateString: '',
+            dateString1: '',
+            audio: null,
+            voiceBroadcastToken: ''
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        ...mapState('socket', [
+            'dispatchCommandMsg'
+        ]),
+        hasCommandMsg() {
+            let status = false;
+            if (this.dispatchCommandMsg) {
+                status = true;
+            }
+            return status;
+        },
+        isCtc() {
+            return this.$route.query.ctc;
+        },
+        isDispStation() {
+            return this.$route.query.dispatcherStation;
+        }
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        },
+        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
+        },
+        '$store.state.socket.voiceBroadcastChange': function() {
+            this.$store.state.socket.voiceBroadcastMsgs.forEach(msgCode => {
+                const msg = this.$store.state.socket.railCtcRunplanInitMsg[msgCode];
+                const station = this.$store.getters['map/getDeviceByCode'](msg.arriveRunPlan.stationCode);
+                const text = station.name + msg.arriveRunPlan.tripNumber + '次发车预告';
+                this.speechSynthesis(text);
+            });
+        },
+        '$store.state.socket.simulationAlarmInfo': function(val) {
+            (val || []).forEach(item => {
+                if (!item.confirmed) {
+                    const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
+                    let fault = '';
+                    deviceFaultType[device._type].forEach(deviceFault=>{
+                        if (deviceFault.value == item.description) {
+                            fault = deviceFault.label;
+                        }
+                    });
+                    if ( item.description == 'FAULT_LOCK' ) { fault = '故障锁闭'; }
+                    this.tipContentList.push({time:item.time, message:deviceType[device._type] + (device.name || device.groupNumber) + fault});
+                    if (this.tipContentList.length > 15) {
+                        this.tipContentList.shift();
+                    }
+                }
+            });
+        },
+        '$store.state.socket.simulationReset':function(val) {
+            this.tipContentList = [];
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
+        this.$store.dispatch('map/setPictureDeviceMap', {});
+    },
+    methods: {
+        async speechSynthesis(text) {
+            if (!this.voiceBroadcastToken) {
+                const resp = await getBaiduToken();
+                this.voiceBroadcastToken = resp.data;
+            }
+            const that = this;
+            // 调用语音合成接口
+            // 参数含义请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
+            this.audio = btts({
+                tex: text,
+                tok: that.voiceBroadcastToken,
+                spd: 5,
+                pit: 5,
+                vol: 15,
+                per: 4
+            }, {
+                volume: 0.3,
+                autoDestory: true,
+                timeout: 10000,
+                hidden: false,
+                onInit: function (htmlAudioElement) {},
+                onSuccess: function(htmlAudioElement) {
+                    this.audio = htmlAudioElement;
+                    this.audio.play();
+                    // playBtn.innerText = '播放';
+                },
+                onError: function(text) { that.$message.error(text); that.voiceBroadcastToken = ''; },
+                onTimeout: function () { that.$message.error('合成语音超时！'); }
+            });
+        },
+        initDate(date) {
+            this.time = timestampFormat('HH:mm:ss', date);
+            this.dateString = timestampFormat('YYYYMMDD', date);
+            this.dateString1 = timestampFormat('YYYY年MM月DD日', date);
+        },
+
+        noticeInfo() {
+            this.$refs.noticeInfo.doShow();
+        },
+        closeStageFlash() {
+            const sendRunplan = document.getElementById('stageRunplanOut').className;
+            document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', '');
+            const stationCode = this.$store.state.training.roleDeviceCode;
+            this.$store.dispatch('socket/deleteRailwaySimulationRunplan', stationCode);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.redFlick {
+	background: red;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.2;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+.flicker {
+	animation: fade 600ms infinite;
+}
+</style>
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.chengdou-03__systerm {
+	overflow: hidden !important;
+}
+
+.chengdou-03__systerm .el-dialog {
+	background: #0055E8;
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	border: 1px solid rgb(69, 134, 247);
+	border-radius: 6px;
+	font-size: 13px !important;
+	color: #000;
+}
+
+.chengdou-03__systerm .el-dialog span {
+	font-size: 13px !important;
+	line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog span .el-icon-arrow-up{
+	line-height: 18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__footer {
+	background: #ECE9D8;
+	opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__body {
+	padding: 20px;
+	margin: 0px 3px 3px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #ECE9D8;
+	opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__title {
+	font-size: 16px;
+	color: #fff;
+	position: absolute;
+	top: 4px;
+	left: 7px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 6px;
+	right: 3px;
+	line-height: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.chengdou-03__systerm .el-dialog .el-button {
+	height: 24px;
+	line-height: 22px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 4px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.chengdou-03__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .cell {
+	height: 22px;
+	line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.chengdou-03__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+.fuzhou-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.fuzhou-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .base-label {
+	background: rgb(240 240 240);
+	position: relative;
+}
+
+.fuzhou-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.fuzhou-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.fuzhou-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.fuzhou-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+.img-box{
+	width: 28px;
+	height: 28px;
+	border: 2px #ccc outset;
+	margin-top: 0;
+	background: #fff;
+	cursor: pointer;
+}
+.img-box:active{
+	border: 2px #ccc inset;
+}
+.img-box:hover{
+	border: 2px #ccc inset;
+}
+#stageRunplanOut{
+	width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 100px;
+}
+#stageRunplanOut.active{
+	animation:changeColor 1s infinite;
+	-moz-animation:changeColor 1s infinite; /* Firefox */
+	-webkit-animation:changeColor 1s infinite; /* Safari and Chrome */
+}
+@keyframes changeColor
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+@-moz-keyframes changeColor /* Firefox */
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+@-webkit-keyframes changeColor /* Safari and Chrome */
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+.simulationAlarmInfo{
+	position: absolute;
+	width: 320px;
+	background: #cb204d;
+	height: 100px;
+	z-index: 2;
+	top: 0px;
+	left: 0px;
+	padding: 5px;
+	overflow:auto;
+}
+.eachTipContent{margin-top:5px;font-size:14px;}
+
+.simulationAlarmInfo::-webkit-scrollbar {
+	width: 5px;
+}
+.simulationAlarmInfo::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	background: #c3c3c3;
+}
+
+.simulationAlarmInfo::-webkit-scrollbar-track {
+	border-radius: 0;
+	background: #cb204d;
+}
+.simulationTellInfo{
+	position: absolute;
+	width: 328px;
+	top: 0px;
+	right: 0px;
+	padding: 0px 0px 0px 0px;
+	overflow: auto;
+	background: #c3c3c3;
+	z-index: 2;
+	display: inline-block;
+	font-size: 0;
+}
+.simulationDeviceInfo{
+	position: absolute;
+	width: 328px;
+	height: 100px;
+	top: 33px;
+	right:0px;
+	padding: 5px;
+	overflow:auto;
+	background: #c3c3c3;
+	z-index: 2;
+}
+.simulationTellInfoTop{
+	display: inline-block;
+	font-size: 0;
+}
+.simulationTellInfoTopEach{
+	padding: 6px 11px;
+	display: inline-block;
+	background: #dedede;
+	font-size: 15px;
+	border-top:2px #9c868b solid;
+	border-left:2px #9c868b solid;
+	border-right:2px #ecfbe2 solid ;
+	border-bottom:2px #ecfbe2 solid;
+
+}
+.backRed{background: #ff0000;}
+.backYellow{background: #ffff00;}
+.backGreen{background: #00ff00;}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..fefa7b4f5
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,50 @@
+<template>
+  <div id="menuBarDatie">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%;" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+
+export default {
+    name: 'DispatchWorkMenuBar',
+    components: {
+        MenuBar
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: '登录(L)',
+                    operate: '',
+                    children: []
+                },
+                {
+                    title: '应用程序(T)',
+                    operate: '',
+                    children: []
+                }
+            ]
+        };
+    },
+    created() {},
+    methods: {
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+#menuBarDatie{
+	line-height:30px;
+}
+#menuBarDatie #menuBar .menu-li-block .label{
+	padding: 0px 30px 0px 5px !important;
+}
+.img-box{
+	width: 20px;
+	height: 20px;
+	margin-top: 30px;
+}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
deleted file mode 100644
index 83a38b40f..000000000
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ /dev/null
@@ -1,1091 +0,0 @@
-<template>
-  <div class="menus" :style="{width: width + 'px'}">
-    <div v-if="isCtc" style="font-size: 14px;padding: 0 10px;background: #DEE3F3;line-height: 30px;position: absolute;width: 100%;z-index: 9;">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${this.dateString}第一班 18:00 管理员代--` }}</div>
-    <menu-bar v-if="isShowBar" ref="menuBar" :date-strin="dateString1" :selected="selected" />
-    <div v-if="isCtc" style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">
-      <div style="display: flex;">
-        <img :src="ctcBarIcon1" class="img-box" @click="zhanjiantouming">
-        <img :src="ctcBarIcon2" class="img-box" @click="danzhanxianshi">
-        <img :src="ctcBarIcon3" class="img-box">
-        <img :src="ctcBarIcon4" class="img-box">
-        <img :src="ctcBarIcon5" class="img-box">
-        <img :src="ctcBarIcon6" class="img-box">
-        <img :src="ctcBarIcon7" class="img-box">
-        <img :src="ctcBarIcon8" class="img-box">
-        <img :src="ctcBarIcon9" class="img-box">
-        <img :src="ctcBarIcon10" class="img-box">
-        <img :src="ctcBarIcon11" class="img-box">
-        <img :src="ctcBarIcon12" class="img-box">
-        <img :src="ctcBarIcon13" class="img-box">
-        <img :src="ctcBarIcon14" class="img-box">
-        <img :src="ctcBarIcon15" class="img-box">
-        <img :src="ctcBarIcon16" class="img-box">
-        <img :src="ctcBarIcon17" class="img-box">
-        <img :src="ctcBarIcon18" class="img-box" @click="handleRunplan">
-      </div>
-      <div style="display: flex;padding: 2px;border-top: 2px solid #D1D1D1;margin-top: 3px">
-        <div class="img-box" :class="{flicker: hasCommandMsg, redFlick: hasCommandMsg}" style="width: 100px;height: 25px;line-height: 21px;text-align: center;" @click="showCmdManage">调度命令</div>
-        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;" />
-        <div id="stageRunplanOut" class="img-box" @click="stageRunplan">阶段计划</div>
-        <div class="img-box" style="width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 5px;">阶段记事</div>
-        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">{{ dateString1 + '  ' + time }}</div>
-        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">同步站机通信中断</div>
-        <div style="width: 200px;height: 25px;border: 2px #D1D1D1 inset;line-height: 21px;text-align: center;margin-left: 5px;">与中心通信正常</div>
-      </div>
-    </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" id="tipInfoBox" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
-      <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
-      <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
-    </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" class="simulationAlarmInfo">
-      <div v-for="(tipContent,index) in tipContentList" :key="index" class="eachTipContent">{{ tipContent.time+": "+tipContent.message }}</div>
-    </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" class="simulationTellInfo">
-      <div class="simulationTellInfoTop">
-        <div class="simulationTellInfoTopEach backGreen">联锁I</div>
-        <div class="simulationTellInfoTopEach backRed">联锁II</div>
-        <div class="simulationTellInfoTopEach backGreen">操作A</div>
-        <div class="simulationTellInfoTopEach backYellow">操作B</div>
-        <div class="simulationTellInfoTopEach backGreen">维修机</div>
-      </div>
-    </div>
-    <div v-if="$store.state.training.prdType == '01'&& !isCtc" class="simulationDeviceInfo" />
-    <!-- <div v-if="!isCtc && isDispStation" class="goDispatcherLoger">
-      <el-button size="small" @click="goDispatcherLoger">行车日志</el-button>
-    </div> -->
-    <menu-button v-if="!isCtc" ref="menuButton" :selected="selected" />
-    <menu-button-ctc v-if="isCtc" ref="menuButtonCtc" :selected="selected" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
-    <passive-alarm ref="passiveAlarm" />
-    <passive-contorl ref="passiveControl" pop-class="chengdou-03__systerm" />
-    <passive-Timeout ref="passiveTimeout" />
-    <runplan-pane v-if="isCtc" ref="runplanPane" />
-    <!-- <dispatcher-loger v-if="isDispStation" ref="dispatcherLoger" /> -->
-    <bottom-table ref="bottomTable" />
-    <menu-panel v-if="isCtc" ref="menuPanel" />
-    <stage-runplan v-if="isCtc" ref="stageRunplan" @closeFlash="closeStageFlash" @noticeInfo="noticeInfo" />
-    <notice-info v-if="isCtc" ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    <cmdManage v-if="isCtc" ref="cmdManage" />
-    <signedCmd v-if="isCtc" ref="signedCmd" @signedCmdClose="signedCmdClose" @changeSignedStatus="changeSignedStatus" />
-    <div id="playBtn" />
-  </div>
-</template>
-
-<script>
-import { mapGetters, mapState } from 'vuex';
-import { btts } from '@/utils/baidu_tts_cors';
-import { getBaiduToken } from '@/api/voice';
-import MenuSignal from './menuSignal';
-import MenuButton from './menuButton';
-import MenuStationStand from './menuStationStand';
-import MenuSwitch from './menuSwitch';
-import MenuSection from './menuSection';
-import MenuTrain from './menuTrain';
-import MenuStation from './menuStation';
-import MenuBar from './menuBar';
-import MenuButtonCtc from './menuButtonCtc';
-import RunplanPane from './runplanPane';
-import StageRunplan from './dialog/stageRunplan';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-// import DispatcherLoger from './dispatcherLoger';
-import PassiveAlarm from './passiveDialog/alarm';
-import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
-import PassiveTimeout from './passiveDialog/timeout';
-import { timestampFormat } from '@/utils/date';
-import BottomTable from './bottomTable';
-import MenuPanel from './menuPanel';
-import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png';
-import CtcBarIcon2 from '@/assets/ctc_icon/pic2.png';
-import CtcBarIcon3 from '@/assets/ctc_icon/pic3.png';
-import CtcBarIcon4 from '@/assets/ctc_icon/pic4.png';
-import CtcBarIcon5 from '@/assets/ctc_icon/pic5.png';
-import CtcBarIcon6 from '@/assets/ctc_icon/pic6.png';
-import CtcBarIcon7 from '@/assets/ctc_icon/pic7.png';
-import CtcBarIcon8 from '@/assets/ctc_icon/pic8.png';
-import CtcBarIcon9 from '@/assets/ctc_icon/pic9.png';
-import CtcBarIcon10 from '@/assets/ctc_icon/pic10.png';
-import CtcBarIcon11 from '@/assets/ctc_icon/pic11.png';
-import CtcBarIcon12 from '@/assets/ctc_icon/pic12.png';
-import CtcBarIcon13 from '@/assets/ctc_icon/pic13.png';
-import CtcBarIcon14 from '@/assets/ctc_icon/pic14.png';
-import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
-import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
-import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
-import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
-import cmdManage from '@/jmapNew/theme/components/menus/dialog/cmdManage.vue';
-import signedCmd from '@/jmapNew/theme/components/menus/dialog/signedCmd.vue';
-import {getRunplanInStation} from '@/api/runplan';
-import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
-
-export default {
-    name: 'Menus',
-    components: {
-        MenuBar,
-        MenuButton,
-        MenuSignal,
-        MenuSwitch,
-        MenuSection,
-        MenuStationStand,
-        MenuStation,
-        MenuTrain,
-        PassiveAlarm,
-        PassiveContorl,
-        PassiveTimeout,
-        MenuButtonCtc,
-        RunplanPane,
-        StageRunplan,
-        NoticeInfo,
-        // DispatcherLoger,
-        BottomTable,
-        MenuPanel,
-        cmdManage,
-        signedCmd
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            currentRailwaySimulationRunplan:{},
-            showCentralizedStationCode: '',
-            alarmMessages: [
-                { id: 1, message: '这是告警信息一' },
-                { id: 2, message: '这是告警信息二' },
-                { id: 3, message: '这是告警信息三' },
-                { id: 4, message: '这是告警信息四' },
-                { id: 5, message: '这是告警信息五' },
-                { id: 6, message: '这是告警信息六' },
-                { id: 7, message: '这是告警信息七' }
-            ],
-            warningMessages: [
-                { id: 1, message: '这是预警信息一' },
-                { id: 2, message: '这是预警信息二' },
-                { id: 3, message: '这是预警信息三' },
-                { id: 4, message: '这是预警信息四' },
-                { id: 5, message: '这是预警信息五' },
-                { id: 6, message: '这是预警信息六' },
-                { id: 7, message: '这是预警信息七' }
-            ],
-            tipContentList:[],
-            time: '00:00:00',
-            dateString: '',
-            dateString1: '',
-            ctcBarIcon1: CtcBarIcon1,
-            ctcBarIcon2: CtcBarIcon2,
-            ctcBarIcon3: CtcBarIcon3,
-            ctcBarIcon4: CtcBarIcon4,
-            ctcBarIcon5: CtcBarIcon5,
-            ctcBarIcon6: CtcBarIcon6,
-            ctcBarIcon7: CtcBarIcon7,
-            ctcBarIcon8: CtcBarIcon8,
-            ctcBarIcon9: CtcBarIcon9,
-            ctcBarIcon10: CtcBarIcon10,
-            ctcBarIcon11: CtcBarIcon11,
-            ctcBarIcon12: CtcBarIcon12,
-            ctcBarIcon13: CtcBarIcon13,
-            ctcBarIcon14: CtcBarIcon14,
-            ctcBarIcon15: CtcBarIcon15,
-            ctcBarIcon16: CtcBarIcon16,
-            ctcBarIcon17: CtcBarIcon17,
-            ctcBarIcon18: CtcBarIcon18,
-            audio: null,
-            voiceBroadcastToken: ''
-        };
-    },
-    computed: {
-        ...mapGetters('config', [
-            'width'
-        ]),
-        ...mapState('socket', [
-            'dispatchCommandMsg'
-        ]),
-        hasCommandMsg() {
-            let status = false;
-            if (this.dispatchCommandMsg) {
-                status = true;
-            }
-            return status;
-        },
-        isShowBar() {
-            return this.$store.state.training.prdType === '02' || this.$route.query.ctc;
-        },
-        isCtc() {
-            return this.$route.query.ctc;
-        },
-        isDispStation() {
-            return this.$route.query.dispatcherStation;
-        }
-    },
-    watch: { // tipContentList
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        },
-        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', time);
-            this.initDate(time);
-        },
-        '$store.state.socket.railwaySimulationRunplanSendChange': function (val) {
-            if (this.isCtc) {
-                this.getRailwaySimulationRunplanSend();
-            }
-        },
-        '$store.state.training.roleDeviceCode': function (val) {
-            if (this.isCtc) {
-                this.getRailwaySimulationRunplanSend();
-            }
-        },
-        '$store.state.socket.voiceBroadcastChange': function() {
-            this.$store.state.socket.voiceBroadcastMsgs.forEach(msgCode => {
-                const msg = this.$store.state.socket.railCtcRunplanInitMsg[msgCode];
-                const station = this.$store.getters['map/getDeviceByCode'](msg.arriveRunPlan.stationCode);
-                const text = station.name + msg.arriveRunPlan.tripNumber + '次发车预告';
-                this.speechSynthesis(text);
-            });
-        },
-        '$store.state.socket.simulationAlarmInfo': function(val) {
-            (val || []).forEach(item => {
-                if (!item.confirmed) {
-                    const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
-                    let fault = '';
-                    deviceFaultType[device._type].forEach(deviceFault=>{
-                        if (deviceFault.value == item.description) {
-                            fault = deviceFault.label;
-                        }
-                    });
-                    if ( item.description == 'FAULT_LOCK' ) { fault = '故障锁闭'; }
-                    this.tipContentList.push({time:item.time, message:deviceType[device._type] + (device.name || device.groupNumber) + fault});
-                    if (this.tipContentList.length > 15) {
-                        this.tipContentList.shift();
-                    }
-                }
-            });
-        },
-        '$store.state.socket.simulationReset':function(val) {
-            this.tipContentList = [];
-        }
-        // // 地图加载完成
-        // '$store.state.map.mapViewLoadedCount': function (val) { // 地图数据加载完成
-        //     debugger;
-        //     this.getRunplanInStationData();
-        // }
-    },
-    mounted() {
-        this.group = this.$route.query.group;
-        // debugger;
-        this.$nextTick(() => {
-            this.$store.dispatch('config/updateMenuBar');
-            if (this.isCtc) {
-                this.getRunplanInStationData();
-            }
-            const _that = this;
-            window.onclick = function (e) {
-                if (!_that.$store.state.training.trainingStart) {
-                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
-                }
-                _that.$refs.menuStationStand.doClose();
-                _that.$refs.menuSwitch.doClose();
-                _that.$refs.menuSignal.doClose();
-                _that.$refs.menuSection.doClose();
-                _that.$refs.menuTrain.doClose();
-                _that.$refs.menuStation.doClose();
-            };
-        });
-    },
-    beforeDestroy() {
-        window.onclick = function (e) {};
-        this.$store.dispatch('map/setPictureDeviceMap', {});
-    },
-    methods: {
-        // changeSignedStatus(info) {
-        //     this.$refs.cmdManage.changeSignedStatus(info);
-        // },
-        // signedCmdClose() {
-        //     this.$refs.cmdManage.doShow();
-        // },
-        getRunplanInStationData() {
-            getRunplanInStation(this.group).then(response => {
-                // debugger;
-                this.$store.dispatch('socket/initRailCtcRunplanInitMsg', response.data || []);
-            }).catch(()=>{
-            });
-        },
-        async speechSynthesis(text) {
-            if (!this.voiceBroadcastToken) {
-                const resp = await getBaiduToken();
-                this.voiceBroadcastToken = resp.data;
-            }
-            const that = this;
-            // 调用语音合成接口
-            // 参数含义请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
-            this.audio = btts({
-                tex: text,
-                tok: that.voiceBroadcastToken,
-                spd: 5,
-                pit: 5,
-                vol: 15,
-                per: 4
-            }, {
-                volume: 0.3,
-                autoDestory: true,
-                timeout: 10000,
-                hidden: false,
-                onInit: function (htmlAudioElement) {},
-                onSuccess: function(htmlAudioElement) {
-                    this.audio = htmlAudioElement;
-                    this.audio.play();
-                    // playBtn.innerText = '播放';
-                },
-                onError: function(text) { that.$message.error(text); that.voiceBroadcastToken = ''; },
-                onTimeout: function () { that.$message.error('合成语音超时！'); }
-            });
-        },
-        changeSignedStatus(info) {
-            this.isCtc && this.$refs.cmdManage.changeSignedStatus(info);
-        },
-        signedCmdClose() {
-            this.isCtc && this.$refs.cmdManage.doShow();
-        },
-        showCmdManage() {
-            if (!this.isCtc) { return; }
-            if (this.hasCommandMsg) {
-                this.$refs.signedCmd.doShow();
-            } else {
-                this.$refs.cmdManage.doShow();
-            }
-        },
-        zhanjiantouming() {
-            this.$store.dispatch('map/setPictureDeviceMap', {});
-            this.showCentralizedStationCode = this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode;
-            const mapDevice = this.$store.state.map.mapDevice;
-            const list = [];
-            for (const key in mapDevice) {
-                list.push(mapDevice[key]);
-            }
-            if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === this.showCentralizedStationCode && picture.type === 'lucency');
-                if (picture) {
-                    this.$jlmap.updateShowStation(list, '');
-                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
-                    const deviceList = [];
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    for (const deviceCode in mapDevice) {
-                        deviceList.push(deviceCode);
-                    }
-                    this.$jlmap.updatePicture(deviceList);
-                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
-                }
-            }
-        },
-        danzhanxianshi() {
-            this.$store.dispatch('map/setPictureDeviceMap', {});
-            const mapDevice = this.$store.state.map.mapDevice;
-            const map = this.$store.state.map.map;
-            const list = [];
-            for (const key in mapDevice) {
-                list.push(mapDevice[key]);
-            }
-            if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === this.showCentralizedStationCode && picture.type === 'chainStation');
-                if (picture) {
-                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
-                    const deviceList = [];
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    for (const deviceCode in mapDevice) {
-                        deviceList.push(deviceCode);
-                    }
-                    this.$jlmap.updatePicture(deviceList);
-                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
-                }
-            } else {
-                this.$jlmap.updateShowStation(list, this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode);
-                this.$jlmap.setCenter(this.$store.state.map.showCentralizedStationCode || this.showCentralizedStationCode);
-                this.$jlmap.updateTransform(map.scaling, map.origin);
-            }
-        },
-        getRailwaySimulationRunplanSend() {
-            const stationCode = this.$store.state.training.roleDeviceCode;
-            const railwaySimulationRunplanSendMap = this.$store.state.socket.railwaySimulationRunplanSendMap;
-            if (railwaySimulationRunplanSendMap[stationCode] && railwaySimulationRunplanSendMap[stationCode].dataList.length > 0) {
-                // 阶段计划
-                document.getElementById('stageRunplanOut').classList.add('active');
-                this.currentRailwaySimulationRunplan = railwaySimulationRunplanSendMap;
-            } else {
-                const sendRunplan = document.getElementById('stageRunplanOut').className;
-                document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', '');
-            }
-        },
-        initDate(date) {
-            this.time = timestampFormat('HH:mm:ss', date);
-            this.dateString = timestampFormat('YYYYMMDD', date);
-            this.dateString1 = timestampFormat('YYYY年MM月DD日', date);
-        },
-        handleRunplan() {
-            this.$refs.runplanPane.doShow();
-        },
-        stageRunplan() {
-            if (document.getElementById('stageRunplanOut').className.includes('active')) {
-                const stationCode = this.$store.state.training.roleDeviceCode;
-                this.$refs.stageRunplan.doShow(this.currentRailwaySimulationRunplan[stationCode]);
-            }
-        },
-        noticeInfo() {
-            this.$refs.noticeInfo.doShow();
-        },
-        closeStageFlash() {
-            const sendRunplan = document.getElementById('stageRunplanOut').className;
-            document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', '');
-            const stationCode = this.$store.state.training.roleDeviceCode;
-            this.$store.dispatch('socket/deleteRailwaySimulationRunplan', stationCode);
-        }
-        // goDispatcherLoger() {
-        //     this.$refs.dispatcherLoger.doShow();
-        // }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.redFlick {
-	background: red;
-}
-@keyframes fade {
-	from {
-		opacity: 1.0;
-	}
-	50% {
-		opacity: 0.2;
-	}
-	to {
-		opacity: 1.0;
-	}
-}
-.flicker {
-	animation: fade 600ms infinite;
-}
-</style>
-<style>
-    .menus .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .menus .pop-menu span {
-        color: #000;
-    }
-
-    .menus .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .chengdou-03__systerm {
-        overflow: hidden !important;
-    }
-
-    .chengdou-03__systerm .el-dialog {
-        background: #0055E8;
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        border: 1px solid rgb(69, 134, 247);
-        border-radius: 6px;
-        font-size: 13px !important;
-        color: #000;
-    }
-
-    .chengdou-03__systerm .el-dialog span {
-        font-size: 13px !important;
-        line-height: 22px;
-    }
-
-    .chengdou-03__systerm .el-dialog span .el-icon-arrow-up{
-        line-height: 18px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-dialog__footer {
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-dialog__body {
-        padding: 20px;
-        margin: 0px 3px 3px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        background: #ECE9D8;
-        opacity: 1;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-dialog__title {
-        font-size: 16px;
-        color: #fff;
-        position: absolute;
-        top: 4px;
-        left: 7px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-dialog__headerbtn {
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid #fff;
-        border-radius: 4px;
-        top: 6px;
-        right: 3px;
-        line-height: 16px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-button {
-        height: 24px;
-        line-height: 22px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 4px !important;
-        color: #000;
-        background: #F0F0F0;
-    }
-
-    .chengdou-03__systerm .el-dialog .expand {
-        width: 120px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-        height: 22px !important;
-        line-height: 22px !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-        height: 22px !important;
-        line-height: 22px !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-table--border th.gutter {
-        background: #EBEADB !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-table .cell {
-        height: 22px;
-        line-height: 22px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-table th.is-leaf {
-        background: #F0F0F0 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .current-row>td {
-        background: #3399FF !important;
-        color: #fff !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .chengdou-03__systerm .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-	.fuzhou-01__systerm .el-dialog {
-		background: rgba(100, 100, 100, 0.3);
-		border: 2px solid rgb(144, 144, 144, 0.8);
-		border-radius: 6px;
-		color: #000;
-		font-size: 14px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__header {
-		padding: 5px;
-		height: 26px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__footer {
-		background: #F0F0F0;
-		opacity: 1;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__body {
-		padding-top: 10px;
-		padding-bottom: 10px;
-		padding-left: 5px;
-		padding-right: 5px;
-		margin: 0px 5px 5px;
-		border: 2px solid rgba(120, 121, 123, 0.5);
-		box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-		background: #F0F0F0;
-		opacity: 1;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__title {
-		position: absolute;
-		top: 4px;
-		color: #000;
-		border-radius: 4px;
-		padding: 0px 2px;
-		height: 20px;
-		line-height: 20px
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__title::before {
-		content: '';
-		position: absolute;
-		top: 0;
-		left: 0;
-		-webkit-filter: blur(10px);
-		filter: blur(10px);
-		height: 20px;
-		width: -webkit-fill-available;
-		background: rgba(128, 128, 128, 0.8);
-		z-index: -1;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
-		background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-		border: 1px solid #fff;
-		border-radius: 4px;
-		top: 4px;
-		right: 5px;
-		line-height: 16px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-		font-size: 16px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
-		color: #fff;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-button {
-		height: 32px;
-		line-height: 32px;
-		padding: 0px;
-		width: 80px;
-		border: 2px outset #E2E2E2;
-		border-radius: 0px !important;
-		color: #000;
-		background: #F0F0F0;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-button:focus span {
-		border: 1px dashed gray;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-button:active {
-		border: 2px inset #E2E2E2;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-button:disabled {
-		border: 2px inset #E2E2E2;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-button:disabled span {
-		border: 0px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-input {
-		border: 2px inset #E9E9E9;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
-		color: #000;
-		background: #fff !important;
-		border: 0px;
-		border-radius: 0px !important;
-		box-sizing: border-box;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
-		background: #F0F0F0 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-textarea {
-		border: 2px inset #E9E9E9;
-		border-radius: 0px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
-		color: #000;
-		background: #fff !important;
-		border: 0px;
-		border-radius: 0px !important;
-		box-sizing: border-box;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-		background: #F0F0F0 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-table {
-		border: 2px inset #E9E9E9;
-		color: #000 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-table .cell {
-		line-height: unset !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
-		background: #F0F0F0 !important;
-		border-right: 1px solid #BDBDBD !important;
-		border-bottom: 1px solid #BDBDBD !important;
-		color: #000 !important;
-		height: 20px !important;
-		padding: 0px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-table tr td {
-		height: 20px !important;
-		padding: 0px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
-		top: 15px !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .current-row>td {
-		background: #3399FF !important;
-		color: #fff !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-checkbox__inner {
-		border: 1px inset #dcdfe6 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-checkbox__label {
-		color: #000 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-		background: #E6E6E6 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-		color: #C5C9CC !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-		background: #fff !important;
-		border: 1px inset #dcdfe6 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-		position: absolute;
-		-webkit-box-sizing: content-box;
-		box-sizing: content-box;
-		content: "";
-		border: 1px solid #000;
-		border-left: 0;
-		border-top: 0;
-		height: 7px;
-		left: 4px;
-		top: 1px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-radio__inner {
-		border: 1px inset #dcdfe6 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-radio__label {
-		color: #000 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
-		background: #fff !important;
-		border: 1px inset #dcdfe6 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-		width: 4px;
-		height: 4px;
-		border-radius: 100%;
-		background-color: #000 !important;
-		position: absolute;
-		left: 50%;
-		top: 50%;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
-		background: #E6E6E6 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
-		color: #C5C9CC !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .base-label {
-		background: rgb(240 240 240);
-		position: relative;
-	}
-
-	.fuzhou-01__systerm .el-dialog .el-form-item label {
-		font-weight: normal !important;
-		color: #000 !important;
-	}
-
-	.fuzhou-01__systerm .el-dialog .context {
-		height: 100px;
-		border: 2px inset #E2E2E2;
-		overflow-y: scroll;
-	}
-
-	.fuzhou-01__systerm .el-dialog .table {
-		margin-top: 10px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .notice {
-		margin-left: 62px;
-		line-height: 30px;
-	}
-
-	.fuzhou-01__systerm .el-dialog .button-group {
-		margin-top: 10px;
-	}
-	.img-box{
-		width: 28px;
-		height: 28px;
-		border: 2px #ccc outset;
-		margin-top: 0;
-		background: #fff;
-		cursor: pointer;
-	}
-	.img-box:active{
-		border: 2px #ccc inset;
-	}
-	.img-box:hover{
-		border: 2px #ccc inset;
-	}
-    #stageRunplanOut{
-        width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 100px;
-    }
-    #stageRunplanOut.active{
-        animation:changeColor 1s infinite;
-        -moz-animation:changeColor 1s infinite; /* Firefox */
-        -webkit-animation:changeColor 1s infinite; /* Safari and Chrome */
-    }
-    @keyframes changeColor
-    {
-        0% {background:#f0f0f0;}
-        50% {background:#ff1900;}
-        100% {background:#f0f0f0;}
-    }
-    @-moz-keyframes changeColor /* Firefox */
-    {
-        0% {background:#f0f0f0;}
-        50% {background:#ff1900;}
-        100% {background:#f0f0f0;}
-    }
-    @-webkit-keyframes changeColor /* Safari and Chrome */
-    {
-        0% {background:#f0f0f0;}
-        50% {background:#ff1900;}
-        100% {background:#f0f0f0;}
-    }
-    .simulationAlarmInfo{
-        position: absolute;
-        width: 320px;
-        background: #cb204d;
-        height: 100px;
-        z-index: 2;
-        top: 50px;
-        left: 10px;
-        padding: 5px;
-        overflow:auto;
-    }
-    .eachTipContent{margin-top:5px;font-size:14px;}
-
-    .simulationAlarmInfo::-webkit-scrollbar {
-        width: 5px;
-    }
-    .simulationAlarmInfo::-webkit-scrollbar-thumb {
-        border-radius: 10px;
-        background: #c3c3c3;
-    }
-
-    .simulationAlarmInfo::-webkit-scrollbar-track {
-        border-radius: 0;
-        background: #cb204d;
-    }
-    .simulationTellInfo{
-        position: absolute;
-        width: 328px;
-        top: 50px;
-        right: 10px;
-        padding: 0px 0px 0px 0px;
-        overflow: auto;
-        background: #c3c3c3;
-        z-index: 2;
-        display: inline-block;
-        font-size: 0;
-    }
-    .simulationDeviceInfo{
-        position: absolute;
-        width: 328px;
-        height: 100px;
-        top: 83px;
-        right:10px;
-        padding: 5px;
-        overflow:auto;
-        background: #c3c3c3;
-        z-index: 2;
-    }
-    .simulationTellInfoTop{
-        display: inline-block;
-        font-size: 0;
-    }
-    .simulationTellInfoTopEach{
-        padding: 6px 11px;
-        display: inline-block;
-        background: #dedede;
-        font-size: 15px;
-        border-top:2px #9c868b solid;
-        border-left:2px #9c868b solid;
-        border-right:2px #ecfbe2 solid ;
-        border-bottom:2px #ecfbe2 solid;
-
-    }
-    .backRed{background: #ff0000;}
-    .backYellow{background: #ffff00;}
-    .backGreen{background: #00ff00;}
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue
new file mode 100644
index 000000000..533047c69
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/localWorkMenu.vue
@@ -0,0 +1,813 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <div id="tipInfoBox" style="width: 1560px;position: fixed;height: 30px;background: #808080;z-index: 9;bottom: 0;left: 0;display: flex;">
+      <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
+      <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
+    </div>
+    <div class="simulationAlarmInfo">
+      <div v-for="(tipContent,index) in tipContentList" :key="index" class="eachTipContent">{{ tipContent.time+": "+tipContent.message }}</div>
+    </div>
+    <div class="simulationTellInfo">
+      <div class="simulationTellInfoTop">
+        <div class="simulationTellInfoTopEach backGreen">联锁I</div>
+        <div class="simulationTellInfoTopEach backRed">联锁II</div>
+        <div class="simulationTellInfoTopEach backGreen">操作A</div>
+        <div class="simulationTellInfoTopEach backYellow">操作B</div>
+        <div class="simulationTellInfoTopEach backGreen">维修机</div>
+      </div>
+    </div>
+    <div class="simulationDeviceInfo" />
+    <menu-button ref="menuButton" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
+    <passive-contorl ref="passiveControl" pop-class="chengdou-03__systerm" />
+    <bottom-table ref="bottomTable" />
+    <div id="playBtn" />
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapState } from 'vuex';
+import { btts } from '@/utils/baidu_tts_cors';
+import { getBaiduToken } from '@/api/voice';
+import MenuSignal from './menuSignal';
+import MenuButton from './menuButton';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import { timestampFormat } from '@/utils/date';
+import BottomTable from './bottomTable';
+import { deviceFaultType, deviceType} from '@/scripts/cmdPlugin/Config';
+
+export default {
+    name: 'LocalWorkMenu',
+    components: {
+        MenuButton,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveContorl,
+        BottomTable
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            showCentralizedStationCode: '',
+            tipContentList:[],
+            time: '00:00:00',
+            dateString: '',
+            audio: null,
+            voiceBroadcastToken: ''
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        ...mapState('socket', [
+            'dispatchCommandMsg'
+        ]),
+        hasCommandMsg() {
+            let status = false;
+            if (this.dispatchCommandMsg) {
+                status = true;
+            }
+            return status;
+        }
+    },
+    watch: {
+        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
+            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
+        },
+        '$store.state.socket.voiceBroadcastChange': function() {
+            this.$store.state.socket.voiceBroadcastMsgs.forEach(msgCode => {
+                const msg = this.$store.state.socket.railCtcRunplanInitMsg[msgCode];
+                const station = this.$store.getters['map/getDeviceByCode'](msg.arriveRunPlan.stationCode);
+                const text = station.name + msg.arriveRunPlan.tripNumber + '次发车预告';
+                this.speechSynthesis(text);
+            });
+        },
+        '$store.state.socket.simulationAlarmInfo': function(val) {
+            (val || []).forEach(item => {
+                if (!item.confirmed) {
+                    const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
+                    let fault = '';
+                    deviceFaultType[device._type].forEach(deviceFault=>{
+                        if (deviceFault.value == item.description) {
+                            fault = deviceFault.label;
+                        }
+                    });
+                    if ( item.description == 'FAULT_LOCK' ) { fault = '故障锁闭'; }
+                    this.tipContentList.push({time:item.time, message:deviceType[device._type] + (device.name || device.groupNumber) + fault});
+                    if (this.tipContentList.length > 15) {
+                        this.tipContentList.shift();
+                    }
+                }
+            });
+        },
+        '$store.state.socket.simulationReset':function(val) {
+            this.tipContentList = [];
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        this.$nextTick(() => {
+            // this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
+        this.$store.dispatch('map/setPictureDeviceMap', {});
+    },
+    methods: {
+        async speechSynthesis(text) {
+            if (!this.voiceBroadcastToken) {
+                const resp = await getBaiduToken();
+                this.voiceBroadcastToken = resp.data;
+            }
+            const that = this;
+            // 调用语音合成接口
+            // 参数含义请参考 https://ai.baidu.com/docs#/TTS-API/41ac79a6
+            this.audio = btts({
+                tex: text,
+                tok: that.voiceBroadcastToken,
+                spd: 5,
+                pit: 5,
+                vol: 15,
+                per: 4
+            }, {
+                volume: 0.3,
+                autoDestory: true,
+                timeout: 10000,
+                hidden: false,
+                onInit: function (htmlAudioElement) {},
+                onSuccess: function(htmlAudioElement) {
+                    this.audio = htmlAudioElement;
+                    this.audio.play();
+                    // playBtn.innerText = '播放';
+                },
+                onError: function(text) { that.$message.error(text); that.voiceBroadcastToken = ''; },
+                onTimeout: function () { that.$message.error('合成语音超时！'); }
+            });
+        },
+        showCmdManage() {
+            if (this.hasCommandMsg) {
+                this.$refs.signedCmd.doShow();
+            } else {
+                this.$refs.cmdManage.doShow();
+            }
+        },
+        initDate(date) {
+            this.time = timestampFormat('HH:mm:ss', date);
+            this.dateString = timestampFormat('YYYYMMDD', date);
+        },
+        handleRunplan() {
+            this.$refs.runplanPane.doShow();
+        },
+        noticeInfo() {
+            this.$refs.noticeInfo.doShow();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.redFlick {
+	background: red;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.2;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+.flicker {
+	animation: fade 600ms infinite;
+}
+</style>
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.chengdou-03__systerm {
+	overflow: hidden !important;
+}
+
+.chengdou-03__systerm .el-dialog {
+	background: #0055E8;
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	border: 1px solid rgb(69, 134, 247);
+	border-radius: 6px;
+	font-size: 13px !important;
+	color: #000;
+}
+
+.chengdou-03__systerm .el-dialog span {
+	font-size: 13px !important;
+	line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog span .el-icon-arrow-up{
+	line-height: 18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__footer {
+	background: #ECE9D8;
+	opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__body {
+	padding: 20px;
+	margin: 0px 3px 3px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #ECE9D8;
+	opacity: 1;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__title {
+	font-size: 16px;
+	color: #fff;
+	position: absolute;
+	top: 4px;
+	left: 7px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 6px;
+	right: 3px;
+	line-height: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.chengdou-03__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.chengdou-03__systerm .el-dialog .el-button {
+	height: 24px;
+	line-height: 22px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 4px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.chengdou-03__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.chengdou-03__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.chengdou-03__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .cell {
+	height: 22px;
+	line-height: 22px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.chengdou-03__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.chengdou-03__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.chengdou-03__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.chengdou-03__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.chengdou-03__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+.fuzhou-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.fuzhou-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .base-label {
+	background: rgb(240 240 240);
+	position: relative;
+}
+
+.fuzhou-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.fuzhou-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.fuzhou-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.fuzhou-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+@keyframes changeColor
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+@-moz-keyframes changeColor /* Firefox */
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+@-webkit-keyframes changeColor /* Safari and Chrome */
+{
+	0% {background:#f0f0f0;}
+	50% {background:#ff1900;}
+	100% {background:#f0f0f0;}
+}
+.simulationAlarmInfo{
+	position: absolute;
+	width: 320px;
+	background: #cb204d;
+	height: 100px;
+	z-index: 2;
+	top: 0px;
+	left: 0px;
+	padding: 5px;
+	overflow:auto;
+}
+.eachTipContent{margin-top:5px;font-size:14px;}
+
+.simulationAlarmInfo::-webkit-scrollbar {
+	width: 5px;
+}
+.simulationAlarmInfo::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	background: #c3c3c3;
+}
+
+.simulationAlarmInfo::-webkit-scrollbar-track {
+	border-radius: 0;
+	background: #cb204d;
+}
+.simulationTellInfo{
+	position: absolute;
+	width: 328px;
+	top: 0px;
+	right: 0px;
+	padding: 0px 0px 0px 0px;
+	overflow: auto;
+	background: #c3c3c3;
+	z-index: 2;
+	display: inline-block;
+	font-size: 0;
+}
+.simulationDeviceInfo{
+	position: absolute;
+	width: 328px;
+	height: 100px;
+	top: 33px;
+	right:0px;
+	padding: 5px;
+	overflow:auto;
+	background: #c3c3c3;
+	z-index: 2;
+}
+.simulationTellInfoTop{
+	display: inline-block;
+	font-size: 0;
+}
+.simulationTellInfoTopEach{
+	padding: 6px 11px;
+	display: inline-block;
+	background: #dedede;
+	font-size: 15px;
+	border-top:2px #9c868b solid;
+	border-left:2px #9c868b solid;
+	border-right:2px #ecfbe2 solid ;
+	border-bottom:2px #ecfbe2 solid;
+
+}
+.backRed{background: #ff0000;}
+.backYellow{background: #ffff00;}
+.backGreen{background: #00ff00;}
+</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuBar.vue b/src/jmapNew/theme/datie_02/menus/menuBar.vue
deleted file mode 100644
index 6781eaf23..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuBar.vue
+++ /dev/null
@@ -1,353 +0,0 @@
-<template>
-  <div id="menuBarChengdu3">
-    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%;" :style="{ top: top }" />
-    <station-control-convert ref="stationControlConvert" />
-    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
-    <view-name ref="viewName" />
-    <train-add ref="trainAdd" />
-    <train-transtalet ref="trainTranstalet" />
-    <train-delete ref="trainDelete" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-    <set-limit-speed ref="setLimitSpeed" />
-    <train-fixed-path-pane ref="trainFixedPathPane" />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-import MenuBar from '@/jmapNew/theme/components/menus/menuBar';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import StationControlConvert from './menuDialog/stationControlConvert';
-import TrainAdd from './menuDialog/trainAdd';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-import TrainDelete from './menuDialog/trainDelete';
-import PasswordBox from './menuDialog/passwordBox';
-import ViewName from './menuDialog/viewName';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-import SetLimitSpeed from './menuDialog/setLimitSpeed';
-import TrainFixedPathPane from './menuDialog/trainFixedPathPane';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MenuBarChengdu03',
-    components: {
-        MenuBar,
-        StationControlConvert,
-        PasswordBox,
-        ViewName,
-        TrainAdd,
-        TrainTranstalet,
-        TrainDelete,
-        ManageUser,
-        HelpAbout,
-        SetLimitSpeed,
-        TrainFixedPathPane
-    },
-    props: {
-        dateString: {
-            type: String,
-            default: () => {
-                return '';
-            }
-        }
-    },
-    data() {
-        return {
-            menuNormal: {
-                Local: [
-                    {
-                        title: '登录',
-                        operate: '',
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '显示',
-                        operate: '',
-                        children: [
-                            {
-                                title: '工具栏',
-                                operate: '',
-                                children: [
-                                    {
-                                        title: '标准按钮',
-                                        click: this.undeveloped
-                                    },
-                                    {
-                                        title: '签收栏',
-                                        click: this.undeveloped
-                                    },
-                                    {
-                                        title: '显示系统信息窗口',
-                                        click: this.undeveloped
-                                    },
-                                    {
-                                        title: '显示进路序列管理窗口',
-                                        click: this.bottomTableShowOrHidden
-                                    },
-                                    {
-                                        title: '显示信号员计划表',
-                                        click: this.undeveloped
-                                    },
-                                    {
-                                        title: '显示信号员注意事项',
-                                        click: this.undeveloped
-                                    }
-                                ]
-                            },
-                            {
-                                title: '站场图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '行车日志',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    // {
-                    //     title: '车站定位',
-                    //     operate: '',
-                    //     children: [
-                    //     ]
-                    // },
-                    {
-                        title: '工具',
-                        // operate: OperationEvent.Command.mBar.view,
-                        operate: '',
-                        hide: true,
-                        children: [
-                            {
-                                title: '调度命令管理',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '甩挂车作业',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '列车编组(速报表)',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '站存车(现存车)',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '列控命令',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '车站直接限速',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '运统46',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '站场图回放',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '列控区间占用逻辑检查',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '更新数据',
-                                click: this.updateTrainFixedPath
-                            },
-                            {
-                                title: '列车固定径路',
-                                click: this.trainFixedPathPane
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '用户管理',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '选项',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                type: '时钟显示',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '调试',
-                        operate: '',
-                        children: []
-                    },
-                    {
-                        title: '窗口',
-                        operate: '',
-                        children: []
-                    },
-                    {
-                        title: '帮助',
-                        operate: '',
-                        children: []
-                    }
-                ],
-                Center: [
-                    {
-                        title: '登录(L)',
-                        operate: '',
-                        children: []
-                    },
-                    {
-                        title: '应用程序(T)',
-                        operate: '',
-                        children: []
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        top() {
-            return this.$store.state.training.prdType === '02' ? '0' : '30px';
-        }
-    },
-    created() {
-        // this.menuNormal['Center'][3].children = this.initStationList();
-    },
-    methods: {
-        initStationList() {
-            const list = [];
-            this.stationList.forEach(station => {
-                if (station.visible) {
-                    const node = {
-                        title: station.name,
-                        operate: station.code,
-                        show: true,
-                        click: this.mapLocation,
-                        code: station.code
-                    };
-
-                    list.push(node);
-                }
-            });
-            return list;
-        },
-        // 设置地图定位
-        mapLocation(code) {
-            if (code) {
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
-            }
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                operation: order.operate
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        setLimitSpeed(order) {
-            const operate = {
-                operation: order.operate
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.setLimitSpeed.doShow(operate, true);
-                }
-            });
-        },
-        blankClickClose() {
-            this.$refs.menuBar.doClose();
-        },
-        cancleLimitSpeed(order) {
-            const operate = {
-                operation: order.operate
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.setLimitSpeed.doShow(operate, false);
-                }
-            });
-        },
-        updateTrainFixedPath() {
-            const stationCode = this.$store.state.training.roleDeviceCode;
-            commitOperate(menuOperate.CTC.updateTrainFixedPath2Station, { stationCode: stationCode }, 3).then(({valid, response}) => {
-                if (valid) {
-                    this.$nextTick(function () {
-                        this.$store.dispatch('training/emitTipFresh');
-                    });
-                }
-            });
-        },
-        trainFixedPathPane() {
-            const stationCode = this.$store.state.training.roleDeviceCode;
-            this.$refs.trainFixedPathPane.doShow(stationCode);
-        },
-        bottomTableShowOrHidden() {
-            EventBus.$emit('bottomTableShowOrHidden');
-        },
-        undeveloped() {
-            this.$refs.menuBar.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss">
-    #menuBarChengdu3{
-        line-height:30px;
-    }
-    #menuBarChengdu3 #menuBar .menu-li-block .label{
-        padding: 0px 30px 0px 5px !important;
-    }
-	.img-box{
-		width: 20px;
-		height: 20px;
-		margin-top: 30px;
-	}
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue
index 393e15250..2e075a109 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:40px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div id="menuButtons_box" class="menu menuButton" style="height:40px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <!-- backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp -->
     <button :id="Station.stationMasterLock.rightButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="guideLockRightButtonDown()">
       <span style="color: #800000">
@@ -82,7 +82,7 @@
         <center><b>灭灯</b></center>
       </span>
     </button>
-    <button :id="Station.stationMasterLock.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
+    <button :id="Station.stationMasterLock.leftButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
       <span style="color: #800000">
         <center><b>S引导总锁</b></center>
       </span>
@@ -126,13 +126,14 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import DefectiveShunting from './dialog/defectiveShunting.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { MouseEvent } from '@/scripts/ConstDic';
+import { UserOperationType } from '@/scripts/ConstDic';
 
 export default {
     name: 'MapButtonMenu',
@@ -183,7 +184,7 @@ export default {
             'autoReentryData'
         ]),
         point() {
-            return this.$store.state.training.prdType == '01' ? {x:0, y:30} : {x:0, y:0};
+            return {x:0, y:30};
         },
         Switch() {
             return OperationEvent.Switch;
@@ -212,9 +213,6 @@ export default {
         xGuideMasterLock() {
             return this.$store.state.map.stationXGuideMasterLock;
         },
-        isShowBtn() {
-            return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10';
-        },
         CMD() {
             return CMD;
         },
@@ -304,46 +302,40 @@ export default {
         passWordCommit(data) {
             let operate = {};
             if (data.nextCmdType) {
-                if (data.nextCmdType == CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE) {
-                    this.$store.dispatch('training/updateMapState', [{code: data.code, _type:'SignalButton', pressDown: 0}]);
-                }
                 operate = {
                     over: true,
                     operation: data.operateNext,
                     operationPre: data.operation,
                     cmdType: data.nextCmdType,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param: data.param
                 };
             } else {
                 operate = {
                     operationPre: data.operation,
                     operation: data.operateNext,
-                    userOperationType: 'leftClick'
+                    userOperationType: UserOperationType.LEFTCLICK
                 };
             }
-            this.trainingOperation(operate);
-        },
-        // 执行操作
-        trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
-                    /* 引导总锁输入面后 处理按钮选中状态 */
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (data.nextCmdType === CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE) {
+                        this.$store.dispatch('training/updateMapState', [{code: data.code, _type:'SignalButton', pressDown: 0}]);
+                    }
                     if (operate.operationPre === this.Switch.guideLock.leftButton.operation || operate.operation === this.Switch.guideLock.leftButton.operation) {
                         this.guideLockLeftFlag = !this.guideLockLeftFlag;
                     } else if (operate.operationPre === this.Switch.guideLock.rightButton.operation || operate.operation === this.Switch.guideLock.rightButton.operation) {
                         this.guideLockRightFlag = !this.guideLockRightFlag;
                     }
-                    if (operate.operationPre == this.Station.powerUnLock.button.operation) {
+                    if (operate.operationPre === this.Station.powerUnLock.button.operation || operate.cmdType) {
                         this.clearOperate();
                     }
-                    // debugger;
-                    // this.$store.dispatch('menuOperation/setButtonOperation', operate.operation); // 按钮菜单是否被按下
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
-            }).catch((error) => {
-                console.error(error);
+            }).catch(e =>{
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
+                this.clearOperate();
             });
         },
         updateButtonShow(val, old) {
@@ -369,47 +361,15 @@ export default {
                 }
             }
         },
-        // // 上电解锁 大铁线路
-        // handelPowerUnLock(model) {
-        //     debugger;
-        //     const operate = {
-        //         over: true,
-        //         code: model.code,
-        //         operation: this.$store.state.menuOperation.buttonOperation,
-        //         userOperationType: 'leftClick',
-        //         cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
-        //         param:{stationCode: this.$store.state.map.showCentralizedStationCode}
-        //     };
-        //     this.sendCommand(operate);
-        // },
-        // powerOnUnlock() {
-        // const operate = {
-        //     over:true,
-        //     operation:this.Station.powerUnLock.button.operation,
-        //     cmdType:CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
-        //     code:this.$store.state.map.showCentralizedStationCode,
-        //     param:{stationCode: this.$store.state.map.showCentralizedStationCode}
-        // };
-        // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //     if (valid) {
-        //         this.clearOperate();
-        //     } else {
-        //         this.$refs.noticeInfo.doShow();
-        //     }
-        // }).catch((error) => {
-        //     console.error(error);
-        //     this.$refs.noticeInfo.doShow();
-        // });
-        // },
         // 分路不良
         handelDefectiveShunting(model) {
             // CMD.Section.CMD_SECTION_DEFECTIVE_SHUNTING;
             const operate = {
                 operation: this.Section.defectiveShunting.button.operation,
                 code: model.code,
-                userOperationType: 'leftClick'
+                userOperationType: UserOperationType.LEFTCLICK
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     const {switchSection, code, shuntingTypeList} = model;
                     this.$refs.defectiveShunting.doShow({switchSection, code, shuntingTypeList});
@@ -421,9 +381,9 @@ export default {
         guideLockLeftButtonDown() {
             const operate = {
                 operation: this.Station.stationMasterLock.leftButton.operation,
-                userOperationType: 'leftClick'
+                userOperationType: UserOperationType.LEFTCLICK
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = this.sGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK;
@@ -438,9 +398,9 @@ export default {
         guideLockRightButtonDown() {
             const operate = {
                 operation: this.Station.stationMasterLock.rightButton.operation,
-                userOperationType: 'leftClick'
+                userOperationType: UserOperationType.LEFTCLICK
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = this.xGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK;
@@ -453,58 +413,55 @@ export default {
         },
         buttonDown(operation, commandTypeList) {
             this.clearOperate();
-            if (operation != this.Command.cancel.clearMbm.operation) {
-                const operate = {
-                    operation: operation,
-                    userOperationType: 'leftClick'
-                };
-                // 以下 会弹出密码框 （总人解，区故解） 铅封按钮
-                const operationList = [this.Signal.humanTrainRoute.button.operation,
-                    this.Section.fault.button.operation,
-                    this.Section.defectiveShunting.button.operation,
-                    this.Station.powerUnLock.button.operation,
-                    this.Signal.signalTurnOff.menuButton.operation];
-                const operationMap = {
-                    [this.Signal.humanTrainRoute.button.operation]:'总人解',
-                    [this.Section.fault.button.operation]:'区故解',
-                    [this.Section.defectiveShunting.button.operation]:'分路不良',
-                    [this.Signal.signalTurnOff.menuButton.operation]:'灭灯',
-                    [this.Station.powerUnLock.button.operation]:'上电解锁'
-                };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
+            const operate = {
+                start: true,
+                operation: operation,
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            // 以下 会弹出密码框 （总人解，区故解） 铅封按钮
+            const operationList = [this.Signal.humanTrainRoute.button.operation,
+                this.Section.fault.button.operation,
+                this.Section.defectiveShunting.button.operation,
+                this.Station.powerUnLock.button.operation,
+                this.Signal.signalTurnOff.menuButton.operation];
+            const operationMap = {
+                [this.Signal.humanTrainRoute.button.operation]:'总人解',
+                [this.Section.fault.button.operation]:'区故解',
+                [this.Section.defectiveShunting.button.operation]:'分路不良',
+                [this.Signal.signalTurnOff.menuButton.operation]:'灭灯',
+                [this.Station.powerUnLock.button.operation]:'上电解锁'
+            };
+            // const list = [
+            //     this.Signal.humanTrainRoute.button.operation,
+            //     this.Section.fault.button.operation,
+            //     this.Station.powerUnLock.button.operation
+            // ];
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    if (operation === this.Command.cancel.clearMbm.operation) {
+                        this.commandTypeList = [];
+                        this.$store.dispatch('menuOperation/setButtonOperation', null);
+                        this.guideLockRightFlag = false;
+                        this.guideLockLeftFlag = false;
+                    } else {
                         this.operation = operation;
                         this.commandTypeList = commandTypeList;
-                        this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
+                        this.$store.dispatch('menuOperation/setButtonOperation', operation);
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         // 判断是否需要 弹窗密码框
                         if (operationList.includes(operation)) {
                             operate['operateNext'] = this.Command.close.password.operation;
-                            if (operation == this.Station.powerUnLock.button.operation) {
+                            if (operation === this.Station.powerUnLock.button.operation) {
                                 operate.nextCmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
-                                operate.param = {stationCode: this.$store.state.map.showCentralizedStationCode};
+                                operate.param = {stationCode: this.$store.state.training.roleDeviceCode};
                             }
                             this.$refs.password.doShow(operate, operationMap[operation]);
                         }
                         this.timeNode = this.$store.state.socket.simulationTimeSync;
                         this.$store.dispatch('training/emitTipFresh');
                     }
-                });
-            } else {
-                // 清除按钮
-                const operate = {
-                    start: true,
-                    userOperationType: 'leftClick',
-                    operation: operation
-                };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.commandTypeList = [];
-                        this.$store.dispatch('menuOperation/setButtonOperation', null);
-                        this.guideLockRightFlag = false;
-                    }
-                });
-            }
+                }
+            });
         },
         // 解析进路数据
         handleRouteDataMap() {
@@ -517,68 +474,66 @@ export default {
             });
         },
         // 校验已点击的信号按钮code 是否有符合条件的进路
-        checkHaveRoute(deviceList) {
+        checkHaveRoute(model) {
             let name = '';
-            deviceList.forEach((device, index) =>{
-                name = name + (index ? '-' : '') + device.code;
-            });
+            if (this.deviceList && this.deviceList.length) {
+                name = this.deviceList[0].code + '-' + model.code;
+            } else {
+                name = model.code;
+            }
             return this.routeButtonCodeList.some(item => item.includes(name));
         },
         // 排列进路 OR 信号重开操作
-        arrangementRouteOperation(deviceList) {
+        arrangementRouteOperation(model) {
             const operate = {
                 operation: this.Signal.arrangementRoute.button.operation,
-                userOperationType: 'leftClick'
+                userOperationType: UserOperationType.LEFTCLICK,
+                code: model.code
             };
             if (!this.routeDataMap) { this.handleRouteDataMap(); }
 
-            if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                // this.$message.error('无效的进路按钮');
+            if (!this.checkHaveRoute(model)) { // 无效的进路按钮选择 清除deviceList
                 this.clearOperate();
                 return;
             }
-            this.deviceTimeNode = this.$store.state.socket.simulationTimeSync;
-            const signal = this.$store.getters['map/getDeviceByCode'](deviceList[0].signalCode || deviceList[0].code);// deviceList[0] 为 SignalButton || Signal
-            if (deviceList.length === 1 && !signal.lockedRouteCode) { // 排列进路 处理始端信号机状态
-                operate.code = deviceList[0].code;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                    if (valid) {
-                        // 仅信号按钮调车信号机有状态
-                        if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) {
-                            this.$store.dispatch('training/updateMapState', [{code: deviceList[0].code, _type: deviceList[0]._type, hasSelected: 1}]);
-                        }
-                    }
-                }).catch(() => {
-                    this.$refs.noticeInfo.doShow();
-                });
-            } else if (deviceList.length === 1 && signal.lockedRouteCode) { // 信号重开
-                operate.operation = this.Signal.reopenSignal.button.operation;
-                operate.over = true;
-                operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
-                operate.code = signal.code;
-                operate.param = {signalCode: signal.code};
-                this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
-                    this.clearOperate();
-                }).catch(() => this.$refs.noticeInfo.doShow() );
-            } else if (deviceList.length > 1) {
+            const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
+            if (this.deviceList && this.deviceList.length) {
                 let key = '';
-                deviceList.forEach((item, index) => {
+                this.deviceList.forEach((item, index) => {
                     key = key + (index ? '-' : '') + item.code;
                 });
+                key = key + '-' + model.code;
                 const route = this.routeDataMap[key];
                 if (route) {
                     operate.over = true;
                     operate.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
-                    operate.code = deviceList[deviceList.length - 1].code;
                     operate.param = {routeCode: route.code};
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                        this.deviceTimeNode = 0;
-                    }).catch(() => {
-                        this.deviceTimeNode = 0;
-                        this.$refs.noticeInfo.doShow();
-                    }).finally(() => { this.clearOperate(); });
                 }
+            } else if (signal.lockedRouteCode) {
+                operate.operation = this.Signal.reopenSignal.button.operation;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
+                operate.param = {signalCode: signal.code};
+                operate.over = true;
             }
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    if (operate.cmdType === CMD.Signal.CMD_SIGNAL_SET_ROUTE) {
+                        this.deviceTimeNode = 0;
+                    } else if (!operate.cmdType) {
+                        if (model._type === 'SignalButton' || (model._type === 'Signal' && model.type === 'SHUNTING')) {
+                            this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, hasSelected: 1}]);
+                        }
+                        this.deviceList.push(model);
+                    }
+                    if (operate.over) {
+                        this.clearOperate();
+                    }
+                }
+            }).catch(e => {
+                console.error(e);
+                this.clearOperate();
+                this.$refs.noticeInfo.doShow();
+            });
         },
         // 总取消
         handleTotalCancel(model) {
@@ -586,42 +541,52 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
                 param: {
                     signalCode: model._type === 'Signal' ? model.code : model.signalCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.clearOperate();
                 }
-            }).catch((error) => {
+            }).catch(e => {
+                console.error(e);
                 this.clearOperate();
-                console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
         },
         // 引导信号
         handleGuideSignal(model) {
             const operate = {
-                over: true,
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
-                userOperationType: 'leftClick',
-                cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                userOperationType: UserOperationType.LEFTCLICK,
                 param: {signalCode: model.signalCode}
             };
             const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode);
-            // 信号机引导时间15s以内再次点击引导不需要进行密码输入
             if (signal.guideTime) {
-                this.sendCommand(operate);
+                operate.over = true;
+                operate.cmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
             } else {
                 operate.nextCmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
-                operate['operateNext'] = this.Command.close.password.operation;
-                this.$refs.password.doShow(operate, '引导信号');
-                this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, pressDown: 1}]);
+                operate.operateNext = this.Command.close.password.operation;
             }
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    if (operate.over) {
+                        this.clearOperate();
+                    } else {
+                        this.$refs.password.doShow(operate, '引导信号');
+                        this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, pressDown:1}]);
+                    }
+                }
+            }).catch(e => {
+                console.error(e);
+                this.clearOperate();
+                this.$refs.noticeInfo.doShow();
+            });
         },
         // 人解进路
         handleTotalHumanSolution(model) {
@@ -629,39 +594,41 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 val: model.code,
                 cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
             };
-            // const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode || model.code);
             if (model._type === 'SignalButton' && model.type === 'PICK') {
                 operate.param = {signalCode: model.signalCode};
-                this.sendCommand(operate);
             } else if (model._type === 'Signal' && model.type === 'SHUNTING') {
                 operate.param = {signalCode: model.code};
-                this.sendCommand(operate);
             }
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.clearOperate();
+                }
+            }).catch(e => {
+                console.error(e);
+                this.clearOperate();
+                this.$refs.noticeInfo.doShow();
+            });
         },
-        handelSwitchOperate(model) {
+        handleSwitchOperate(model) {
             const operate = {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 cmdType: this.cmdType,
                 param: { switchCode: model.code}
             };
-            this.sendCommand(operate);
-        },
-        // 发送指令
-        sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.clearOperate();
                 }
-            }).catch((error) => {
+            }).catch(e => {
+                console.error(e);
                 this.clearOperate();
-                console.error(error);
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -678,13 +645,13 @@ export default {
                 return false;
             }
         },
-        handelSignalBlockOrUnblock(model) {
+        handleSignalBlockOrUnblock(model) {
             const buttonOperation = this.$store.state.menuOperation.buttonOperation;
             const operate = {
                 over: true,
                 code: model.code,
                 operation: buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 cmdType: '',
                 param: {}
             };
@@ -705,40 +672,67 @@ export default {
                     operate.param = {signalCode: model.signalCode};
                 }
             }
-            this.sendCommand(operate);
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.clearOperate();
+                }
+            }).catch(e => {
+                console.error(e);
+                this.clearOperate();
+                this.$refs.noticeInfo.doShow();
+            });
         },
         handleGuideLock(model) {
             const signal = this.$store.getters['map/getDeviceByCode'](model.signalCode);
             if (signal && (this.guideLockRightFlag && signal.right) || (this.guideLockLeftFlag && !signal.right)) {
                 const operate = {
-                    over: true,
                     code: model.code,
                     operation: this.guideLockRightFlag ? this.Switch.guideLock.rightButton : this.Switch.guideLock.leftButton,
-                    userOperationType: 'leftClick',
-                    nextCmdType: CMD.Switch.CMD_SWITCH_MASTER_LOCK,
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param: {signalCode: model.signalCode}
                 };
                 // 信号机引导时间15s以内再次点击引导不需要进行密码输入
                 if (signal.guideTime) {
+                    operate.over = true;
                     operate.cmdType = CMD.Switch.CMD_SWITCH_MASTER_LOCK;
-                    this.sendCommand(operate);
                 } else {
-                    operate['operateNext'] = this.Command.close.password.operation;
-                    this.$refs.password.doShow(operate, '引导信号');
+                    operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_LOCK;
                 }
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                    if (valid) {
+                        if (operate.cmdType) {
+                            this.clearOperate();
+                        } else {
+                            operate['operateNext'] = this.Command.close.password.operation;
+                            this.$refs.password.doShow(operate, '引导信号');
+                        }
+                    }
+                }).catch(e => {
+                    console.error(e);
+                    this.clearOperate();
+                    this.$refs.noticeInfo.doShow();
+                });
             }
         },
-        handelFaultSection(model) {
+        handleFaultSection(model) {
             if (model._type === 'Section') {
                 const operate = {
                     over: true,
                     code: model.code,
                     operation: this.$store.state.menuOperation.buttonOperation,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
                     param: {sectionCode: model.code}
                 };
-                this.sendCommand(operate);
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                    if (valid) {
+                        this.clearOperate();
+                    }
+                }).catch(e => {
+                    console.error(e);
+                    this.clearOperate();
+                    this.$refs.noticeInfo.doShow();
+                });
             }
         },
         handleSignalTurnOn(model) {
@@ -746,11 +740,19 @@ export default {
                 over: true,
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 cmdType: CMD.Signal.CMD_SIGNAL_TURN_ON,
                 param: {signalCode: model.signalCode}
             };
-            this.sendCommand(operate);
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.clearOperate();
+                }
+            }).catch(e => {
+                console.error(e);
+                this.clearOperate();
+                this.$refs.noticeInfo.doShow();
+            });
         },
         handleSignalTurnOff(model) {
             if (model.type === 'PICK') {
@@ -758,18 +760,26 @@ export default {
                     over: true,
                     code: model.code,
                     operation: this.$store.state.menuOperation.buttonOperation,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     cmdType: CMD.Signal.CMD_SIGNAL_TURN_OFF,
                     param: {signalCode: model.signalCode}
                 };
-                this.sendCommand(operate);
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                    if (valid) {
+                        this.clearOperate();
+                    }
+                }).catch(e => {
+                    console.error(e);
+                    this.clearOperate();
+                    this.$refs.noticeInfo.doShow();
+                });
             }
         },
         // CHANGE_DIRECTION
         selectedChange() {
             // 按钮按下时
             const model = this.selected; // 选择设备
-            if ((this.$store.state.training.prdType != '01' && this.$store.state.training.prdType != '10') || this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) {
+            if (this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) {
                 return;
             }
             const buttonOperation = this.$store.state.menuOperation.buttonOperation;
@@ -789,11 +799,11 @@ export default {
                 } else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
                     this.handleTotalHumanSolution(model);
                 } else if (switchOperation.includes(buttonOperation)) {
-                    this.handelSwitchOperate(model);
+                    this.handleSwitchOperate(model);
                 } else if (buttonOperation === this.Signal.lock.button.operation || buttonOperation === this.Signal.unlock.button.operation) {
-                    this.handelSignalBlockOrUnblock(model);
+                    this.handleSignalBlockOrUnblock(model);
                 } else if (buttonOperation === this.Section.fault.button.operation) {
-                    this.handelFaultSection(model);
+                    this.handleFaultSection(model);
                 } else if (buttonOperation === this.Section.defectiveShunting.button.operation) {
                     this.handelDefectiveShunting(model);
                 } else if (buttonOperation === this.Signal.signalTurnOn.menuButton.operation) {
@@ -811,8 +821,7 @@ export default {
                     // 改方操作 总辅助操作 接辅助操作 发辅助操作
                     this.assistOperateOrChange(model);
                 } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
-                    this.deviceList.push(model);
-                    this.arrangementRouteOperation(this.deviceList);
+                    this.arrangementRouteOperation(model);
                 } else {
                     this.clearOperate();
                 }
@@ -828,7 +837,7 @@ export default {
         clearOperate() { // 清除操作
             this.deviceList && this.deviceList.length && this.$store.dispatch('training/updateMapState', [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}]);
             this.deviceList = [];
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', null);
         },
         assistOperateOrChange(model) {
@@ -839,7 +848,7 @@ export default {
                     name:'总辅助',
                     operation:this.CTCCommand.assistPressMainAssist.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_MAIN_ASSIST,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode,
@@ -851,7 +860,7 @@ export default {
                     name:'改方',
                     operation:this.CTCCommand.assistPressDownTurnDirection.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
-                    operationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode,
@@ -864,7 +873,7 @@ export default {
                     // this.CTCCommand.assistPressDownTurnDirection.menu.operation
                     operation:this.CTCCommand.assistPressReceiveAssist.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RECEIVE_ASSIST,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -875,7 +884,7 @@ export default {
                     name:'发辅助',
                     operation:this.CTCCommand.assistPressDeliverAssist.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_DELIVER_ASSIST,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -886,7 +895,7 @@ export default {
                     name:'事故',
                     operation:this.CTCCommand.assistPressAccident.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_ACCIDENT,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -899,7 +908,7 @@ export default {
                 'OCCLUSION':{
                     operation:this.CTCCommand.assistPressBlock.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_BLOCK,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -909,7 +918,7 @@ export default {
                 'RECOVERY':{
                     operation:this.CTCCommand.assistPressRestore.menu.operation,
                     nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_RESTORE,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     param:{
                         labelEnum:model.labelEnum,
                         stationCode:model.stationCode
@@ -923,54 +932,32 @@ export default {
                     code: model.code,
                     param: noPasswordModelTypeMap[model.type].param,
                     cmdType : noPasswordModelTypeMap[model.type].nextCmdType,
-                    userOperationType: 'leftClick'
+                    userOperationType: UserOperationType.LEFTCLICK
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
                         this.clearOperate();
-                    } else {
-                        this.$refs.noticeInfo.doShow();
                     }
-                }).catch((error) => {
-                    console.error(error);
+                }).catch(e => {
+                    console.error(e);
+                    this.clearOperate();
                     this.$refs.noticeInfo.doShow();
                 });
-
             } else {
                 const operate = {
                     operation: modelTypeMap[model.type].operation,
                     code: model.code,
                     param: modelTypeMap[model.type].param,
-                    userOperationType: 'leftClick'
+                    userOperationType: UserOperationType.LEFTCLICK
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
                         operate.nextCmdType = modelTypeMap[model.type].nextCmdType;
                         operate['operateNext'] = this.Command.close.password.operation;
                         this.$refs.password.doShow(operate, modelTypeMap[model.type].name);
                     }
-                }).catch((error) => {
-                    console.error(error);
-                    this.$refs.noticeInfo.doShow();
                 });
             }
-            // const operate = {
-            //     over: true,
-            //     code: model.code,
-            //     operation: this.CTCCommand.assistPressDownTurnDirection.menu.operation,
-            //     cmdType: CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
-            //     param: {
-            //         labelEnum:model.labelEnum,
-            //         stationCode:model.stationCode
-            //     }
-            // };
-            // this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-            //     // this.clearOperate();
-            // }).catch((error) => {
-            //     // this.clearOperate();
-            //     console.error(error);
-            //     this.$refs.noticeInfo.doShow();
-            // });
         }
     }
 };
@@ -1001,15 +988,15 @@ export default {
         height: 100%;
         position: absolute;
         border-right: 1px #262626 solid;
-        left: 0px;
+        left: 0;
         top: 0;
         border-bottom: 1px #262626 solid;
-        border-left:0px;
-        border-top: 0px;
+        border-left:0;
+        border-top: 0;
     }
     .button_box.downActive::before{
-        border-right:0px;
-        border-bottom: 0px;
+        border-right:0;
+        border-bottom: 0;
         border-left: 1px #262626 solid;
         border-top: 1px #262626 solid;
     }
diff --git a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
index 9cfae3884..20a308823 100644
--- a/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue
@@ -1,12 +1,12 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height: 35px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div id="menuButtons_box" class="menu menuButton" style="height: 35px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button :id="Signal.arrangementRoute.button.domId" class="button_box" @click="buttonDown(Signal.arrangementRoute.button.operation, ['Signal','SignalButton'])">
       <span :style="{ color: operation === Signal.arrangementRoute.button.operation ? '#ccc':'black'}">
         <center><b>进</b><b>路</b></center>
         <center><b>建</b><b>立</b></center>
       </span>
     </button>
-    <button :id="MixinCommand.totalCancel.button.domId" class="button_box" @click="buttonDown(MixinCommand.totalCancel.button.operation, ['Signal','SignalButton'])">
+    <button :id="MixinCommand.totalCancel.button.domId" class="button_box" @click="buttonDown(MixinCommand.totalCancel.button.operation, [])">
       <span :style="{color: operation === MixinCommand.totalCancel.button.operation ? '#ccc': 'black'}">
         <center><b>总</b></center>
         <center><b>取</b><b>消</b></center>
@@ -120,7 +120,7 @@
 import PopMenu from '@/components/PopMenu';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import TrainRoute from './dialog/trainRoute.vue';
 import ShuntRoute from './dialog/shuntRoute.vue';
@@ -129,6 +129,7 @@ import { mapGetters } from 'vuex';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { MouseEvent, DeviceMenu } from '@/scripts/ConstDic';
 import { EventBus } from '@/scripts/event-bus';
+import {UserOperationType} from "../../../../scripts/ConstDic";
 
 export default {
     name: 'MapButtonMenu',
@@ -217,9 +218,6 @@ export default {
         Command() {
             return OperationEvent.Command;
         },
-        isShowBtn() {
-            return this.$store.state.training.prdType == '01' || this.$store.state.training.prdType == '10';
-        },
         CMD() {
             return CMD;
         },
@@ -254,7 +252,8 @@ export default {
             this.updateButtonShow(val, old);
         },
         '$store.state.menuOperation.selectedCount': function (val) {
-            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            // debugger;
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode);
             if (!station || station.controlMode === 'Interlock') { return; }
             this.selectedChange();
         },
@@ -269,7 +268,7 @@ export default {
                     userOperationType: 'rightClick',
                     operation: this.Command.commandRight.right.operation
                 };
-                this.$store.dispatch('training/nextNew', operate);
+                this.$store.dispatch('trainingNew/next', operate);
                 this.$refs && this.$refs.popMenu && this.$refs.popMenu.resetShowPosition(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.$refs && this.$refs.popMenu && this.$refs.popMenu.close();
@@ -297,15 +296,15 @@ export default {
         EventBus.$on('arrangementRouteMenu', (signal) => {
             this.clearOperate();
             this.buttonDown(this.Signal.arrangementRoute.button.operation, ['Signal', 'SignalButton']);
+            let deviceCode = '';
             if (signal.signalButtonList && signal.signalButtonList.length) {
-                const deviceCode = signal.signalButtonList.find(buttonCode => {
+                deviceCode = signal.signalButtonList.find(buttonCode => {
                     const device = this.$store.getters['map/getDeviceByCode'](buttonCode);
                     return device.type === 'PICK';
                 });
-                this.deviceList.push(this.$store.getters['map/getDeviceByCode'](deviceCode));
             }
             this.menuSignal = signal;
-            this.arrangementRouteOperation(this.deviceList, this.menuSignal);
+            this.arrangementRouteOperation(deviceCode ? this.$store.getters['map/getDeviceByCode'](deviceCode) : signal);
         });
         this.buttonDown(this.Signal.arrangementRoute.button.operation, ['Signal', 'SignalButton']);
         this.switchOperation = [
@@ -327,14 +326,14 @@ export default {
             if (data.nextCmdType) {
                 operate = {
                     over: true,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     operation: data.operation,
                     cmdType: data.nextCmdType,
                     param: data.param
                 };
             } else {
                 operate = {
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     operationPre: data.operation,
                     operation: data.operateNext
                 };
@@ -343,12 +342,12 @@ export default {
         },
         // 执行操作
         trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
-            }).catch((error) => {
-                console.error(error);
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -375,15 +374,14 @@ export default {
         // S引导总锁按钮点击
         guideLockLeftButtonDown() {
             const operate = {
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: this.Switch.guideLock.leftButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
-                    // 引导总锁弹出 调用取消引导总锁指令
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_UNBLOCK;
                     operate.param = {right: false};
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     operate['operateNext'] = this.Command.close.password.operation;
                     this.$refs.password.doShow(operate);
                 }
@@ -392,64 +390,45 @@ export default {
         // X引导总锁按钮点击
         guideLockRightButtonDown() {
             const operate = {
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: this.Switch.guideLock.rightButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
-                    // 引导总锁弹出 调用取消引导总锁指令
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_UNBLOCK;
                     operate.param = {right: true};
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     operate['operateNext'] = this.Command.close.password.operation;
                     this.$refs.password.doShow(operate);
                 }
             });
         },
         buttonDown(operation, commandTypeList) {
-            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode);
             if (!station || station.controlMode === 'Interlock') { return; }
-            this.clearOperate();
-            if (operation != this.Command.cancel.clearMbm.operation) {
-                const operate = {
-                    userOperationType: 'leftClick',
-                    operation: operation
-                };
-                // 以下 会弹出密码框 （总人解，区故解） 铅封按钮 684
-                const operationList = [
-                    this.Signal.humanTrainRoute.button.operation,
-                    this.Section.fault.button.operation,
-                    this.Signal.guide.button.operation
-                ];
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.operation = operation;
-                        this.commandTypeList = commandTypeList;
-                        this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        // 判断是否需要 弹窗密码框
-                        if (operationList.includes(operation)) {
-                            operate['operateNext'] = this.Command.close.password.operation;
-                            this.$refs.password.doShow(operate);
-                        }
-                        this.timeNode = this.$store.state.socket.simulationTimeSync;
-                        this.$store.dispatch('training/emitTipFresh');
+            const operate = {
+                start: operation != this.Command.cancel.clearMbm.operation,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/setButtonOperation', operation === this.Command.cancel.clearMbm.operation ? null : operation);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.operation = operation;
+                    this.commandTypeList = commandTypeList;
+                    const operationList = [
+                        this.Signal.humanTrainRoute.button.operation,
+                        this.Section.fault.button.operation,
+                        this.Signal.guide.button.operation
+                    ];
+                    if (operationList.includes(operation)) {
+                        operate['operateNext'] = this.Command.close.password.operation;
+                        this.$refs.password.doShow(operate);
                     }
-                });
-            } else {
-                // 清除按钮
-                const operate = {
-                    start: true,
-                    userOperationType: 'leftClick',
-                    operation: operation
-                };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.commandTypeList = [];
-                        this.$store.dispatch('menuOperation/setButtonOperation', null);
-                    }
-                });
-            }
+                    this.timeNode = this.$store.state.socket.simulationTimeSync;
+                }
+            });
         },
         // 解析进路数据
         handleRouteDataMap() {
@@ -462,11 +441,13 @@ export default {
             });
         },
         // 校验已点击的信号按钮code 是否有符合条件的进路
-        checkHaveRoute(deviceList) {
+        checkHaveRoute(device) {
             let name = '';
-            deviceList.forEach((device, index) =>{
-                name = name + (index ? '-' : '') + device.code;
-            });
+            if (this.deviceList && this.deviceList[0]) {
+                name = this.deviceList[0].code + '-' + device.code;
+            } else {
+                name = device.code;
+            }
             if (this.menuSignal) {
                 const signalName = this.menuSignal.code;
                 return this.routeButtonCodeList.some(item => item.includes(name) || item.includes(signalName));
@@ -475,108 +456,95 @@ export default {
             }
         },
         // 信号重开
-        handelReopenSignal(device) {
+        handleReopenSignal(device) {
             const operate = {
                 operation: this.Signal.reopenSignal.button.operation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 code: device.code,
                 param: { signalCode: device.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
-            }).catch(() => this.$refs.noticeInfo.doShow() );
+            this.$store.dispatch('trainingNew/next', operate);
         },
         // 排列进路
-        arrangementRouteOperation(deviceList) {
-            const operate = { userOperationType: 'leftClick', operation: this.Signal.arrangementRoute.button.operation };
-            if (!this.routeDataMap) { this.handleRouteDataMap(); }
-            if (!this.checkHaveRoute(deviceList)) { // 无效的进路按钮选择 清除deviceList
-                // this.$message.error('无效的进路按钮');
+        arrangementRouteOperation(model) {
+            const operate = {
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: this.Signal.arrangementRoute.button.operation,
+                code: model.code
+            };
+            if (!this.routeDataMap) { // 处理进路数据
+                this.handleRouteDataMap();
+            }
+            if (!this.checkHaveRoute(model)) { // 无效的进路按钮选择 清除deviceList
                 this.clearOperate();
                 return;
             }
-            this.deviceTimeNode = this.$store.state.socket.simulationTimeSync;
-            const signal = this.$store.getters['map/getDeviceByCode'](deviceList[0].signalCode || deviceList[0].code);// deviceList[0] 为 SignalButton || Signal
-            if (deviceList.length === 1 && !signal.routeLock) { // 排列进路 处理始端信号机状态
-                operate.code = deviceList[0].code;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                    if (valid) {
-                        // 仅信号按钮调车信号机有状态
-                        if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) {
-                            this.$store.dispatch('training/updateMapState', [{code: deviceList[0].code, _type: deviceList[0]._type, hasSelected: 1}]);
-                        }
-                    }
-                }).catch(() => {
-                    this.$refs.noticeInfo.doShow();
-                });
-            } else if (deviceList.length > 1) {
+            if (this.deviceList.length > 0) {
                 let key = '';
-                deviceList.forEach((item, index) => {
+                this.deviceList.forEach((item, index) => {
                     key = key + (index ? '-' : '') + item.code;
                 });
+                key = key + '-' + model.code;
                 const route = this.routeDataMap[key];
                 if (route) {
-                    operate.code = deviceList[deviceList.length - 1].code;
-                    operate.param = {routeCode: route.code};
+                    operate.param = { routeCode: route.code };
                     this.route = route;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                        this.deviceTimeNode = 0;
-                        this.$store.dispatch('training/updateMapState',
-                            [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}, {code: this.deviceList[1].code, _type: this.deviceList[1]._type, hasSelected: 1}]);
-                    }).catch(() => {
-                        this.deviceTimeNode = 0;
-                        this.clearOperate();
-                        this.$refs.noticeInfo.doShow();
-                    });
                 } else if (this.menuSignal) {
                     key = '';
-                    deviceList.forEach((item, index) => {
+                    this.deviceList.forEach((item, index) => {
                         key = key + (index ? '-' : '') + (index ? item.code : this.menuSignal.code);
                     });
+                    key = key + '-' + model.code;
                     const route = this.routeDataMap[key];
                     if (route) {
-                        operate.code = deviceList[deviceList.length - 1].code;
                         operate.param = {routeCode: route.code};
                         this.route = route;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                            this.deviceTimeNode = 0;
-                            this.$store.dispatch('training/updateMapState',
-                                [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}, {code: this.deviceList[1].code, _type: this.deviceList[1]._type, hasSelected: 1}]);
-                        }).catch(() => {
-                            this.deviceTimeNode = 0;
-                            this.clearOperate();
-                            this.$refs.noticeInfo.doShow();
-                        });
                     }
                 }
+            } else {
+                const signal = this.$store.dispatch('map/getDeviceByCode')[model.signalCode || model.code];
+                if (signal.routeLock) { return; }
             }
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.deviceTimeNode = 0;
+                    const stateData = [
+                        {code: model.code, _type: model._type, hasSelected: 1}
+                    ];
+                    if (this.deviceList && this.deviceList[0]) {
+                        stateData.push({code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0});
+                    }
+                    this.deviceList.push(model);
+                    this.$store.dispatch('training/updateMapState', stateData);
+                } else {
+                    this.deviceTimeNode = 0;
+                }
+            });
         },
         // 总取消
-        handelTotalCancel(model) {
+        handleTotalCancel(model) {
             const operate = {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 param: {
                     signalCode: model._type === 'Signal' ? model.code : model.signalCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow();
-            });
+            this.$store.dispatch('trainingNew/next', operate);
         },
         // 引导信号
         handleGuideSignal(model) {
             const operate = {
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 param: {signalCode: model.signalCode}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, hasSelected: 1}]);
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow();
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, hasSelected: 1}]);
+                }
             });
         },
         // 人解进路
@@ -584,33 +552,20 @@ export default {
             const operate = {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 val: model.code,
                 param: { signalCode: model.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow();
-            });
+            this.$store.dispatch('trainingNew/next', operate);
         },
-        handelSwitchOperate(model) {
+        handleSwitchOperate(model) {
             const operate = {
                 code: model.code,
                 operation: this.$store.state.menuOperation.buttonOperation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 param: { switchCode: model.code}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        // 发送指令
-        sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            }).finally(() =>{ this.clearOperate(); });
+            this.$store.dispatch('trainingNew/next', operate);
         },
         // 校验是否有列车(接车)按钮
         checkHasTrainButton(model) {
@@ -625,7 +580,7 @@ export default {
                 return false;
             }
         },
-        handelSignalBlockOrUnblock(model) {
+        handleSignalBlockOrUnblock(model) {
             const buttonOperation = this.$store.state.menuOperation.buttonOperation;
             const operate = {
                 over: true,
@@ -651,22 +606,26 @@ export default {
                     operate.param = {signalCode: model.signalCode};
                 }
             }
-            this.sendCommand(operate);
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.clearOperate();
+                }
+            }).catch(e => {
+                console.error(e);
+                this.$refs.noticeInfo.doShow();
+                this.clearOperate();
+            });
         },
         handleGuideLock(model) {
             const operate = {
                 code: model.code,
                 operation: this.Signal.guide.button.operation,
-                userOperationType: 'leftClick',
+                userOperationType: UserOperationType.LEFTCLICK,
                 param: {signalCode: model.signalCode}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-            }).catch((e) => {
-                this.$refs.noticeInfo.doShow();
-                this.clearOperate();
-            });
+            this.$store.dispatch('trainingNew/next', operate);
         },
-        handelFaultSection(model) {
+        handleFaultSection(model) {
             if (model._type === 'Section') {
                 const operate = {
                     over: true,
@@ -675,38 +634,40 @@ export default {
                     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
                     param: {sectionCode: model.code}
                 };
-                this.sendCommand(operate);
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                    if (valid) {
+                        this.clearOperate();
+                    }
+                }).catch(e =>{
+                    console.error(e);
+                    this.$refs.noticeInfo.doShow();
+                    this.clearOperate();
+                });
             }
         },
         // CHANGE_DIRECTION
         selectedChange() {
             // 按钮按下时
             const model = this.selected; // 选择设备
-            if ((this.$store.state.training.prdType != '01' && this.$store.state.training.prdType != '10') || this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) {
+            if (this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) {
                 return;
             }
             const buttonOperation = this.$store.state.menuOperation.buttonOperation;
-            // if (model._type === 'SignalButton' && model.type === 'GUIDE') {
-            // this.handleGuideLock(model);
-            // this.handleGuideSignal(model);
-            // } else
-            // debugger;
             if (buttonOperation && this.commandTypeList.includes(model._type)) {
                 if (buttonOperation === this.MixinCommand.totalCancel.button.operation) {
-                    this.handelTotalCancel(model);
+                    this.handleTotalCancel(model);
                 } else if (buttonOperation === this.Signal.humanTrainRoute.button.operation) {
                     this.handleTotalHumanSolution(model);
                 } else if (this.switchOperation.includes(buttonOperation)) {
-                    this.handelSwitchOperate(model);
+                    this.handleSwitchOperate(model);
                 } else if (buttonOperation === this.Signal.lock.button.operation || buttonOperation === this.Signal.unlock.button.operation) {
-                    this.handelSignalBlockOrUnblock(model);
+                    this.handleSignalBlockOrUnblock(model);
                 } else if (buttonOperation === this.Section.fault.button.operation) {
-                    this.handelFaultSection(model);
+                    this.handleFaultSection(model);
                 } else if (buttonOperation === this.Signal.reopenSignal.button.operation) {
-                    this.handelReopenSignal(model);
+                    this.handleReopenSignal(model);
                 } else if (buttonOperation === this.Signal.arrangementRoute.button.operation) {
-                    this.deviceList.push(model);
-                    this.arrangementRouteOperation(this.deviceList);
+                    this.arrangementRouteOperation(model);
                 } else if (buttonOperation === this.Signal.guide.button.operation ) {
                     this.handleGuideSignal(model);
                 } else if (buttonOperation === this.MixinCommand.functionButton.button.operation) {
@@ -718,28 +679,6 @@ export default {
                 } else {
                     this.clearOperate();
                 }
-            } else if (!buttonOperation) {
-                // if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
-                //     this.handleGuideSignal(model);
-                // } else if (model._type === 'SignalButton' && model.type === 'CHANGE_DIRECTION') {
-                //     // 改方操作
-                //     // this.changeDirection(model);
-                //     this.clearOperate();
-                // } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
-                //     this.deviceList.push(model);
-                //     this.arrangementRouteOperation(this.deviceList);
-                // } else {
-                //     this.clearOperate();
-                // }
-                // if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
-                //     this.handleGuideSignal(model);
-                // } else if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) || (model._type === 'Signal' && !model.blockade)) {
-                //     this.deviceList.push(model);
-                //     this.arrangementRouteOperation(this.deviceList);
-                // } else {
-                //     this.clearOperate();
-                // }
-
             } else { this.clearOperate(); }
             if (this.timeNode) { this.timeNode = 0; }
         },
@@ -760,15 +699,17 @@ export default {
             this.$store.dispatch('training/updateMapState', deviceState);
             this.deviceList = [];
             this.menuSignal = null;
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', this.operation);
         },
         routeCommit(trainCode, duration) {
-            const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.CTC.CTC_SET_ROUTE, param:{ tripNumber: trainCode || '', duration: duration >= 0 ? duration : null, force: false }};
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                this.clearOperate();
-            }).catch((e) => {
-                console.log(e, 'error');
+            const operate = {userOperationType: UserOperationType.LEFTCLICK, over: true, cmdType: CMD.CTC.CTC_SET_ROUTE, param:{ tripNumber: trainCode || '', duration: duration >= 0 ? duration : null, force: false }};
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.clearOperate();
+                }
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
                 this.clearOperate();
             });
@@ -782,44 +723,38 @@ export default {
                 } else {
                     this.routeCommit();
                 }
-            } else if (this.operation === OperationEvent.MixinCommand.totalCancel.button.operation) {
-                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                    this.clearOperate();
-                }).catch((e) => {
+            } else {
+                const operate = {};
+                if (this.operation === OperationEvent.MixinCommand.totalCancel.button.operation) {
+                    operate.userOperationType = UserOperationType.LEFTCLICK;
+                    operate.over = true;
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE;
+                } else if (this.operation === OperationEvent.Signal.reopenSignal.button.operation) {
+                    operate.userOperationType = UserOperationType.LEFTCLICK;
+                    operate.over = true;
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
+                } else if (this.operation === OperationEvent.Signal.guide.button.operation) {
+                    operate.userOperationType = UserOperationType.LEFTCLICK;
+                    operate.over = true;
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE;
+                } else if (this.operation === OperationEvent.Signal.humanTrainRoute.button.operation) {
+                    operate.userOperationType = UserOperationType.LEFTCLICK;
+                    operate.over = true;
+                    operate.cmdType = CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE;
+                } else if (this.switchOperation.includes(this.operation)) {
+                    operate.userOperationType = UserOperationType.LEFTCLICK;
+                    operate.over = true;
+                    operate.cmdType = this.cmdType;
+                }
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                    if (valid) {
+                        this.clearOperate();
+                    }
+                }).catch(e => {
+                    console.error(e);
                     this.$refs.noticeInfo.doShow();
                     this.clearOperate();
                 });
-            } else if (this.operation === OperationEvent.Signal.reopenSignal.button.operation) {
-                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                    this.clearOperate();
-                }).catch(() => {
-                    this.$refs.noticeInfo.doShow();
-                    this.clearOperate();
-                });
-            } else if (this.operation === OperationEvent.Signal.guide.button.operation) {
-                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                    this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
-                    this.clearOperate();
-                }).catch(() => {
-                    this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
-                    this.$refs.noticeInfo.doShow();
-                    this.clearOperate();
-                });
-            } else if (this.operation === OperationEvent.Signal.humanTrainRoute.button.operation) {
-                const operate = {userOperationType: 'leftClick', over: true, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                }).catch((e) => {
-                    this.$refs.noticeInfo.doShow();
-                }).finally(() => { this.clearOperate(); });
-            } else if (this.switchOperation.includes(this.operation)) {
-                const operate = {userOperationType: 'leftClick', over:true, cmdType: this.cmdType};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                }).catch(() => {
-                    this.$refs.noticeInfo.doShow();
-                }).finally(() => { this.clearOperate(); });
             }
         },
         commandClear() {
@@ -902,57 +837,35 @@ export default {
                 const operate = {
                     over:true,
                     operation: noPasswordModelTypeMap[model.type].operation,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     code: model.code,
                     param: noPasswordModelTypeMap[model.type].param,
                     cmdType : noPasswordModelTypeMap[model.type].nextCmdType
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
                         this.clearOperate();
-                    } else {
-                        this.$refs.noticeInfo.doShow();
                     }
-                }).catch((error) => {
-                    console.error(error);
+                }).catch(e => {
+                    console.error(e);
                     this.$refs.noticeInfo.doShow();
+                    this.clearOperate();
                 });
-
             } else {
                 const operate = {
                     operation: modelTypeMap[model.type].operation,
-                    userOperationType: 'leftClick',
+                    userOperationType: UserOperationType.LEFTCLICK,
                     code: model.code,
                     param: modelTypeMap[model.type].param
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                     if (valid) {
                         operate.nextCmdType = modelTypeMap[model.type].nextCmdType;
                         operate['operateNext'] = this.Command.close.password.operation;
                         this.$refs.password.doShow(operate);
                     }
-                }).catch((error) => {
-                    console.error(error);
-                    this.$refs.noticeInfo.doShow();
                 });
             }
-            // const operate = {
-            //     over: true,
-            //     code: model.code,
-            //     operation: this.CTCCommand.assistPressDownTurnDirection.menu.operation,
-            //     cmdType: CMD.CTC.CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION,
-            //     param: {
-            //         labelEnum:model.labelEnum,
-            //         stationCode:model.stationCode
-            //     }
-            // };
-            // this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-            //     // this.clearOperate();
-            // }).catch((error) => {
-            //     // this.clearOperate();
-            //     console.error(error);
-            //     this.$refs.noticeInfo.doShow();
-            // });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue
deleted file mode 100644
index c1f7b93a3..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/twoConfirmation.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm two-confirmation"
-    title="二次确认"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :show-close="false"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <template v-for="(message, index) in messages">
-        <span :key="index">{{ message }}</span>
-      </template>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="3">
-        <el-button :id="show? domIdConfirm: ''" :loading="loading" @click="commit">确认</el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">关闭</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'TwoConfirmation',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: '',
-            timer: null,
-            domIdConfirm: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-        },
-        messages() {
-            if (this.operate) {
-                return this.operate.messages;
-            }
-            return [];
-        }
-    },
-    methods: {
-        doShow(operate) {
-            this.domIdConfirm = '';
-            if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.forcedStationControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.forcedStationControl.confirm.domId;
-            } else if (OperationHandler.checkOperationIsCurrentOperate(operate.operation, OperationEvent.StationControl.requestStationControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.requestStationControl.confirm.domId;
-            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                this.domIdConfirm = OperationEvent.StationControl.requestCentralControl.confirm.domId;
-            }
-
-            this.operate = operate || {};
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation
-            };
-
-            this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            if (this.operate && this.operate.selection) {
-                const operate = {
-                    send: true,
-                    type: this.operate.type,
-                    val: this.operate.val,
-                    selection: this.operate.selection
-                };
-
-                if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestStationControl)) {
-                    operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operate.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
-                }
-
-                this.loading = true;
-                this.doClose();
-                this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
-                    if (valid) {
-                        this.loading = false;
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                }, 1000).catch(() => {
-                    this.loading = true;
-                    this.$refs.noticeInfo.doShow();
-                });
-            }
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userAdd.vue
deleted file mode 100644
index 6c98c5a53..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userAdd.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__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-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 { 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' }
-                    ],
-                },
-            }
-        },
-        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 '增加用户'
-            }
-        },
-        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() {
-                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/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() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
-            }
-        }
-    }
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userDelete.vue
deleted file mode 100644
index e64aa49f3..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userDelete.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__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>
-</template>
-
-<script>
-    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;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '删除用户'
-            }
-        },
-        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() {
-                this.loading = false;
-                this.dialogShow = false;
-                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/nextNew', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$emit('operateUser', this.model);
-                        }
-                    })
-                } else {
-                    this.$messageBox('选择的用户名或工号为空');
-                }
-            },
-            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();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userEdit.vue
deleted file mode 100644
index b03165a1b..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/childDialog/userEdit.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__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-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 { 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' }
-                    ],
-                },
-            }
-        },
-        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 '用户编辑页面'
-            }
-        },
-        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');
-                });
-            },
-            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/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() {
-                let operate = {
-                    type: this.operate.type,
-                    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 {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/helpAbout.vue
deleted file mode 100644
index 4dc26a4ce..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/helpAbout.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__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>
-        </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>
-    </el-dialog>
-</template>
-
-<script>
-    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'
-            }
-        },
-        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() {
-                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/nextNew', 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/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
-        }
-    }
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/limitSpeed.vue
deleted file mode 100644
index e416e68e0..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/limitSpeed.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </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';
-
-export default {
-    name: 'TrainAdd',
-    components: {
-    },
-    data() {
-        return {
-            trainNoList: [],
-            addModel: {
-
-            },
-
-            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;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-        },
-        title() {
-            return '设置限速';
-        }
-    },
-    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() {
-            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();
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                        this.doClose();
-                        console.error(error);
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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 {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/manageUser.vue
deleted file mode 100644
index deef68f43..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/manageUser.vue
+++ /dev/null
@@ -1,285 +0,0 @@
-<template>
-    <el-dialog class="chengdou-03__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>
-</template>
-
-<script>
-    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
-        },
-        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;
-            },
-            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 '用户管理'
-            }
-        },
-        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() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            //添加用户
-            addUser() {
-                let 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(error => {
-                    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/nextNew', 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/nextNew', 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 = {
-                    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(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/nextNew', 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/nextNew', 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/nextNew', 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('删除失败');
-                    }
-                }
-            }
-        }
-    }
-</script>
-<style scoped>
-    .chengdou-03__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -10px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/passwordBox.vue
deleted file mode 100644
index 69fa03d70..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/passwordBox.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm password-box"
-    title="密码框"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="context" style="overflow:hidden">
-      <el-form label-width="80px" size="mini">
-        <el-form-item prop="username">
-          <span slot="label">用户名：</span>
-          <el-input v-model="model.username" disabled />
-        </el-form-item>
-        <el-form-item prop="password">
-          <span slot="label">密&emsp;码：</span>
-          <el-input v-model="model.password" type="password" />
-        </el-form-item>
-      </el-form>
-      <div class="operate">
-        <el-button-group v-model="key" class="left" size="mini">
-          <el-button size="mini" @click="click(1)">1</el-button>
-          <el-button size="mini" @click="click(2)">2</el-button>
-          <el-button size="mini" @click="click(3)">3</el-button>
-          <el-button size="mini" @click="click(4)">4</el-button>
-          <el-button size="mini" @click="click(5)">5</el-button>
-        </el-button-group>
-        <el-button-group v-model="key" class="right" size="mini">
-          <el-button @click="esc">回退</el-button>
-        </el-button-group>
-        <el-button-group v-model="key" class="left" size="mini">
-          <el-button size="mini" @click="click(6)">6</el-button>
-          <el-button size="mini" @click="click(7)">7</el-button>
-          <el-button size="mini" @click="click(8)">8</el-button>
-          <el-button size="mini" @click="click(9)">9</el-button>
-          <el-button size="mini" @click="click(0)">0</el-button>
-        </el-button-group>
-        <el-button-group v-model="key" class="right" size="mini">
-          <el-button @click="clr">清空</el-button>
-        </el-button-group>
-      </div>
-    </div>
-    <el-row class="button-group">
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'PasswordBox',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            operation: null,
-            model: {
-                username: '',
-                password: ''
-            },
-            key: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.password.domId : '';
-        },
-        domIdConfirm() {
-            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                /** 强制站控*/
-                return OperationEvent.StationControl.forcedStationControl.passwordConfirm.domId;
-            }
-            return '';
-        }
-    },
-    methods: {
-        loadInitData(operate) {
-            this.model.username = '';
-            this.model.password = '';
-            this.operate = operate || {};
-            this.operation = operate.operation;
-            this.model.username = this.$store.state.user.name;
-        },
-        doShow(operate) {
-            /** 如果不是断点激活，而是第一次显示需要初始化数据*/
-            if (!this.dialogShow) {
-                this.loadInitData(operate);
-            }
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.password.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type
-            };
-
-            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                /** 强制站控*/
-                operate.operation = OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation;
-            }
-
-            if (this.model.password == '123456') {
-                this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (valid) {
-                        this.$emit('setLoginResult', {
-                            operation: operate.operation,
-                            success: valid
-                        });
-                        this.doClose();
-                    }
-                }).catch(() => {
-                    this.loading = false;
-                    this.$emit('setLoginResult', {
-                        operation: operate.operation,
-                        success: false
-                    });
-                });
-            } else {
-                this.$refs.noticeInfo.doShow('密码输入错误！');
-            }
-        },
-        click(key) {
-            if (!this.model.password) {
-                this.model.password = '';
-            }
-            this.model.password += key;
-        },
-        esc() {
-            if (this.model.password) {
-                this.model.password = this.model.password.substring(0, this.model.password.length - 1);
-            }
-        },
-        clr() {
-            this.model.password = '';
-        }
-
-    }
-};
-
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .password-box .el-form {
-        margin-top: 10px !important;
-        margin-right: 20px !important;
-    }
-
-    .password-box .el-form-item {
-        margin-bottom: 5px !important;
-    }
-
-    .password-box .context {
-        height: 170px !important;
-    }
-
-    .password-box .operate {
-        margin-top: 10px !important;
-        padding-bottom: 10px !important;
-    }
-
-    .password-box .left {
-        margin-left: 10px !important;
-    }
-
-    .password-box .left .el-button {
-        color: #000;
-        background: #F0F0F0;
-        text-align: center;
-        width: 30px !important;
-    }
-
-    .password-box .right {
-        color: #000;
-        margin-left: 10px !important;
-        background: #F0F0F0;
-        width: 80px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
index 8a403be7f..98782ebad 100644
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/routeCancel.vue
@@ -1,152 +1,158 @@
 <template>
-	<el-dialog
-		v-dialogDrag
-		class="signal-control"
-		:class="popClass"
-		title="取消进路"
-		:visible.sync="dialogShow"
-		width="350px"
-		:before-close="doClose"
-		:z-index="2000"
-		:modal="false"
-		:close-on-click-modal="false"
-	>
-		<div>
-			<i class="el-icon-warning"/>
-			<span>{{ showMessage }}</span>
-		</div>
-		<el-row justify="center" class="button-group">
-			<el-col :span="10" :offset="2">
-				<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.confirm') }}</el-button>
-			</el-col>
-			<el-col :span="8" :offset="4">
-				<el-button :id="domIdCancel" @click="cancel">{{ $t('menu.cancel') }}</el-button>
-			</el-col>
-		</el-row>
-		<notice-info ref="noticeInfo" :pop-class="popClass" />
-		<password-box ref="passwordBox" @checkOver="passWordCommit" @checkCancel="cancel" />
-	</el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="signal-control"
+    :class="popClass"
+    title="取消进路"
+    :visible.sync="dialogShow"
+    width="350px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div>
+      <i class="el-icon-warning" />
+      <span>{{ showMessage }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">{{ $t('menu.confirm') }}</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">{{ $t('menu.cancel') }}</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" :pop-class="popClass" />
+    <password-box ref="passwordBox" @checkOver="passWordCommit" @checkCancel="cancel" />
+  </el-dialog>
 </template>
 
 <script>
-	import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-	import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-	import {menuOperate, commitOperate} from '../../../components/utils/menuOperate';
-	import NoticeInfo from '../../../components/menus/childDialog/noticeInfo';
-	import PasswordBox from '../dialog/childDialog/passwordInputBox.vue';
-    export default {
-        name: 'routeCancel',
-		components: {
-			NoticeInfo,
-			PasswordBox
-		},
-		data() {
-        	return {
-				dialogShow: false,
-				signalName: '',
-				popClass: 'chengdou-03__systerm',
-				loading: false,
-				showMessage: ''
-			}
-		},
-		computed: {
-			domIdCancel() {
-				return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-			},
-			domIdConfirm() {
-				return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
-			}
-		},
-		methods: {
-        	doClose() {
-				this.loading = false;
-				this.dialogShow = false;
-				this.$root.$emit('dialogClose', this.selected);
-				this.$store.dispatch('training/emitTipFresh');
-				this.mouseCancelState(this.selected);
-			},
-			doShow(operate, selected) {
-				this.selected = selected;
-				this.signalName = '';
-				if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
-					this.signalName = selected.name;
-				} else if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()){
-					this.switchName = selected.name;
-				}
-				this.operation = operate.operation;
-				if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-					this.showMessage = `下发“取消进路”【信号机：${this.signalName}】命令吗？`;
-				} else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-					this.showMessage = `下发“信号重开”命令吗？`;
-				} else if (this.operation === OperationEvent.Signal.guide.menu.operation) {
-					this.showMessage = `下发“引导进路”命令吗？`;
-				} else if (this.operation === OperationEvent.Signal.humanTrainRoute.menu.operation) {
-					this.showMessage = `下发“总人解”命令吗？`
-				} else if (this.operation === OperationEvent.Switch.locate.menu.operation) {
-					this.showMessage = `下发“定操【道岔：${this.switchName}】”命令吗？`
-				} else if (this.operation === OperationEvent.Switch.reverse.menu.operation) {
-					this.showMessage = `下发“反操【道岔：${this.switchName}】”命令吗？`
-				} else if (this.operation === OperationEvent.Switch.lock.menu.operation) {
-					this.showMessage = `下发“单锁【道岔：${this.switchName}】”命令吗？`
-				} else if (this.operation === OperationEvent.Switch.unlock.menu.operation) {
-					this.showMessage = `下发“单解【道岔：${this.switchName}】”命令吗？`
-				} else {
-					this.showMessage = '';
-				}
-				this.dialogShow = true;
-				this.$nextTick(function () {
-					this.$store.dispatch('training/emitTipFresh');
-				});
-			},
-			commit() {
-        		if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
-					this.sendCommand(menuOperate.Signal.cancelTrainRoute);
-				} else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
-        			this.sendCommand(menuOperate.Signal.reopenSignal);
-				} else if (this.operation === OperationEvent.Signal.guide.menu.operation) {
-					this.$refs.passwordBox.doShow({ operation: OperationEvent.Signal.guide.menu.operation });
-				} else if (this.operation === OperationEvent.Signal.humanTrainRoute.menu.operation) {
-        			this.sendCommand(menuOperate.Signal.humanTrainRoute);
-				} else if (this.operation === OperationEvent.Switch.locate.menu.operation) {
-        			this.sendCommand(menuOperate.Switch.locate);
-				} else if (this.operation === OperationEvent.Switch.reverse.menu.operation ) {
-        			this.sendCommand(menuOperate.Switch.reverse);
-				}
-			},
-			cancel() {
-				const operate = {
-					operation: OperationEvent.Command.close.menu.operation
-				};
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-					if (valid) {
-						this.doClose();
-					}
-				}).catch(() => {
-					this.doClose();
-					this.$refs.noticeInfo.doShow();
-				});
-			},
-			sendCommand(operate) {
-				this.loading = true;
-				commitOperate(operate, {}, 2).then(({valid})=>{
-					this.loading = false;
-					if (valid) {
-						this.doClose();
-					}
-				}).catch((error) => {
-					this.loading = false;
-					this.doClose();
-					console.error(error);
-					this.$refs.noticeInfo.doShow();
-				});
-			},
-			passWordCommit(operate) {
-        		if (operate.operation === OperationEvent.Signal.guide.menu.operation) {
-        			this.sendCommand(menuOperate.Signal.guide);
-				}
-			}
-		}
-    };
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate} from '../../../components/utils/menuOperate';
+import NoticeInfo from '../../../components/menus/childDialog/noticeInfo';
+import PasswordBox from '../dialog/childDialog/passwordInputBox.vue';
+import {UserOperationType} from "../../../../../scripts/ConstDic";
+export default {
+    name: 'RouteCancel',
+    components: {
+        NoticeInfo,
+        PasswordBox
+    },
+    data() {
+        return {
+            dialogShow: false,
+            signalName: '',
+            popClass: 'chengdou-03__systerm',
+            loading: false,
+            showMessage: ''
+        };
+    },
+    computed: {
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
+        }
+    },
+    methods: {
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$root.$emit('dialogClose', this.selected);
+            this.$store.dispatch('training/emitTipFresh');
+            this.mouseCancelState(this.selected);
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            this.signalName = '';
+            if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase()) {
+                this.signalName = selected.name;
+            } else if (selected && selected._type.toUpperCase() === 'Switch'.toUpperCase()) {
+                this.switchName = selected.name;
+            }
+            this.operation = operate.operation;
+            if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                this.showMessage = `下发“取消进路”【信号机：${this.signalName}】命令吗？`;
+            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                this.showMessage = `下发“信号重开”命令吗？`;
+            } else if (this.operation === OperationEvent.Signal.guide.menu.operation) {
+                this.showMessage = `下发“引导进路”命令吗？`;
+            } else if (this.operation === OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                this.showMessage = `下发“总人解”命令吗？`;
+            } else if (this.operation === OperationEvent.Switch.locate.menu.operation) {
+                this.showMessage = `下发“定操【道岔：${this.switchName}】”命令吗？`;
+            } else if (this.operation === OperationEvent.Switch.reverse.menu.operation) {
+                this.showMessage = `下发“反操【道岔：${this.switchName}】”命令吗？`;
+            } else if (this.operation === OperationEvent.Switch.lock.menu.operation) {
+                this.showMessage = `下发“单锁【道岔：${this.switchName}】”命令吗？`;
+            } else if (this.operation === OperationEvent.Switch.unlock.menu.operation) {
+                this.showMessage = `下发“单解【道岔：${this.switchName}】”命令吗？`;
+            } else {
+                this.showMessage = '';
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        commit() {
+            if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
+                this.sendCommand(menuOperate.Signal.cancelTrainRoute);
+            } else if (this.operation === OperationEvent.Signal.reopenSignal.menu.operation) {
+                this.sendCommand(menuOperate.Signal.reopenSignal);
+            } else if (this.operation === OperationEvent.Signal.guide.menu.operation) {
+                this.$refs.passwordBox.doShow({ operation: OperationEvent.Signal.guide.menu.operation });
+            } else if (this.operation === OperationEvent.Signal.humanTrainRoute.menu.operation) {
+                this.sendCommand(menuOperate.Signal.humanTrainRoute);
+            } else if (this.operation === OperationEvent.Switch.locate.menu.operation) {
+                this.sendCommand(menuOperate.Switch.locate);
+            } else if (this.operation === OperationEvent.Switch.reverse.menu.operation ) {
+                this.sendCommand(menuOperate.Switch.reverse);
+            }
+        },
+        cancel() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.doClose();
+                }
+            });
+        },
+        sendCommand(operate) {
+            const refactoringOperate = {
+                over:true,
+                operation: operate.operation,
+                userOperationType: UserOperationType.LEFTCLICK,
+                cmdType: operate.cmdType,
+                param: {}
+            };
+            this.loading = true;
+            this.$store.dispatch('trainingNew/next', refactoringOperate).then(({ valid }) => {
+                if (valid) {
+                    this.loading = false;
+                    this.doClose();
+                }
+            }).catch(e => {
+                this.loading = false;
+                this.doClose();
+                console.error(e);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        passWordCommit(operate) {
+            if (operate.operation === OperationEvent.Signal.guide.menu.operation) {
+                this.sendCommand(menuOperate.Signal.guide);
+            }
+        }
+    }
+};
 </script>
 
 <style scoped>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/setLimitSpeed.vue
deleted file mode 100644
index dfb5821b3..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/setLimitSpeed.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
-  <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="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>
-            <el-col :span="6" class="item-label">起始公里标</el-col>
-            <el-col :span="6">
-              <el-input v-model="data.begKmPost" />
-            </el-col>
-            <el-col :span="6" class="item-label">结束公里标</el-col>
-            <el-col :span="6">
-              <el-input v-model="data.endKmPost" />
-            </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-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>
-        </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';
-
-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;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-        },
-        title() {
-            return '设置临时限速';
-        }
-    },
-    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() {
-            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();
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                        this.doClose();
-                        console.error(error);
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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 {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-
-    .card-box {
-        border: 1px solid #c0c0c0;
-        margin-bottom: 20px;
-    }
-
-    .card-table {
-        position: relative;
-        top: -15px;
-    }
-
-    .tip-label {
-        position: relative;
-        left: 5px;
-        top: -15px;
-        background: #ECE9D8;
-    }
-
-    .item-label {
-        text-align: center;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue
deleted file mode 100644
index 046b66327..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/stationControlConvert.vue
+++ /dev/null
@@ -1,433 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm station-control-convert"
-    title="控制模式转换"
-    :visible.sync="show"
-    width="700px"
-    :before-close="doClose"
-    :show-close="true"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      border
-      row-key="code"
-      style="width: 100%"
-      height="250"
-      center
-      size="mini"
-      highlight-current-row
-    >
-      <el-table-column :id="domIdChoose" prop="check" label="选择" width="60" style="margin-left:30px">
-        <template slot-scope="scope">
-          <el-checkbox ref="check" v-model="scope.row.check" :disabled="scope.row.disabled" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="operate" label="操作区域" width="140">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.operate }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="control" label="控制模式" width="80">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.control }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="中心-车站通信状态" width="140">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.status }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="result" label="转换执行状态">
-        <template slot-scope="scope">
-          <span :style="{color: scope.row.disabled ? '#CBCBCB':'unset'}">{{ scope.row.result }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-row class="button-group">
-      <el-col :span="10" :offset="3">
-        <el-button v-if="isFork" :id="domIdFork" :disabled="disabledCommit" @click="forkCommit">强制站控</el-button>
-        <el-button v-if="isRequest" :id="domIdRequest" :disabled="disabledCommit" @click="requestCommit">请求站控
-        </el-button>
-        <el-button v-if="isConter" :id="domIdConter" :disabled="disabledCommit" @click="conterCommit">请求中控
-        </el-button>
-      </el-col>
-      <el-col :span="6" :offset="4">
-        <el-button :id="domIdCancel" :disabled="disabledClose" @click="cancel">关闭</el-button>
-      </el-col>
-    </el-row>
-    <two-confirmation ref="twoConfirmation" @setOperate="getOperate" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import TwoConfirmation from './childDialog/twoConfirmation';
-
-export default {
-    name: 'StationControlConvert',
-    components: {
-        TwoConfirmation
-    },
-    data() {
-        return {
-            operate: null,
-            dialogShow: false,
-            disabledSend: false,
-            disabledSure: false,
-            disabledClose: false,
-            operation: '',
-            controlProps: {
-                '01': '中控',
-                '02': '站控'
-            },
-            selection: [],
-            tableData: [],
-            timer: null,
-            count: 0,
-            backOperate: '',
-            timeout: 61
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        ...mapGetters('training', [
-            'mode',
-            'started'
-        ]),
-        disabledCommit() {
-            return this.disabledSend || this.disabledSure;
-        },
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        isFork() {
-            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) {
-                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    return OperationEvent.StationControl.forcedStationControl.choose.domId;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                    return OperationEvent.StationControl.requestStationControl.choose.domId;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    return OperationEvent.StationControl.requestCentralControl.choose.domId;
-                }
-            }
-            return '';
-        },
-        domIdConter() {
-            return this.dialogShow ? OperationEvent.StationControl.requestCentralControl.menu.domId : '';
-        },
-        domIdFork() {
-            return this.dialogShow ? OperationEvent.StationControl.forcedStationControl.menu.domId : '';
-        },
-        domIdRequest() {
-            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.menu.domId : '';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        }
-    },
-    watch: {
-        '$store.state.socket.msgHead': function (elem) {
-            if (elem) {
-                if (elem.hasOwnProperty('timeout')) {
-                    this.updateTableValue(elem.stationControlCode, { result: `接受转换应答超时` }, false);
-                } else if (elem.hasOwnProperty('success')) {
-                    if (elem.success) {
-                        this.updateTableValue(elem.stationControlCode, { result: '控制模式转换成功' }, true);
-                    } else {
-                        this.updateTableValue(elem.stationControlCode, { result: `控制模式转换失败` }, false);
-                    }
-                }
-            }
-        },
-        backOperate: function (operate) {
-            if (this.dialogShow && operate) {
-                if (operate.selection && operate.selection.length) {
-                    operate.selection.forEach(elem => {
-                        if (operate.commit) {
-                            this.updateTableValue(elem.code, { result: `已发送转换请求，${this.timeout}秒后超时.` }, false);
-                        } else if (operate.cancel) {
-                            this.updateTableValue(elem.code, { result: '' }, false);
-                        }
-                    });
-                }
-            }
-        },
-        // 深度数据状态
-        tableData: {
-            handler(val, oldVal) {
-                this.checkTableDataSelction(val);
-            },
-            deep: true
-        }
-    },
-    mounted() {
-        this.loadTableData();
-    },
-    methods: {
-        updateTableValue(code, result, success) {
-            this.tableData.forEach((row, index) => {
-                if (row.code == code) {
-                    for (const prop in result) {
-                        row[prop] = result[prop];
-                    }
-                    if (success) {
-                        if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                            row.control = this.controlProps['02']; // 01:中控， 02:站控
-                        } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                            row.control = this.controlProps['01']; // 01:中控， 02:站控
-                        }
-                        row.disabled = true;
-                        row.check = false;
-                    }
-                }
-            });
-        },
-        checkTableDataSelction(data) {
-            const selection = [];
-            if (data && data.length > 0) {
-                data.forEach(row => {
-                    if (row.check && !row.disabled) {
-                        selection.push(row);
-                    }
-                });
-            }
-
-            this.disabledSend = !selection.length;
-            if (JSON.stringify(selection) !== JSON.stringify(this.selection)) {
-                this.handleChooseChange(selection);
-                this.selection = selection;
-            }
-        },
-        checkBoxDisabled(row) {
-            const control = (this.$store.getters('map/getDeviceByCode')(row.code) || {});
-            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl) || OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                if (control && control.status == '02') { // 01:中控， 02:站控
-                    return true;
-                }
-            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                if (control && control.status == '01') { // 01:中控， 02:站控
-                    return true;
-                }
-            }
-
-        },
-        loadTableData() {
-            this.tableData = [];
-            this.stationList.forEach(station => {
-                // const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                this.tableData.push({
-                    code: station.code,
-                    operate: station.name || '',
-                    control: '',
-                    check: false,
-                    disabled: false,
-                    status: '正常',
-                    result: ''
-                });
-            });
-        },
-        initTableDataStatus() {
-            this.tableData.forEach(row => {
-                row.disabled = this.checkBoxDisabled(row);
-                row.check = false;
-                row.result = '';
-                const control = (this.$store.getters('map/getDeviceByCode')(row.code) || {}).state;
-                if (control) {
-                    row.control = this.controlProps[control.status];
-                }
-            });
-        },
-        doShow(operate) {
-            if (!this.dialogShow) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.disabledSure = false;
-                this.initTableDataStatus();
-            }
-            this.dialogShow = true;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-            this.$refs.multipleTable.setCurrentRow();
-        },
-        cancel() {
-            const operate = {
-                type: 'bar',
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        clearTimer() {
-            this.count = 0;
-            if (this.timer) {
-                clearInterval(this.timer);
-                this.timer = null;
-            }
-        },
-        serializeCodeListWithSeparator(sep) {
-            const codeList = [];
-            if (this.selection && this.selection.length) {
-                this.selection.forEach(elem => {
-                    codeList.push(elem.code);
-                });
-            }
-            return codeList.join(sep);
-        },
-        handleChooseChange(selection) {
-            this.selection = selection;
-            if (selection && selection.length) {
-                const operate = {
-
-                    operation: '',
-                    val: this.serializeCodeListWithSeparator('::'),
-                    selection: selection
-                };
-
-                if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
-                    operate.operation = OperationEvent.StationControl.forcedStationControl.choose.operation;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
-                    operate.operation = OperationEvent.StationControl.requestStationControl.choose.operation;
-                } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
-                    operate.operation = OperationEvent.StationControl.requestCentralControl.choose.operation;
-                }
-
-                this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.disabledSure = false;
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    }
-                });
-            } else if (!selection) {
-                this.$messageBox('请选择一条数据');
-            }
-        },
-        requestCommit() {
-            const operate = {
-
-                messages: ['确认将如下操作区域的控制模式由中控转为站控:'],
-                operation: OperationEvent.StationControl.requestStationControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`操作区域${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.twoConfirmation.doShow(operate);
-                } else {
-                    this.disabledSure = false;
-                }
-            }).catch(() => {
-                this.disabledSure = false;
-                this.disabledClose = false;
-            });
-        },
-        forkCommit() {
-            const operate = {
-
-                messages: ['确认将如下操作区域的控制模式由中控转为站控:'],
-                operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`操作区域${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.twoConfirmation.doShow(operate);
-                } else {
-                    this.disabledSure = false;
-                }
-            }).catch(() => {
-                this.disabledSure = false;
-                this.disabledClose = false;
-            });
-        },
-        conterCommit() { // 请求中控
-            const operate = {
-
-                messages: ['确认将如下操作区域的控制模式由站控转为中控:'],
-                operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
-                val: this.serializeCodeListWithSeparator('::'),
-                selection: this.selection
-            };
-
-            this.selection.forEach((elem, index) => {
-                operate.messages.push(`操作区域${index + 1}:${elem.operate}`);
-            });
-
-            this.disabledSure = true;
-            this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.twoConfirmation.doShow(operate);
-                } else {
-                    this.disabledSure = false;
-                }
-            }).catch(() => {
-                this.disabledSure = false;
-                this.disabledClose = false;
-            });
-        },
-        getOperate(operate) {
-            this.backOperate = operate;
-            if (operate.cancel) {
-                this.disabledClose = false;
-                this.disabledSure = this.disabledSend = false;
-            }
-            if (operate.commit || operate.timeout) {
-                this.disabledSend = this.disabledSure = true;
-                this.disabledClose = false;
-            }
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainAdd.vue
deleted file mode 100644
index fba049a10..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/trainAdd.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-        <span class="base-label">添加位置</span>
-        <div style="position: relative; top:-10px;">
-          <el-form-item prop="stationStandCode">
-            <span slot="label">终&emsp;&emsp;&emsp;端:</span>
-            <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-              <el-option
-                v-for="item in stationStandList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-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;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-        },
-        title() {
-            return '添加计划车';
-        }
-    },
-    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() {
-            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();
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                        this.doClose();
-                        console.error(error);
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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 {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainDelete.vue
deleted file mode 100644
index b1139915a..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/trainDelete.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <el-form-item prop="stationStandCode">
-        <span slot="label">终&emsp;&emsp;端:</span>
-        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-          <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
-        </el-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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-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;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
-        },
-        title() {
-            return '删除计划车';
-        }
-    },
-    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() {
-            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.delPlanTrain.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.doClose();
-                        console.error(error);
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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 {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -5px;
-        top: -18px;
-        padding: 0 5px;
-        background-color: #F0F0F0;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue
index 03bb36e82..2aa09c6a1 100644
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuDialog/trainFixedPathPane.vue
@@ -125,7 +125,9 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { sendCommandNew } from '@/api/jmap/training';
+import { UserOperationType } from '@/scripts/ConstDic';
 export default {
     name: 'TrainFixedPathPane',
     data() {
@@ -177,25 +179,31 @@ export default {
             });
             return sectionMap;
         }
-        // domIdConfirm() {
-        //     return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-        // }
     },
     methods:{
         doShow(stationCode) {
             const title = '固定径路信息';
-            this.stationCode = stationCode;
-            commitOperate(menuOperate.CTC.getStationTrainFixedPath, { stationCode: stationCode }, 3).then(({valid, response}) => {
-                if (valid) {
-                    this.trainFixedPathList = response.data.data;
-                    this.dialogShow = true;
-                    this.title = title + ' 版本:' + response.data.version;
-                    this.$nextTick(function () {
-                        this.$store.dispatch('training/emitTipFresh');
-                    });
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.CTC.getStationTrainFixedPath.operation,
+                cmdType: menuOperate.CTC.getStationTrainFixedPath.cmdType,
+                param: {
+                    stationCode: stationCode
                 }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, resp}) => {
+                if (valid) {
+                    this.stationCode = stationCode;
+                    this.trainFixedPathList = resp.data.data;
+                    this.dialogShow = true;
+                    this.title = title + ' 版本:' + resp.data.version;
+                    this.$nextTick(() => { this.$store.dispatch('training/emitTipFresh'); });
+                }
+            }).catch(e => {
+                console.error(e);
             });
-
         },
         doClose() {
             this.loading = false;
@@ -205,44 +213,62 @@ export default {
 
         // 固定列车经路更新加载到计划
         loadUpdateTrainFixedPath() {
-            commitOperate(menuOperate.CTC.loadUpdateStationTrainFixedPath, { stationCode: this.stationCode }, 3).then(({valid, response}) => {
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.CTC.loadUpdateStationTrainFixedPath.operation,
+                cmdType: menuOperate.CTC.loadUpdateStationTrainFixedPath.cmdType,
+                param: {
+                    stationCode: this.stationCode
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$message.success('加载成功！');
-                    this.$nextTick(function () {
-                        this.$store.dispatch('training/emitTipFresh');
-                    });
+                    this.$nextTick(() => { this.$store.dispatch('training/emitTipFresh'); });
                 }
-            }).catch(()=>{
-                this.$message.error('加载失败');
+            }).catch(() => {
+                this.$message.error('加载失败！');
             });
         },
         // 固定列车经路从生效区更新
         updateTrainFixedPath2Station() {
-            commitOperate(menuOperate.CTC.updateTrainFixedPath2Station, { stationCode: this.stationCode }, 3).then(({valid, response}) => {
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.CTC.updateTrainFixedPath2Station.operation,
+                cmdType: menuOperate.CTC.updateTrainFixedPath2Station.cmdType,
+                param: {
+                    stationCode: this.stationCode
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
-                    // 固定列车经路更新列表
-                    commitOperate(menuOperate.CTC.getStationTrainFixedPath, { stationCode: this.stationCode }, 3).then(({valid, response}) => {
-                        if (valid) {
-                            const title = '固定径路信息';
-                            this.trainFixedPathList = response.data.data;
-                            this.title = title + ' 版本 :' + response.data.version;
-                            this.$nextTick(function () {
-                                this.$store.dispatch('training/emitTipFresh');
-                            });
-                        }
+                    sendCommandNew(this.$route.query.group, menuOperate.CTC.getStationTrainFixedPath.cmdType, { stationCode: this.stationCode }).then(resp => {
+                        const title = '固定径路信息';
+                        this.trainFixedPathList = resp.data.data;
+                        this.title = title + ' 版本 :' + resp.data.version;
+                    }).catch(() => {
+                        this.$message.error('获取数据失败！');
                     });
                 }
+            }).catch(e => {
+                console.error(e);
             });
         },
         cancel() {
             const operate = {
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(() => { this.doClose(); });
+            });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/trainTranstalet.vue
deleted file mode 100644
index 97918ae44..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/trainTranstalet.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm stand-stop-time"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
-      <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
-        <el-input v-model="addModel.groupNumber" />
-      </el-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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-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;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
-        },
-        title() {
-            return '平移计划车';
-        }
-    },
-    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() {
-            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.translatPlanTrain.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.doClose();
-                        console.error(error);
-                        // this.$refs.noticeInfo.doShow();
-                    });
-                } 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>
diff --git a/src/jmapNew/theme/datie_02/menus/menuDialog/viewName.vue b/src/jmapNew/theme/datie_02/menus/menuDialog/viewName.vue
deleted file mode 100644
index 4a32473d5..000000000
--- a/src/jmapNew/theme/datie_02/menus/menuDialog/viewName.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm view-name"
-    title="名称显示设置"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-checkbox-group v-model="nameLevels">
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="1">信号机名称</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox :label="2">站台轨名称</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="3" disabled>按钮名称</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox :label="4">折返轨名称</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="5">轨道名称</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="6">转换轨名称</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="7">道岔名称</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="8">标识灯名称</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="9">道岔区段名称</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="10">目的地名称</el-checkbox>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          <el-checkbox :label="11">计轴区段名称</el-checkbox>
-        </el-col>
-        <el-col :span="10" :offset="4">
-          <el-checkbox dio :label="12">公里标</el-checkbox>
-        </el-col>
-      </el-row>
-    </el-checkbox-group>
-    <el-row class="button-group">
-      <el-col :span="6" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="4" :offset="8">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'ViewName',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            nameLevels: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11]
-        };
-    },
-    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.confirm.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.setNameDisplay();
-        });
-    },
-    methods: {
-        doShow(operate) {
-            // 如果不是断点激活显示，而是第一次显示时，需要初始化参数
-            if (!this.dialogShow) {
-                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');
-        },
-        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();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                over: true,
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.confirm.operation,
-                val: this.nameLevels.sort().join('::')
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                    this.setNameDisplay();
-                }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        setNameDisplay() {
-            const deviceList = [];
-
-            // 信号机
-            let nameShow = this.nameLevels.includes(1);
-            const signalList = this.$store.getters['map/signalList'];
-            if (signalList && signalList.length > 0) {
-                signalList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow }));
-                });
-            }
-
-            // 按钮名称
-            nameShow = this.nameLevels.includes(3);
-
-            // 道岔
-            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 => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, switchSectionNameShow }));
-                });
-            }
-
-            // 控制模式
-            const indicatorShow = this.nameLevels.includes(8);
-            const control = this.$store.getters['map/stationControlList'];
-            if (control && control.length > 0) {
-                control.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { indicatorShow })); // 标识灯名称
-                });
-            }
-
-            // 区段
-            nameShow = false;
-            let standTrackNameShow = false;
-            let reentryTrackNameShow = false;
-            let transferTrackNameShow = false;
-            const sectionList = this.$store.getters['map/sectionList'];
-            if (sectionList && sectionList.length > 0) {
-                sectionList.forEach(elem => {
-                    // if (elem.switchSection && elem.parentCode) {
-                    //     // 道岔轨的区段名称默认不显示
-                    //     nameShow = false;
-                    if (elem.type == '03') {
-                        nameShow = false;
-                    } else if (elem.type === '01') {
-                        // 计轴区段名称
-                        nameShow = this.nameLevels.includes(11);
-                    } else if (elem.type === '02') {
-                        // 轨道轨名称
-                        nameShow = this.nameLevels.includes(5);
-                    } else if (elem.type === '04') {
-                        // 道岔区段名称
-                        nameShow = this.nameLevels.includes(9);
-                    }
-
-                    // 站台轨名称
-                    if (elem.standTrack) {
-                        standTrackNameShow = this.nameLevels.includes(2);
-                    }
-
-                    // 折返轨名称
-                    if (elem.reentryTrack) {
-                        reentryTrackNameShow = this.nameLevels.includes(4);
-                    }
-
-                    // 转换轨名称
-                    if (elem.transferTrack) {
-                        transferTrackNameShow = this.nameLevels.includes(6);
-                    }
-
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, standTrackNameShow, reentryTrackNameShow, transferTrackNameShow }));
-                });
-            }
-
-            // 停车点
-            const destCodeShow = this.nameLevels.includes(10);
-            const stopPointList = this.$store.getters['map/stopPointList'];
-            if (stopPointList && stopPointList.length > 0) {
-                stopPointList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { destCodeShow }));
-                });
-            }
-
-            // 车站
-            const kmPostShow = this.nameLevels.includes(12);
-            const stationList = this.$store.getters['map/stationList'];
-            if (stationList && stationList.length > 0) {
-                stationList.forEach(elem => {
-                    deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { kmPostShow })); // 公里标
-                });
-            }
-
-            this.$store.dispatch('map/updateMapDevices', deviceList);
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue
index 37db1bd04..9f71f053d 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue
@@ -1,12 +1,9 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <section-control ref="sectionControl" pop-class="chengdou-03__systerm" />
-    <section-detail ref="sectionDetail" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <train-add-plan ref="trainAddPlan" pop-class="chengdou-03__systerm" />
     <set-fault ref="setFault" pop-class="datie-02__systerm" />
-    <!-- <load-spare-train ref="loadSpareTrain" pop-class="chengdou-03__systerm" /> -->
     <add-spare-train ref="addSpareTrain" />
     <draw-select ref="drawSelect" />
   </div>
@@ -14,30 +11,23 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionControl';
 import TrainAddPlan from '@/jmapNew/theme/components/menus/dialog/trainAddPlan';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import SectionDetail from './dialog/sectionDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import AddSpareTrain from './dialog/addSpareTrain';
-
 import DrawSelect from './dialog/drawSelect';
 
 export default {
     name: 'SectionMenu',
     components: {
         PopMenu,
-        SectionControl,
-        SectionDetail,
         NoticeInfo,
         TrainAddPlan,
         SetFault,
-        // LoadSpareTrain,
         AddSpareTrain,
         DrawSelect
     },
@@ -47,45 +37,26 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '图纸调用',
-                    //     handler: this.drawingCall
-                    // },
-                    // {
-                    //     label: '基础设备培训',
-                    //     handler: this.baDeTrCall
-                    // }
-                    {
-                        label: ' 增加车次',
-                        handler: this.addSpare,
-                        cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
-                    }
-                ],
-                Center: [
-                    // {
-                    //     label: '区故解',
-                    //     handler: this.fault,
-                    //     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    // },
-                    // {
-                    //     label: '属性',
-                    //     handler: this.detail,
-                    //     cmdType: CMD.Section.CMD_SECTION_DETAILS
-                    // }
-                    // {
-                    //     label: ' 增加车次',
-                    //     handler: this.addSpare,
-                    //     cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: ' 增加车次',
+                    handler: this.addSpare,
+                    cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN,
+                    isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork',
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -102,11 +73,6 @@ export default {
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
                 }
-                // {
-                //     label: '设置备用车',
-                //     handler: this.loadSpare,
-                //     cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
-                // }
             ]
         };
     },
@@ -121,7 +87,7 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && (!this.buttonOperation || this.$route.query.ctc)) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Section) && (!this.buttonOperation || this.work === 'ctcWork')) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -131,7 +97,7 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push( {
+            this.menuNormal.push( {
                 label: '新建计划列车',
                 handler: this.createPlanTrain,
                 cmdType: CMD.Section.CMD_Train_Init_Plan
@@ -141,16 +107,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            if (this.selected.type != '04') {
-                // this.menu = MenuContextHandler.covert(this.menuNormal);
-                this.menu = this.menuNormal.Local;
-                const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-                if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
-                    this.menu.forEach(item => { item.disabled = true; });
-                } else { this.menu.forEach(item => { item.disabled = false; }); }
-            } else {
-                this.menu = [];
-            }
+            this.menu = [];
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, station || {}, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
                 this.menu = this.menuForce;
@@ -173,13 +136,6 @@ export default {
                 this.$refs.popMenu.close();
             }
         },
-        // loadSpare() {
-        //     commitOperate(menuOperate.Section.loadSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
-        //         if (valid) {
-        //             this.$refs.loadSpareTrain.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
         addSpare() {
             commitOperate(menuOperate.Section.addSpareTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
@@ -187,42 +143,6 @@ export default {
                 }
             });
         },
-        // 设置计轴失效
-        alxeFailure() {
-            const step = {
-                start: true,
-                code: `${this.selected.code}`,
-                operation: OperationEvent.Section.alxeFailure.menu.operation,
-                cmdType: '',
-                param: {
-                    sectionCode: `${this.selected.code}`
-                }
-            };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        // 故障解锁
-        fault() {
-            commitOperate(menuOperate.Section.fault, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.sectionControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        detail() {
-            commitOperate(menuOperate.Section.detail, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.sectionDetail.doShow(operate, this.selected);
-                }
-            });
-        },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/datie_02/menus/menuSignal.vue b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
index 14bce60ac..847abad59 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSignal.vue
@@ -1,11 +1,8 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <route-selection ref="routeSelection" />
     <route-control ref="routeControl" pop-class="chengdou-03__systerm" />
-    <route-detail ref="routeDetail" />
     <route-guide ref="routeGuide" />
-    <route-hand-control ref="routeHandControl" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <password-box ref="passwordBox" pop-class="chengdou-03__systerm" @checkOver="passWordCommit" />
     <draw-select ref="drawSelect" />
@@ -18,9 +15,6 @@
 import PopMenu from '@/components/PopMenu';
 import RouteControl from '@/jmapNew/theme/components/menus/dialog/routeControl';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import RouteSelection from './dialog/routeSelection';
-import RouteDetail from './dialog/routeDetail';
-import RouteHandControl from './dialog/routeHandControl';
 import RouteGuide from './dialog/routeGuide';
 import RouteCancel from './menuDialog/routeCancel';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@@ -32,15 +26,13 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import DrawSelect from './dialog/drawSelect';
 import { EventBus } from '@/scripts/event-bus';
+import {UserOperationType} from "../../../../scripts/ConstDic";
 
 export default {
     name: 'SignalMenu',
     components: {
         PopMenu,
         RouteControl,
-        RouteSelection,
-        RouteHandControl,
-        RouteDetail,
         RouteGuide,
         NoticeInfo,
         PasswordBox,
@@ -54,119 +46,75 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '办理 通过进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '列车 办理进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '封锁/解封',
-                        handler: this.lockOrUnlock
-                        // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
+            menuNormal: [
+                {
+                    label: '办理 通过进路',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '列车 办理进路',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '取消进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '封锁/解封',
+                    handler: this.lockOrUnlock,
+                    cmdType: '',
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                    // cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
 
-                    },
-                    // {
-                    //     label: '解封',
-                    //     handler: '',
-                    //     cmdType: ''
-                    // },
-                    {
-                        label: '总人解',
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '引导',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '坡道解锁',
-                        handler: '',
-                        cmdType: ''
-                    }
-                ],
-                Center: [
-                    // {
-                    //     label: '办理进路',
-                    //     handler: this.arrangementRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    // },
-                    // {
-                    //     label: '办理引导进路',
-                    //     handler: this.guide,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    // },
-                    // {
-                    //     label: '取消进路',
-                    //     handler: this.cancelTrainRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    // },
-                    // {
-                    //     label: '总人解',
-                    //     handler: this.humanTrainRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
-                    // },
-                    // {
-                    //     label: '信号重开',
-                    //     handler: this.reopenSignal,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    // },
-                    // {
-                    //     label: '信号封锁',
-                    //     handler: this.lock,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    // },
-                    // {
-                    //     label: '信号解封',
-                    //     handler: this.unlock,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    // },
-                    // {
-                    //     label: '进路收人工控',
-                    //     handler: this.humanControl,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    // },
-                    // {
-                    //     label: '进路交自动控',
-                    //     handler: this.atsAutoControl,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    // },
-                    // {
-                    //     label: '进路信息',
-                    //     handler: this.detail,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    // }
-                ]
-            },
+                },
+                {
+                    label: '总人解',
+                    handler: this.humanTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE,
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '引导',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '坡道解锁',
+                    handler: '',
+                    cmdType: '',
+                    isDisabled: (signal, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -203,7 +151,7 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && (!this.buttonOperation || this.$route.query.ctc)) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && (!this.buttonOperation || this.work === 'ctcWork')) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -213,12 +161,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Local;
+            this.menu = [];
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
-                this.menu.forEach(item => { item.disabled = true; });
-            } else { this.menu.forEach(item => { item.disabled = false; }); }
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, station || {}, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -279,7 +228,6 @@ export default {
         arrangementRoute() {
             commitOperate(menuOperate.Signal.arrangementRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                    // this.$refs.routeSelection.doShow(operate, this.selected, this.getRouteList(this.selected));
                     EventBus.$emit('arrangementRouteMenu', this.selected);
                 }
             });
@@ -305,7 +253,7 @@ export default {
         humanTrainRoute() {
             commitOperate(menuOperate.Signal.humanTrainRoute, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
                 if (valid) {
-                	this.$refs.routeCancel.doShow(operate, this.selected);
+                    this.$refs.routeCancel.doShow(operate, this.selected);
                 }
             });
         },
@@ -318,15 +266,15 @@ export default {
             });
         },
         lockOrUnlock() {
-        	if (this.selected.blockade) {
-        		commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
-        			if (valid) {
-        				this.$refs.routeControl.doShow(operate, this.selected);
+            if (this.selected.blockade) {
+                commitOperate(menuOperate.Signal.unlock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
+                    if (valid) {
+                        this.$refs.routeControl.doShow(operate, this.selected);
                     }
                 });
             } else {
-        		commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
-        			if (valid) {
+                commitOperate(menuOperate.Signal.lock, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
+                    if (valid) {
                         this.$refs.routeControl.doShow(operate, this.selected);
                     }
                 });
@@ -348,40 +296,17 @@ export default {
                 }
             });
         },
-        // 进路交人工控
-        humanControl() {
-            commitOperate(menuOperate.Signal.humanControl, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
-                if (valid) {
-                    this.$refs.routeHandControl.doShow(operate, this.selected, this.getRouteList(this.selected));
-                }
-            });
-        },
-        // 查询进路状态
-        detail() {
-            commitOperate(menuOperate.Signal.detail, {signalCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.routeDetail.doShow(operate, this.selected, this.getRouteList(this.selected));
-                }
-            });
-        },
-        // 进路交自动控
-        atsAutoControl() {
-            commitOperate(menuOperate.Signal.atsAutoControl, {signalCode: this.selected.code}, 0).then(({valid, operate}) => {
-                if (valid) {
-                    this.$refs.routeHandControl.doShow(operate, this.selected, this.getRouteList(this.selected));
-                }
-            });
-        },
         passWordCommit(data) {
-            const step = {
+            const operate = {
+                userOperationType: UserOperationType.LEFTCLICK,
                 operation: data.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     switch (data.operation) {
                     case OperationEvent.Signal.guide.menu.operation:
-                        this.$refs.routeGuide.doShow(data, data.selected, data.routesList);
+                        this.$refs.routeGuide.doShow(data, data.selected, data.routeList);
                         break;
                     case OperationEvent.Signal.humanTrainRoute.button.operation:
                         Object.assign(data, {operation: OperationEvent.Signal.humanTrainRoute.menu.operation});
diff --git a/src/jmapNew/theme/datie_02/menus/menuStation.vue b/src/jmapNew/theme/datie_02/menus/menuStation.vue
index 40a41dd49..0b0a6e72d 100644
--- a/src/jmapNew/theme/datie_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuStation.vue
@@ -19,8 +19,8 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
+import {UserOperationType} from "../../../../scripts/ConstDic";
 
 export default {
     name: 'StationMenu',
@@ -40,25 +40,18 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '图纸调用',
-                    //     handler: this.drawingCall
-                    // },
-                    // {
-                    //     label: '基础设备培训',
-                    //     handler: this.baDeTrCall
-                    // }
-                ],
-                Center: [
-                ]
-            },
+            menuNormal: [],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -109,8 +102,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Local;
+            this.menu = [];
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -165,10 +157,6 @@ export default {
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         },
-        handlerOpenPdf(elem) {
-            const url = `https://joylink.club/oss/projects/wjls/${this.selected.jp}/${elem.file}`;
-            window.open(url, '_blank');
-        },
         // 非常站控
         veryControlClick(selected) {
             // stationCode车站编号、pressDown：1按下、0抬起
@@ -190,23 +178,23 @@ export default {
         },
         // 输入密码正确回调
         passWordCommit(data) {
-            let operate = {};
             if (data.nextCmdType) {
-                operate = {
+                const operate = {
                     over: true,
+                    userOperationType: UserOperationType.LEFTCLICK,
                     operation: data.operation,
                     cmdType: data.nextCmdType,
                     param: data.param
                 };
+                this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                }).catch(e => {
+                    console.error(e);
+                    this.$refs.noticeInfo.doShow();
+                });
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            }).catch((error) => {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
         }
     }
 };
diff --git a/src/jmapNew/theme/datie_02/menus/menuStationStand.vue b/src/jmapNew/theme/datie_02/menus/menuStationStand.vue
index 8dafb5bef..0c7edb2f3 100644
--- a/src/jmapNew/theme/datie_02/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuStationStand.vue
@@ -1,8 +1,6 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <stand-control ref="standControl" />
-    <stand-detail ref="standDetail" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
   </div>
@@ -10,22 +8,17 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import StandControl from './dialog/standControl';
-import StandDetail from './dialog/standDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
     name: 'StationStandMenu',
     components: {
         PopMenu,
-        StandControl,
-        StandDetail,
         NoticeInfo,
         SetFault
     },
@@ -35,52 +28,18 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    // {
-                    //     label: '设置扣车',
-                    //     handler: this.setDetainTrain,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    // },
-                    // {
-                    //     label: '取消扣车',
-                    //     handler: this.cancelDetainTrain,
-                    //     cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    // },
-                    // {
-                    //     label: '设置跳停',
-                    //     handler: this.setJumpStop,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    // },
-                    // {
-                    //     label: '取消跳停',
-                    //     handler: this.cancelJumpStop,
-                    //     cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    // },
-                    // {
-                    //     label: '设置停站时间',
-                    //     handler: this.setStopTime,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    // },
-                    // {
-                    //     label: '设置站间运行等级',
-                    //     handler: this.setRunLevel,
-                    //     cmdType: CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    // },
-                    // {
-                    //     label: '显示站台信息',
-                    //     handler: this.detail,
-                    //     cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
-                    // }
-                ]
-            },
+            menuNormal: [],
             menuForce: [
                 {
                     label: '设置故障',
@@ -121,8 +80,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            this.menu = [];
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -156,62 +114,6 @@ export default {
                 }
             });
         },
-        // 设置扣车
-        setDetainTrain() {
-            commitOperate(menuOperate.StationStand.setDetainTrain, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消扣车
-        cancelDetainTrain() {
-            commitOperate(menuOperate.StationStand.cancelDetainTrain, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 设置跳停
-        setJumpStop() {
-            commitOperate(menuOperate.StationStand.setJumpStop, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消跳停
-        cancelJumpStop() {
-            commitOperate(menuOperate.StationStand.cancelJumpStop, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 停站时间控制
-        setStopTime() {
-            commitOperate(menuOperate.StationStand.setStopTime, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected, []);
-                }
-            });
-        },
-        // 设置运行等级
-        setRunLevel() {
-            commitOperate(menuOperate.StationStand.setRunLevel, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standControl.doShow(operate, this.selected, []);
-                }
-            });
-        },
-        // 查询站台状态
-        detail() {
-            commitOperate(menuOperate.StationStand.detail, { standCode: this.selected.code }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.standDetail.doShow(operate, this.selected, []);
-                }
-            });
-        },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }
diff --git a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
index 2f43f3c1d..7bce72fdb 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSwitch.vue
@@ -47,123 +47,89 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '定操',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '反操',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔钩锁',
-                        handler: this.hookLock,
-                        cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK
-                    },
-                    {
-                        label: '封锁/解封',
-                        handle: ''
-                    },
-                    {
-                        label: '区故解',
-                        handle: ''
-                    },
-                    {
-                        label: '岔前 分路不良',
-                        handle: ''
-                    },
-                    {
-                        label: '定位 分路不良',
-                        handle: ''
-                    },
-                    {
-                        label: '反位 分路不良',
-                        handle: ''
-                    },
-                    {
-                        label: '接触网定位无电',
-                        handle: ''
-                    },
-                    {
-                        label: '接触网反位无电',
-                        handle: ''
-                    },
-                    {
-                        label: '添加调机号',
-                        handle: ''
-                    },
-                    {
-                        label: '删除调机号',
-                        handle: ''
-                    },
-                    {
-                        label: '修改调机号',
-                        handle: ''
-                    }
-                ],
-                Center: [
-                    // {
-                    //     label: '单操到定位',
-                    //     handler: this.locate,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    // },
-                    // {
-                    //     label: '单操到反位',
-                    //     handler: this.reverse,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    // },
-                    // {
-                    //     label: '道岔单锁',
-                    //     handler: this.lock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    // },
-                    // {
-                    //     label: '道岔解锁',
-                    //     handler: this.unlock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    // },
-                    // {
-                    //     label: '道岔封锁',
-                    //     handler: this.block,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-                    // },
-                    // {
-                    //     label: '道岔解封',
-                    //     handler: this.unblock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
-                    // },
-                    // {
-                    //     label: '区故解',
-                    //     handler: this.fault,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
-                    // }
-                    // {
-                    // 	label: '属性',
-                    // 	handler: this.undeveloped,
-                    // 	auth: { station: true, center: true },
-                    //  cmdType: CMD.Switch.
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '定操',
+                    handler: this.locate,
+                    cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '反操',
+                    handler: this.reverse,
+                    cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '单解',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '道岔钩锁',
+                    handler: this.hookLock,
+                    cmdType: CMD.Switch.CMD_SWITCH_HOOK_LOCK,
+                    isDisabled: (section, station, work) => station.controlMode === 'Interlock' && work === 'ctcWork'
+                },
+                {
+                    label: '封锁/解封',
+                    handle: ''
+                },
+                {
+                    label: '区故解',
+                    handle: ''
+                },
+                {
+                    label: '岔前 分路不良',
+                    handle: ''
+                },
+                {
+                    label: '定位 分路不良',
+                    handle: ''
+                },
+                {
+                    label: '反位 分路不良',
+                    handle: ''
+                },
+                {
+                    label: '接触网定位无电',
+                    handle: ''
+                },
+                {
+                    label: '接触网反位无电',
+                    handle: ''
+                },
+                {
+                    label: '添加调机号',
+                    handle: ''
+                },
+                {
+                    label: '删除调机号',
+                    handle: ''
+                },
+                {
+                    label: '修改调机号',
+                    handle: ''
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -192,7 +158,7 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.$route.query.ctc)) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && (!this.buttonOperation || this.work === 'ctcWork')) {
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
@@ -202,12 +168,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Local;
+            this.menu = [];
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
-                this.menu.forEach(item => { item.disabled = true; });
-            } else { this.menu.forEach(item => { item.disabled = false; }); }
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, station || {}, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'STATION_SWITCH_MAN') {
@@ -307,7 +274,6 @@ export default {
         locate() {
             commitOperate(menuOperate.Switch.locate, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    // this.$refs.switchControl.doShow(operate, this.selected);
                     this.$refs.routeCancel.doShow(operate, this.selected);
                 }
             });
diff --git a/src/jmapNew/theme/datie_02/menus/menuTool.vue b/src/jmapNew/theme/datie_02/menus/menuTool.vue
index acc5e6798..ac0dbc27e 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTool.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTool.vue
@@ -135,7 +135,7 @@ export default {
     },
     watch: {
         '$store.state.training.initTime': function (initTime) {
-			this.time = timestampFormat('HH:mmss', initTime)
+            this.time = timestampFormat('HH:mmss', initTime);
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 9539df66b..212b5e565 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -2,16 +2,9 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
-    <train-control ref="trainControl" />
-    <train-edit-number ref="trainEditNumber" />
-    <train-create-number ref="trainCreateNumber" />
-    <train-move-number ref="trainMoveNumber" />
-    <train-delete-number ref="trainDeleteNumber" />
-    <train-detail-info ref="trainDetailInfo" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
     <speed-limit ref="speedLimit" pop-class="chengdou-03__systerm" />
     <train-stop ref="trainStop" pop-class="chengdou-03__systerm" />
-    <!-- <train-set-plan ref="trainSetPlan" /> -->
     <update-trip ref="updateTrip" />
   </div>
 </template>
@@ -22,38 +15,23 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import TrainControl from './dialog/trainControl';
-import TrainEditNumber from './dialog/trainEditNumber';
-import TrainMoveNumber from './dialog/trainMoveNumber';
-import TrainCreateNumber from './dialog/trainCreateNumber';
-import TrainDeleteNumber from './dialog/trainDeleteNumber';
-import TrainDetailInfo from './dialog/trainDetailInfo';
-// import TrainSetPlan from './dialog/trainSetPlan';
 import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
+import {UserOperationType} from "../../../../scripts/ConstDic";
 
 export default {
     name: 'MenuTrain',
     components: {
         PopMenu,
         NoticeInfo,
-        TrainControl,
-        TrainEditNumber,
-        TrainMoveNumber,
-        TrainCreateNumber,
-        TrainDeleteNumber,
-        TrainDetailInfo,
         SetFault,
         UpdateTrip,
         SpeedLimit,
         TrainStop
-        // TrainSetPlan
     },
     mixins: [
         CancelMouseState
@@ -64,87 +42,36 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    // 	label: '设置计划车',
-                    // 	handler: this.setPlanTrain,
-                    // 	cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-                    // },
-                    {
-                        label: '变更车次号',
-                        handler: this.modifyTripNumber,
-                        cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
-                    },
-                    {
-                        label: '删车次号',
-                        handler: this.removeTripNumber,
-                        cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
-                    },
-                    {
-                        label: '换端',
-                        handler: this.turnDirection,
-                        cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
-                    }
-                ],
-                Center: [
-                    {
-                        label: '变更车次号',
-                        handler: this.modifyTripNumber,
-                        cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
-                    }
-                    // {
-                    // 	label: '设置计划车',
-                    // 	handler: this.setPlanTrain,
-                    // 	cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-                    // }
-                    // {
-                    //     label: '新建车组号',
-                    //     handler: this.createTrainNo
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainNo
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.deleteTrainNo
-                    // },
-                    // {
-                    //     label: '修改车组号',
-                    //     handler: this.editTrainNo
-                    // },
-                    // {
-                    //     label: '设计划车',
-                    //     handler: this.setPlanTrainId
-                    // },
-                    // {
-                    //     label: '设目的地',
-                    //     handler: this.destinationTrainId
-                    // },
-                    // {
-                    //     label: '设人工车',
-                    //     handler: this.artificialTrainId
-                    // },
-                    // {
-                    //     label: '设特殊人工车',
-                    //     handler: this.undeveloped
-                    // },
-                    // {
-                    //     label: '详细列车信息',
-                    //     handler: this.detailTrainInfo
-                    // },
-                    // {
-                    //     label: '属性',
-                    //     handler: this.undeveloped
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '变更车次号',
+                    handler: this.modifyTripNumber,
+                    cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
+                },
+                {
+                    label: '删车次号',
+                    handler: this.removeTripNumber,
+                    cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE,
+                    isShow: (train, work) => work === 'localWork'
+                },
+                {
+                    label: '换端',
+                    handler: this.turnDirection,
+                    cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE,
+                    isShow: (train, work) => work === 'localWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -185,26 +112,6 @@ export default {
                         }
                     ]
                 },
-                // {
-                //     label: '确认运行至前方站',
-                //     handler: this.nextStation
-                // },
-                // {
-                //     label: '进路闭塞法行车',
-                //     handler: this.routeBlockRun
-                // },
-                // {
-                //     label: '越引导信号行驶',
-                //     handler: this.handleOverFuideSignal
-                // },
-                // {
-                //     label: '越红灯行驶',
-                //     handler: this.handleOverEedLight
-                // },
-                // {
-                //     label: '限速指令',
-                //     handler: this.handleSpeedLimit
-                // },
                 {
                     label: '驾驶',
                     handler: this.handleDriveTo
@@ -213,20 +120,10 @@ export default {
                     label: '换端',
                     handler: this.turnDirection
                 },
-                // {
-                //     label: '发车',
-                //     handler: this.handleDepartTrain
-                // },
                 {
                     label: '停车',
                     handler: this.handleParkingTrain
                 }
-            ],
-            menuSpeed: [
-                {
-                    label: '确认运行至前方站',
-                    handler: this.limitSpeed
-                }
             ]
         };
     },
@@ -252,11 +149,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
-            if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
-                this.menu.forEach(item => { item.disabled = true; });
-            } else { this.menu.forEach(item => { item.disabled = false; }); }
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, station || {}, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet || this.$store.state.scriptRecord.userRole == 'DRIVER') {
@@ -285,7 +184,16 @@ export default {
         },
         // 设置故障
         setStoppage() {
-            commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
+            const operate = {
+                start: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Common.setFault.operation,
+                cmdType: menuOperate.Common.setFault.cmdType,
+                param: {
+                    groupNumber: this.selected.code
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
                 }
@@ -293,7 +201,16 @@ export default {
         },
         // 取消故障
         cancelStoppage() {
-            commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
+            const operate = {
+                start: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Common.cancelFault.operation,
+                cmdType: menuOperate.Common.cancelFault.cmdType,
+                param: {
+                    groupNumber: this.selected.code
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
                 }
@@ -302,231 +219,111 @@ export default {
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         },
-        nextStation() {
-            this.trainSend(menuOperate.Driver.driveAhead);
-        },
-        routeBlockRun() {
-            this.trainSend(menuOperate.Driver.routeBlockDrive);
-        },
-        handleOverFuideSignal() {
-            this.trainSend(menuOperate.Driver.driveThroughTheGuideSignal);
-        },
-        handleOverEedLight() {
-            this.trainSend(menuOperate.Driver.driveThroughTheRedLight);
-        },
-        trainSend(type) {
-            const param = {
-                groupNumber: this.selected.code
-            };
-            commitOperate(type, param, 3).then(({valid, operate})=>{
-            }).catch((error) => {
-                console.error(error);
-                this.$refs.noticeInfo.doShow();
-            });
-        },
         handleSpeedLimit() { // 限速指令
             this.$refs.speedLimit.doShow(this.selected);
         },
-        // 限速行驶
-        limitSpeed() {
-            const operate = {
-                start: true,
-                send: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.limitSpeed.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            }).catch(() => {
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        // 设置计划车
-        // setPlanTrain() {
-        // 	const operate = {
-        // 		start: true,
-        // 		code: this.selected.code,
-        // 		operation: OperationEvent.Train.editTrainId.menu.operation,
-        // 		param: {}
-        // 	};
-        // 	this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        // 		if (valid) {
-        // 			this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        // 			this.$refs.trainSetPlan.doShow(operate, this.selected);
-        // 		}
-        // 	});
-        // },
-        // 设计划车
-        setPlanTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.setPlanTrainId.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            });
-        },
-        // 设目的地车
-        destinationTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.destinationTrainId.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            });
-        },
-        // 设人工车
-        artificialTrainId() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.artificialTrainId.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainControl.doShow(operate, this.selected);
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            });
-        },
-        // 详细列车信息
-        detailTrainInfo() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.detailTrainInfo.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDetailInfo.doShow(operate, this.selected);
-                } else {
-                    this.$refs.noticeInfo.doShow();
-                }
-            });
-        },
-        // 创建车组号
-        createTrainNo() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.createTrainNo.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainCreateNumber.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 删除车组号
-        deleteTrainNo() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.deleteTrainNo.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDeleteNumber.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 修改车组号
-        editTrainNo() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.editTrainNo.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainEditNumber.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 移动车组号
-        moveTrainNo() {
-            const operate = {
-                start: true,
-                code: this.selected.code,
-
-                operation: OperationEvent.Train.moveTrainNo.menu.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainMoveNumber.doShow(operate, this.selected);
-                }
-            });
-        },
         handlerApplyAmcMode() {
-            commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_C' }, 3).then(({ valid, operate }) => {
-            }).catch((error) => {
-                console.error(error);
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Driver.changePreselectionMode.operation,
+                cmdType: menuOperate.Driver.changePreselectionMode.cmdType,
+                param: {
+                    groupNumber: this.selected.code,
+                    preselectionMode: 'AM_C'
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
         handlerApplySmcMode() {
-            commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'SM_C' }, 3).then(({ valid, operate }) => {
-            }).catch((error) => {
-                console.error(error);
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Driver.changePreselectionMode.operation,
+                cmdType: menuOperate.Driver.changePreselectionMode.cmdType,
+                param: {
+                    groupNumber: this.selected.code,
+                    preselectionMode: 'SM_C'
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+            }).catch(e=> {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
         handlerApplyAmiMode() {
-            commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => {
-            }).catch((error) => {
-                console.error(error);
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Driver.changePreselectionMode.operation,
+                cmdType: menuOperate.Driver.changePreselectionMode.cmdType,
+                param: {
+                    groupNumber: this.selected.code,
+                    preselectionMode: 'AM_I'
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
         handlerApplySmiMode() {
-            commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'AM_I' }, 3).then(({ valid, operate }) => {
-            }).catch((error) => {
-                console.error(error);
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Driver.changePreselectionMode.operation,
+                cmdType: menuOperate.Driver.changePreselectionMode.cmdType,
+                param: {
+                    groupNumber: this.selected.code,
+                    preselectionMode: 'SM_I'
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
         handlerApplyRmMode() {
-            commitOperate(menuOperate.Driver.changePreselectionMode, { groupNumber: this.selected.code, preselectionMode: 'RM' }, 3).then(({ valid, operate }) => {
-            }).catch((error) => {
-                console.error(error);
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Driver.changePreselectionMode.operation,
+                cmdType: menuOperate.Driver.changePreselectionMode.cmdType,
+                param: {
+                    groupNumber: this.selected.code,
+                    preselectionMode: 'RM'
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
         // 驾驶（托管）
         handleDriveTo() {
-            commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
+            const operate = {
+                start: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Driver.changePreselectionMode.operation,
+                cmdType: menuOperate.Driver.changePreselectionMode.cmdType,
+                param: {
+                    code: this.selected.code
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
                 }
@@ -534,41 +331,71 @@ export default {
         },
         // 换端操作
         turnDirection() {
-            commitOperate(menuOperate.Train.turnDirection, { groupNumber: this.selected.groupNumber }, 3).then(({valid, operate})=>{
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Train.turnDirection.operation,
+                cmdType: menuOperate.Train.turnDirection.cmdType,
+                param: {
+                    groupNumber: this.selected.groupNumber
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
-            }).catch((error)=> {
-                console.error(error);
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
-        // handleDepartTrain() {
-        //     commitOperate( menuOperate.Driver.departTrain, { groupNumber: this.selected.code }, 3).then(({valid, operate}) => {
-        //     }).catch((error)=> {
-        //         console.error(error);
-        //         this.$refs.noticeInfo.doShow();
-        //     });
-        // },
         handleParkingTrain() {
-            commitOperate(menuOperate.Train.driverStop, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
+            const operate = {
+                start: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Train.driverStop.operation,
+                cmdType: menuOperate.Train.driverStop.cmdType,
+                param: {
+                    groupNumber: this.selected.groupNumber
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$refs.trainStop.doShow(operate, this.selected);
                 }
             });
         },
         modifyTripNumber() {
-            commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
+            const operate = {
+                start: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Train.updateTrip.operation,
+                cmdType: menuOperate.Train.updateTrip.cmdType,
+                param: {
+                    groupNumber: this.selected.groupNumber
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$refs.updateTrip.doShow(operate, this.selected.tripNumber);
                 }
             });
         },
         removeTripNumber() {
-            commitOperate(menuOperate.Train.removeTrip, {groupNumber:this.selected.groupNumber}, 3).then(({valid, operate})=>{
-                // if (valid) {}
-            }).catch((error)=> {
-                console.error(error);
+            const operate = {
+                start: true,
+                over: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation: menuOperate.Train.removeTrip.operation,
+                cmdType: menuOperate.Train.removeTrip.cmdType,
+                param: {
+                    groupNumber: this.selected.groupNumber
+                }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+            }).catch(e => {
+                console.error(e);
                 this.$refs.noticeInfo.doShow();
             });
         },
diff --git a/src/jmapNew/theme/datie_02/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_02/menus/passiveDialog/alarm.vue
deleted file mode 100644
index afbff9ddc..000000000
--- a/src/jmapNew/theme/datie_02/menus/passiveDialog/alarm.vue
+++ /dev/null
@@ -1,216 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm alarm-detail"
-    :title="level+'级告警详细信息'"
-    :visible.sync="show"
-    width="760px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <el-form label-width="80px" size="mini">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="线路名称">
-            <el-input v-model="model.lineName" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="单位名称">
-            <el-input v-model="model.unitName" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="模块名称">
-            <el-input v-model="model.moduleName" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="9">
-          <el-form-item label="报警时间">
-            <el-date-picker v-model="model.alarmDate" type="datetime" placeholder="选择日期时间" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="7">
-          <el-form-item>
-            <span slot="label">等&emsp;级</span>
-            <el-input v-model="model.level" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="确认状态">
-            <el-input v-model="model.confirm" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="9" class="alarm-type">
-          <el-form-item>
-            <span slot="label">类&emsp;&emsp;型</span>
-            <el-input v-model="model.type" disabled />
-          </el-form-item>
-        </el-col>
-        <el-col :span="15" class="alarm-child-type">
-          <el-form-item label="子类型">
-            <el-input v-model="model.childType" disabled />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="时间摘要">
-        <el-input v-model="model.timeSummary" disabled />
-      </el-form-item>
-      <el-form-item label="推荐操作">
-        <el-input v-model="model.recommendedOperation" disabled />
-      </el-form-item>
-      <div class="alarm-detail-description">
-        <span> 报警详细描述</span><br>
-        <el-input v-model="model.alarmDetail" type="textarea" :rows="5" placeholder="请输入内容" disabled />
-      </div>
-    </el-form>
-    <el-row class="button-group">
-      <el-col :span="3" :offset="9">
-        <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确 定</el-button>
-      </el-col>
-      <el-col :span="10">
-        <span style="line-height:26px">未确认{{ level }}级报警数目：1</span>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
-export default {
-    name: 'AlarmDetail',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            level: 0,
-            operate: null,
-            controlProps: {
-                '01': '中控',
-                '02': '站控'
-            },
-            model: {
-                lineName: '',
-                unitName: '',
-                moduleName: '',
-                level: '',
-                confirm: '',
-                alarmDate: '',
-                type: '',
-                childType: '',
-                timeSummary: '',
-                recommendedOperation: '',
-                alarmDetail: ''
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'name'
-        ]),
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-        }
-    },
-    watch: {
-        // '$store.state.socket.msgHead': function (elem) {
-        //     if (elem && elem.hasOwnProperty('success')) {
-        //         if (elem.success) {
-        //             const operate = this.$store.state.training.operate;
-        //             console.log(elem);
-        //             elem.stationCodes.forEach(stationCode => {
-        //                 const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes);
-        //                 const newOperate = {
-        //                     type: operate.type,
-        //                     name: station.name
-        //                 };
-
-        //                 this.doShow(newOperate);
-        //             });
-        //         }
-        //     }
-        // }
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.model = {
-                lineName: this.name,
-                unitName: this.operate.name,
-                moduleName: 'CMM控制模式转换模式',
-                level: '0级告警',
-                confirm: '确认状态',
-                alarmDate: new Date(),
-                type: '系统事件',
-                childType: '依据信号设备操作命令设置控制模式',
-                timeSummary: '控制模式摘要',
-                recommendedOperation: '',
-                alarmDetail: `控制模式转换：${this.operate.name}由中控转为站控模式！`
-            };
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            if (this.dialogShow) {
-                this.$store.dispatch('socket/shiftMsgQueue');
-            }
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.alarm.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.alarm.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        isClose() {
-            return this.dialogShow;
-        }
-    }
-};
-
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .alarm-type .el-input {
-        width: 220px;
-    }
-
-    .alarm-detail-description {
-        padding-left: 12px;
-        text-align: left;
-    }
-</style>
diff --git a/src/jmapNew/theme/datie_02/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/datie_02/menus/passiveDialog/timeout.vue
deleted file mode 100644
index e4ef062a6..000000000
--- a/src/jmapNew/theme/datie_02/menus/passiveDialog/timeout.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="chengdou-03__systerm cmd-notice"
-    title="操作命令提示"
-    :visible.sync="show"
-    width="400px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <span>{{ name }}，{{ msg }}!</span>
-    <el-row class="button-group">
-      <el-button :id="domIdCancel" type="primary" :loading="loading" @click="commit">确认</el-button>
-    </el-row>
-  </el-dialog>
-</template>
-
-<script>
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-export default {
-    name: 'CmdNotice',
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            operate: null,
-            name: '',
-            msg: ''
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.notice.domId : '';
-        }
-    },
-    watch: {
-        // '$store.state.socket.msgHead': function (elem) {
-        //     if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
-        //         let operate = this.$store.state.training.operate;
-        //         let control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-        //         let station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-        //         let newOperate = {
-        //             type: operate.type,
-        //             name: station.name,
-        //         }
-
-        //         if (elem.timeout) {
-        //             newOperate['msg'] = '请求超时';
-        //             this.doShow(newOperate);
-        //         } else if (!elem.success) {
-        //             newOperate['msg'] = '请求拒绝';
-        //             this.doShow(newOperate);
-        //         }
-        //     }
-        // },
-    },
-    methods: {
-        doShow(operate) {
-            this.operate = operate || {};
-            this.name = this.operate.name || '';
-            this.msg = this.operate.msg || '';
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            if (this.dialogShow) {
-                this.$store.dispatch('socket/shiftMsgQueue');
-            }
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.notice.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        commit() {
-            const operate = {
-                type: this.operate.type,
-                operation: OperationEvent.Command.close.notice.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
-        isClose() {
-            return this.dialogShow;
-        }
-    }
-};
-
-</script>
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/addSpareTrain.vue
index f2964cbb2..834dc4b1e 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/addSpareTrain.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/addSpareTrain.vue
@@ -180,7 +180,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControl.vue
index d298f8bc1..e7a5aba01 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControl.vue
@@ -104,7 +104,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -121,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControlSpeed.vue
index d49556383..b92e21bb0 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -114,7 +114,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -133,7 +133,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/datie_jd1a/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmTrain.vue
index 494347b75..110e01e50 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/confirmTrain.vue
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/passwordInputBox.vue
index eec77511b..5ca94d531 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/passwordInputBox.vue
@@ -164,7 +164,7 @@ export default {
                 operation: OperationEvent.Command.cancel.password.operation
             };
             this.$emit('checkCancel');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/popupAlarm.vue
index b6b925622..33b7e455b 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/childDialog/popupAlarm.vue
@@ -75,7 +75,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
index 2d2491d3f..40ef237e1 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/defectiveShunting.vue
@@ -101,7 +101,7 @@ export default {
                     shuntingTypeList:shuntingTypeList
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -113,7 +113,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/deleteRunplan.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/deleteRunplan.vue
index 0b9134b52..602905d0c 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/deleteRunplan.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/deleteRunplan.vue
@@ -87,7 +87,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyAdjacentStation.vue
index 53bf85a71..1da00722b 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyAdjacentStation.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyAdjacentStation.vue
@@ -132,7 +132,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyTripNumber.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyTripNumber.vue
index dd92fc91d..5348e84ed 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyTripNumber.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/modifyTripNumber.vue
@@ -181,7 +181,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeDetail.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeDetail.vue
index b7211c025..b3e6a5282 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeDetail.vue
@@ -167,7 +167,7 @@ export default {
                 operation: OperationEvent.Signal.detail.menu.operation
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -183,7 +183,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeGuide.vue
index 11cba9131..38a9d8c78 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeGuide.vue
@@ -201,7 +201,7 @@ export default {
                     operation: OperationEvent.Signal.guide.choose.operation,
                     val: row.code
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -221,7 +221,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -241,7 +241,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue
index 69ce0d572..09860a94d 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeHandControl.vue
@@ -208,7 +208,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -256,7 +256,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection.vue
index 12014afb3..de45a16dd 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection.vue
@@ -247,7 +247,7 @@ export default {
                     val: row.code
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -289,7 +289,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection1.vue
index c34eb1e49..23d39b9c2 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection1.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/routeSelection1.vue
@@ -255,7 +255,7 @@ export default {
                         val: route.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -286,7 +286,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/sectionDetail.vue
index 7e6a03371..f15df91a8 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/sectionDetail.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/sectionDetail.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Section.detail.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/sendRunplan.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/sendRunplan.vue
index 26e4fb5dd..ce7b72fba 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/sendRunplan.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/sendRunplan.vue
@@ -226,7 +226,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/stageRunplan.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/stageRunplan.vue
index 6a55e1b49..1e4c045c4 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/stageRunplan.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/stageRunplan.vue
@@ -170,7 +170,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/standControl.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/standControl.vue
index c6c29c830..263ac2925 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/standControl.vue
@@ -514,7 +514,7 @@ export default {
             this.handleBreak(operate);
         },
         handleBreak(operate) { // 断点记录
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 valid && this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -580,7 +580,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/standDetail.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/standDetail.vue
index efe048e52..cd5928315 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/standDetail.vue
@@ -185,7 +185,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -199,7 +199,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainControl.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainControl.vue
index 738d9509e..9f3096d8f 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainControl.vue
@@ -246,7 +246,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -270,7 +270,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -294,7 +294,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -313,7 +313,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreate.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreate.vue
index 59f7935b6..23f18154c 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreate.vue
@@ -104,7 +104,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreateNumber.vue
index e56f2f80d..d86b850d3 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreateNumber.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainCreateNumber.vue
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDelete.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDelete.vue
index 895d6024c..e075016e8 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDelete.vue
@@ -118,7 +118,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDeleteNumber.vue
index 210e2dc87..57cfde74f 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDeleteNumber.vue
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDetailInfo.vue
index 907727139..d3a11dc35 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDetailInfo.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainDetailInfo.vue
@@ -353,7 +353,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainEditNumber.vue
index 570e22144..adca22a83 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainEditNumber.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMove.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMove.vue
index 82c84dc13..0075a4d86 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMove.vue
@@ -158,7 +158,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMoveNumber.vue
index 7e7635d23..bdfaa11fc 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMoveNumber.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainMoveNumber.vue
@@ -147,7 +147,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSetPlan.vue
index 17421e391..7eab351c5 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSetPlan.vue
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSwitch.vue
index 583e53d8e..20a0b7ed0 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/trainSwitch.vue
@@ -166,7 +166,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -188,7 +188,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_jd1a/menus/dialog/updateTrip.vue
index 49a60e088..1521075c7 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/dialog/updateTrip.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/dialog/updateTrip.vue
@@ -118,7 +118,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuBar.vue b/src/jmapNew/theme/datie_jd1a/menus/menuBar.vue
index d16b8bc18..32211d046 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuBar.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuBar.vue
@@ -265,7 +265,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.helpAbout.doShow(operate);
@@ -285,7 +285,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.setLimitSpeed.doShow(operate, true);
@@ -299,7 +299,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.setLimitSpeed.doShow(operate, false);
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
index 2269f4008..ef595b5c1 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuButton.vue
@@ -211,7 +211,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler'
-import Handler from '@/scripts/cmdPlugin/Handler'
+// import Handler from '@/scripts/cmdPlugin/Handler'
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue'
 import DefectiveShunting from './dialog/defectiveShunting.vue'
 import CMD from '@/scripts/cmdPlugin/CommandEnum'
@@ -427,7 +427,7 @@ export default {
     // 执行操作
     trainingOperation(operate) {
       this.$store
-        .dispatch('training/nextNew', operate)
+        .dispatch('trainingNew/next', operate)
         .then(({ valid }) => {
           if (valid) {
             /* 引导总锁输入面后 处理按钮选中状态 */
@@ -481,7 +481,7 @@ export default {
         param: { stationCode: this.$store.state.map.showCentralizedStationCode },
       }
       this.$store
-        .dispatch('training/nextNew', operate)
+        .dispatch('trainingNew/next', operate)
         .then(({ valid }) => {
           if (valid) {
             this.clearOperate()
@@ -506,7 +506,7 @@ export default {
       const operate = {
         operation: this.Station.stationMasterLock.leftButton.operation,
       }
-      this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+      this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         if (valid) {
           // 引导总锁弹出 调用取消引导总锁指令
           operate.nextCmdType = this.sGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK
@@ -522,7 +522,7 @@ export default {
       const operate = {
         operation: this.Station.stationMasterLock.rightButton.operation,
       }
-      this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+      this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         if (valid) {
           // 引导总锁弹出 调用取消引导总锁指令
           operate.nextCmdType = this.xGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK
@@ -546,7 +546,7 @@ export default {
           this.Section.fault.button.operation,
           this.Section.defectiveShunting.button.operation,
         ]
-        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
           if (valid) {
             this.operation = operation
             this.commandTypeList = commandTypeList
@@ -567,7 +567,7 @@ export default {
           start: true,
           operation: operation,
         }
-        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
           if (valid) {
             this.commandTypeList = []
             this.$store.dispatch('menuOperation/setButtonOperation', null)
@@ -615,7 +615,7 @@ export default {
         // 排列进路 处理始端信号机状态
         operate.code = deviceList[0].code
         this.$store
-          .dispatch('training/nextNew', operate)
+          .dispatch('trainingNew/next', operate)
           .then(({ valid, response }) => {
             if (valid) {
               // 仅信号按钮调车信号机有状态
@@ -635,7 +635,7 @@ export default {
         operate.code = signal.code
         operate.param = { signalCode: signal.code }
         this.$store
-          .dispatch('training/nextNew', operate)
+          .dispatch('trainingNew/next', operate)
           .then(({ valid, response }) => {
             this.clearOperate()
           })
@@ -652,7 +652,7 @@ export default {
           operate.code = deviceList[deviceList.length - 1].code
           operate.param = { routeCode: route.code }
           this.$store
-            .dispatch('training/nextNew', operate)
+            .dispatch('trainingNew/next', operate)
             .then(({ valid, response }) => {
               this.deviceTimeNode = 0
             })
@@ -678,7 +678,7 @@ export default {
         },
       }
       this.$store
-        .dispatch('training/nextNew', operate)
+        .dispatch('trainingNew/next', operate)
         .then(({ valid, response }) => {
           this.clearOperate()
         })
@@ -742,7 +742,7 @@ export default {
     // 发送指令
     sendCommand(operate) {
       this.$store
-        .dispatch('training/nextNew', operate)
+        .dispatch('trainingNew/next', operate)
         .then(({ valid, response }) => {})
         .catch(error => {
           console.error(error)
@@ -950,7 +950,7 @@ export default {
           { code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0 },
         ])
       this.deviceList = []
-      Handler.clear() // 清空操作组
+      // Handler.clear() // 清空操作组
       this.$store.dispatch('menuOperation/setButtonOperation', null)
       // this.pressedSignalButton && this.pressedSignalButton.instance.pressDown(false)
       // this.pressedSignalButton = null
@@ -1036,7 +1036,7 @@ export default {
           cmdType: noPasswordModelTypeMap[model.type].nextCmdType,
         }
         this.$store
-          .dispatch('training/nextNew', operate)
+          .dispatch('trainingNew/next', operate)
           .then(({ valid }) => {
             if (valid) {
               this.clearOperate()
@@ -1055,7 +1055,7 @@ export default {
           param: modelTypeMap[model.type].param,
         }
         this.$store
-          .dispatch('training/nextNew', operate)
+          .dispatch('trainingNew/next', operate)
           .then(({ valid }) => {
             if (valid) {
               operate.nextCmdType = modelTypeMap[model.type].nextCmdType
@@ -1078,7 +1078,7 @@ export default {
       //         stationCode:model.stationCode
       //     }
       // };
-      // this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+      // this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
       //     // this.clearOperate();
       // }).catch((error) => {
       //     // this.clearOperate();
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
index cc7308548..229c7f115 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuButtonCtc.vue
@@ -120,7 +120,7 @@
 import PopMenu from '@/components/PopMenu';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import TrainRoute from './dialog/trainRoute.vue';
 import ShuntRoute from './dialog/shuntRoute.vue';
@@ -334,7 +334,7 @@ export default {
         },
         // 执行操作
         trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -368,7 +368,7 @@ export default {
             const operate = {
                 operation: this.Switch.guideLock.leftButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_UNBLOCK;
@@ -384,7 +384,7 @@ export default {
             const operate = {
                 operation: this.Switch.guideLock.rightButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_UNBLOCK;
@@ -407,7 +407,7 @@ export default {
                     this.Section.fault.button.operation,
                     this.Signal.guide.button.operation
                 ];
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.operation = operation;
                         this.commandTypeList = commandTypeList;
@@ -428,7 +428,7 @@ export default {
                     start: true,
                     operation: operation
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.commandTypeList = [];
                         this.$store.dispatch('menuOperation/setButtonOperation', null);
@@ -466,7 +466,7 @@ export default {
                 code: device.code,
                 param: { signalCode: device.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {
             }).catch(() => this.$refs.noticeInfo.doShow() );
         },
         // 排列进路
@@ -482,7 +482,7 @@ export default {
             const signal = this.$store.getters['map/getDeviceByCode'](deviceList[0].signalCode || deviceList[0].code);// deviceList[0] 为 SignalButton || Signal
             if (deviceList.length === 1 && !signal.routeLock) { // 排列进路 处理始端信号机状态
                 operate.code = deviceList[0].code;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         // 仅信号按钮调车信号机有状态
                         if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) {
@@ -502,7 +502,7 @@ export default {
                     operate.code = deviceList[deviceList.length - 1].code;
                     operate.param = {routeCode: route.code};
                     this.route = route;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                         this.deviceTimeNode = 0;
                         this.$store.dispatch('training/updateMapState',
                             [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}, {code: this.deviceList[1].code, _type: this.deviceList[1]._type, hasSelected: 1}]);
@@ -521,7 +521,7 @@ export default {
                         operate.code = deviceList[deviceList.length - 1].code;
                         operate.param = {routeCode: route.code};
                         this.route = route;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                             this.deviceTimeNode = 0;
                             this.$store.dispatch('training/updateMapState',
                                 [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}, {code: this.deviceList[1].code, _type: this.deviceList[1]._type, hasSelected: 1}]);
@@ -543,7 +543,7 @@ export default {
                     signalCode: model._type === 'Signal' ? model.code : model.signalCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -555,7 +555,7 @@ export default {
                 operation: this.Signal.guide.button.operation,
                 param: {signalCode: model.signalCode}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, hasSelected: 1}]);
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -569,7 +569,7 @@ export default {
                 val: model.code,
                 param: { signalCode: model.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -580,14 +580,14 @@ export default {
                 operation: this.$store.state.menuOperation.buttonOperation,
                 param: { switchCode: model.code}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
         // 发送指令
         sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             }).finally(() =>{ this.clearOperate(); });
@@ -639,7 +639,7 @@ export default {
                 operation: this.Signal.guide.button.operation,
                 param: {signalCode: model.signalCode}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch((e) => {
                 this.$refs.noticeInfo.doShow();
                 this.clearOperate();
@@ -723,12 +723,12 @@ export default {
             this.$store.dispatch('training/updateMapState', deviceState);
             this.deviceList = [];
             this.menuSignal = null;
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', this.operation);
         },
         routeCommit(trainCode, duration) {
             const operate = {over: true, cmdType: CMD.CTC.CTC_SET_ROUTE, param:{ tripNumber: trainCode || '', duration: duration >= 0 ? duration : null, force: false }};
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.clearOperate();
             }).catch((e) => {
                 console.log(e, 'error');
@@ -747,7 +747,7 @@ export default {
                 }
             } else if (this.operation === OperationEvent.MixinCommand.totalCancel.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     this.clearOperate();
                 }).catch((e) => {
                     this.$refs.noticeInfo.doShow();
@@ -755,7 +755,7 @@ export default {
                 });
             } else if (this.operation === OperationEvent.Signal.reopenSignal.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     this.clearOperate();
                 }).catch(() => {
                     this.$refs.noticeInfo.doShow();
@@ -763,7 +763,7 @@ export default {
                 });
             } else if (this.operation === OperationEvent.Signal.guide.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
                     this.clearOperate();
                 }).catch(() => {
@@ -773,13 +773,13 @@ export default {
                 });
             } else if (this.operation === OperationEvent.Signal.humanTrainRoute.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 }).catch((e) => {
                     this.$refs.noticeInfo.doShow();
                 }).finally(() => { this.clearOperate(); });
             } else if (this.switchOperation.includes(this.operation)) {
                 const operate = {over:true, cmdType: this.cmdType};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 }).catch(() => {
                     this.$refs.noticeInfo.doShow();
                 }).finally(() => { this.clearOperate(); });
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/twoConfirmation.vue
index c1f7b93a3..5068abbbf 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -90,7 +90,7 @@ export default {
             };
 
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -117,7 +117,7 @@ export default {
                 this.loading = true;
                 this.doClose();
                 this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         this.loading = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userAdd.vue
index 6c98c5a53..9094641d7 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userAdd.vue
@@ -114,7 +114,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid) {
                                 if (this.model.password === this.model.confirm) {
@@ -136,7 +136,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userDelete.vue
index e64aa49f3..b634b2eac 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userDelete.vue
@@ -91,7 +91,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -108,7 +108,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userEdit.vue
index b03165a1b..dcca966bb 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/childDialog/userEdit.vue
@@ -127,7 +127,7 @@
                         }
 
                         this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                             this.loading = false;
                             if (valid)
                                 if (this.selected.password !== this.model.oldPassword) {
@@ -152,7 +152,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue
index 4dc26a4ce..e88828975 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/helpAbout.vue
@@ -89,7 +89,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -105,7 +105,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/limitSpeed.vue
index e416e68e0..82a113010 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/limitSpeed.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/limitSpeed.vue
@@ -95,7 +95,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/manageUser.vue
index deef68f43..daa8cc237 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/manageUser.vue
@@ -130,7 +130,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userAdd.doShow(operate);
@@ -148,7 +148,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userEdit.doShow(operate, this.selected);
@@ -170,7 +170,7 @@
                     }
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.$refs.userDelete.doShow(operate, this.selected);
@@ -190,7 +190,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                 }).catch(error => {
                     this.loading = false;
@@ -204,7 +204,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.selected = row;
                 }).catch(error => {
@@ -218,7 +218,7 @@
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -234,7 +234,7 @@
                     operation: OperationEvent.Command.cancel.menu.operation,
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.doClose();
                     }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/passwordBox.vue
index 69fa03d70..1af1e9114 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/passwordBox.vue
@@ -122,7 +122,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -140,7 +140,7 @@ export default {
 
             if (this.model.password == '123456') {
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/routeCancel.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/routeCancel.vue
index 8a403be7f..22d889ac4 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/routeCancel.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/routeCancel.vue
@@ -117,7 +117,7 @@
 				const operate = {
 					operation: OperationEvent.Command.close.menu.operation
 				};
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+				this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
 					if (valid) {
 						this.doClose();
 					}
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/setLimitSpeed.vue
index dfb5821b3..6ebe22260 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/setLimitSpeed.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/setLimitSpeed.vue
@@ -222,7 +222,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -244,7 +244,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/stationControlConvert.vue
index 046b66327..75139bf30 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/stationControlConvert.vue
@@ -285,7 +285,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -326,7 +326,7 @@ export default {
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -351,7 +351,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -378,7 +378,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -405,7 +405,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainAdd.vue
index fba049a10..93227cf2f 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainAdd.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainDelete.vue
index b1139915a..e622ae48a 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainDelete.vue
@@ -108,7 +108,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -130,7 +130,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainTranstalet.vue
index 97918ae44..f50209b87 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/trainTranstalet.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/viewName.vue b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/viewName.vue
index 4a32473d5..808210bde 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuDialog/viewName.vue
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue
index d5d3702f8..8ea9cd159 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuSection.vue
@@ -195,7 +195,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue b/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue
index ed63959c9..deb43ec46 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuSignal.vue
@@ -367,7 +367,7 @@ export default {
             const step = {
                 operation: data.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     switch (data.operation) {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue b/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
index 0dec74176..3d6191e8c 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuStation.vue
@@ -199,7 +199,7 @@ export default {
                     param: data.param
                 };
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue b/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
index 8dafb5bef..67d61edb4 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuStationStand.vue
@@ -17,7 +17,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -121,7 +121,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
index 599015882..e31dda637 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/menuTrain.vue
@@ -32,7 +32,7 @@ import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
 
@@ -245,7 +245,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
@@ -320,7 +320,7 @@ export default {
 
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -338,7 +338,7 @@ export default {
         // 		operation: OperationEvent.Train.editTrainId.menu.operation,
         // 		param: {}
         // 	};
-        // 	this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        // 	this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         // 		if (valid) {
         // 			this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         // 			this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -353,7 +353,7 @@ export default {
 
                 operation: OperationEvent.Train.setPlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -370,7 +370,7 @@ export default {
 
                 operation: OperationEvent.Train.destinationTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -387,7 +387,7 @@ export default {
 
                 operation: OperationEvent.Train.artificialTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -404,7 +404,7 @@ export default {
 
                 operation: OperationEvent.Train.detailTrainInfo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
@@ -421,7 +421,7 @@ export default {
 
                 operation: OperationEvent.Train.createTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainCreateNumber.doShow(operate, this.selected);
@@ -436,7 +436,7 @@ export default {
 
                 operation: OperationEvent.Train.deleteTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeleteNumber.doShow(operate, this.selected);
@@ -451,7 +451,7 @@ export default {
 
                 operation: OperationEvent.Train.editTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(operate, this.selected);
@@ -466,7 +466,7 @@ export default {
 
                 operation: OperationEvent.Train.moveTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveNumber.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue
index afbff9ddc..1484294d7 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/alarm.vue
@@ -176,7 +176,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -188,7 +188,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/timeout.vue
index e4ef062a6..9c0b3543d 100644
--- a/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/datie_jd1a/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue
index f2964cbb2..834dc4b1e 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/addSpareTrain.vue
@@ -180,7 +180,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue
index d298f8bc1..e7a5aba01 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControl.vue
@@ -104,7 +104,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -121,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue
index d49556383..b92e21bb0 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmControlSpeed.vue
@@ -114,7 +114,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -133,7 +133,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/datie_ksk/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTrain.vue
index 494347b75..110e01e50 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/confirmTrain.vue
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue
index eec77511b..5ca94d531 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/passwordInputBox.vue
@@ -164,7 +164,7 @@ export default {
                 operation: OperationEvent.Command.cancel.password.operation
             };
             this.$emit('checkCancel');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue
index b6b925622..33b7e455b 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/childDialog/popupAlarm.vue
@@ -75,7 +75,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
index 2d2491d3f..40ef237e1 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/defectiveShunting.vue
@@ -101,7 +101,7 @@ export default {
                     shuntingTypeList:shuntingTypeList
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -113,7 +113,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue
index 0b9134b52..602905d0c 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/deleteRunplan.vue
@@ -87,7 +87,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue
index 53bf85a71..1da00722b 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyAdjacentStation.vue
@@ -132,7 +132,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue
index dd92fc91d..5348e84ed 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/modifyTripNumber.vue
@@ -181,7 +181,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue
index b7211c025..b3e6a5282 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeDetail.vue
@@ -167,7 +167,7 @@ export default {
                 operation: OperationEvent.Signal.detail.menu.operation
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -183,7 +183,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue
index 11cba9131..38a9d8c78 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeGuide.vue
@@ -201,7 +201,7 @@ export default {
                     operation: OperationEvent.Signal.guide.choose.operation,
                     val: row.code
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -221,7 +221,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -241,7 +241,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue
index 69ce0d572..09860a94d 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeHandControl.vue
@@ -208,7 +208,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -256,7 +256,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue
index 12014afb3..de45a16dd 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection.vue
@@ -247,7 +247,7 @@ export default {
                     val: row.code
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -289,7 +289,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue
index c34eb1e49..23d39b9c2 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/routeSelection1.vue
@@ -255,7 +255,7 @@ export default {
                         val: route.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -286,7 +286,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue
index 7e6a03371..f15df91a8 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/sectionDetail.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Section.detail.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue
index 26e4fb5dd..ce7b72fba 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/sendRunplan.vue
@@ -226,7 +226,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue
index 6a55e1b49..1e4c045c4 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/stageRunplan.vue
@@ -170,7 +170,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue
index e8c96940f..bb98ef213 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/standControl.vue
@@ -514,7 +514,7 @@ export default {
             this.handleBreak(operate);
         },
         handleBreak(operate) { // 断点记录
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 valid && this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -580,7 +580,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue
index efe048e52..cd5928315 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/standDetail.vue
@@ -185,7 +185,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -199,7 +199,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue
index 738d9509e..9f3096d8f 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainControl.vue
@@ -246,7 +246,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -270,7 +270,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -294,7 +294,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -313,7 +313,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue
index 59f7935b6..23f18154c 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreate.vue
@@ -104,7 +104,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue
index e56f2f80d..d86b850d3 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainCreateNumber.vue
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue
index 99797f879..7953e7020 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDelete.vue
@@ -118,7 +118,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue
index 210e2dc87..57cfde74f 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDeleteNumber.vue
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue
index 907727139..d3a11dc35 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainDetailInfo.vue
@@ -353,7 +353,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue
index 570e22144..adca22a83 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainEditNumber.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue
index 82c84dc13..0075a4d86 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMove.vue
@@ -158,7 +158,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue
index 7e7635d23..bdfaa11fc 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainMoveNumber.vue
@@ -147,7 +147,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue
index 30383b617..c40926ea4 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSetPlan.vue
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue
index b0d3731d4..47867f640 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/trainSwitch.vue
@@ -164,7 +164,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -186,7 +186,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue
index 49a60e088..1521075c7 100644
--- a/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/dialog/updateTrip.vue
@@ -118,7 +118,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuBar.vue b/src/jmapNew/theme/datie_ksk/menus/menuBar.vue
index d16b8bc18..32211d046 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuBar.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuBar.vue
@@ -265,7 +265,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.helpAbout.doShow(operate);
@@ -285,7 +285,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.setLimitSpeed.doShow(operate, true);
@@ -299,7 +299,7 @@ export default {
             const operate = {
                 operation: order.operate
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.setLimitSpeed.doShow(operate, false);
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
index 3442cd328..4cd47cbb5 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuButton.vue
@@ -139,7 +139,7 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import DefectiveShunting from './dialog/defectiveShunting.vue';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -361,7 +361,7 @@ export default {
         },
         // 执行操作
         trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (operate.over) { this.clearOperate(); }
@@ -402,7 +402,7 @@ export default {
                 code: this.$store.state.map.showCentralizedStationCode,
                 param: { stationCode: this.$store.state.map.showCentralizedStationCode }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.clearOperate();
                 } else {
@@ -439,7 +439,7 @@ export default {
                     this.Switch.lock.button.operation,
                     this.MixinCommand.block.button.operation
                 ];
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.operation = operation;
                         this.commandTypeList = commandTypeList;
@@ -461,7 +461,7 @@ export default {
                     start: true,
                     operation: operation
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.commandTypeList = [];
                         this.$store.dispatch('menuOperation/setButtonOperation', null);
@@ -495,7 +495,7 @@ export default {
                 code: signal.code,
                 param: { signalCode: signal.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.clearOperate();
             }).catch(() => { this.$refs.noticeInfo.doShow(); this.clearOperate(); });
         },
@@ -519,7 +519,7 @@ export default {
             if (deviceList.length === 1 && !signal.lockedRouteCode) {
                 // 排列进路 处理始端信号机状态
                 operate.code = deviceList[0].code;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         // 仅信号按钮调车信号机有状态
                         if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) {
@@ -552,7 +552,7 @@ export default {
                     operate.code = deviceList[deviceList.length - 1].code;
                     operate.param = { routeCode: route.code };
                     this.$store
-                        .dispatch('training/nextNew', operate)
+                        .dispatch('trainingNew/next', operate)
                         .then(({ valid, response }) => {
                             this.deviceTimeNode = 0;
                         })
@@ -578,7 +578,7 @@ export default {
                 }
             };
             this.$store
-                .dispatch('training/nextNew', operate)
+                .dispatch('trainingNew/next', operate)
                 .then(({ valid, response }) => {
                     this.clearOperate();
                 })
@@ -597,7 +597,7 @@ export default {
                 cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
                 param: { signalCode: model.signalCode, _COUNT: model.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.$store.dispatch('training/updateMapState', [{ code: model.code, _type: model._type, toSelected: 1 }]);
             }).catch(error => {
                 console.error(error);
@@ -643,7 +643,7 @@ export default {
         },
         // 发送指令
         sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {})
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {})
                 .catch(error => {
                     console.error(error);
                     this.$refs.noticeInfo.doShow();
@@ -713,7 +713,7 @@ export default {
             } else if (model.labelEnum === 'S') {
                 nextCmdType = device.sGuideMasterLock ? CMD.Station.CMD_STATION_MASTER_UNLOCK : CMD.Station.CMD_STATION_MASTER_LOCK;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = nextCmdType;
@@ -875,7 +875,7 @@ export default {
         clearOperate() { // 清除操作
             this.clearSignalButton();
             this.deviceList = [];
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', null);
             this.operation = this.Signal.arrangementRoute.button.operation;
         },
@@ -977,7 +977,7 @@ export default {
                     param: noPasswordModelTypeMap[model.type].param,
                     cmdType: noPasswordModelTypeMap[model.type].nextCmdType
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.clearOperate();
                     } else {
@@ -994,7 +994,7 @@ export default {
                     code: model.code,
                     param: modelTypeMap[model.type].param
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         operate.nextCmdType = modelTypeMap[model.type].nextCmdType;
                         operate['operateNext'] = this.Command.close.password.operation;
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
index cc7308548..229c7f115 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuButtonCtc.vue
@@ -120,7 +120,7 @@
 import PopMenu from '@/components/PopMenu';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import PasswordBox from './dialog/childDialog/passwordInputBox.vue';
 import TrainRoute from './dialog/trainRoute.vue';
 import ShuntRoute from './dialog/shuntRoute.vue';
@@ -334,7 +334,7 @@ export default {
         },
         // 执行操作
         trainingOperation(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -368,7 +368,7 @@ export default {
             const operate = {
                 operation: this.Switch.guideLock.leftButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_UNBLOCK;
@@ -384,7 +384,7 @@ export default {
             const operate = {
                 operation: this.Switch.guideLock.rightButton.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     // 引导总锁弹出 调用取消引导总锁指令
                     operate.nextCmdType = CMD.Switch.CMD_SWITCH_MASTER_UNBLOCK;
@@ -407,7 +407,7 @@ export default {
                     this.Section.fault.button.operation,
                     this.Signal.guide.button.operation
                 ];
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.operation = operation;
                         this.commandTypeList = commandTypeList;
@@ -428,7 +428,7 @@ export default {
                     start: true,
                     operation: operation
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.commandTypeList = [];
                         this.$store.dispatch('menuOperation/setButtonOperation', null);
@@ -466,7 +466,7 @@ export default {
                 code: device.code,
                 param: { signalCode: device.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {
             }).catch(() => this.$refs.noticeInfo.doShow() );
         },
         // 排列进路
@@ -482,7 +482,7 @@ export default {
             const signal = this.$store.getters['map/getDeviceByCode'](deviceList[0].signalCode || deviceList[0].code);// deviceList[0] 为 SignalButton || Signal
             if (deviceList.length === 1 && !signal.routeLock) { // 排列进路 处理始端信号机状态
                 operate.code = deviceList[0].code;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         // 仅信号按钮调车信号机有状态
                         if (deviceList[0]._type === 'SignalButton' || (deviceList[0]._type === 'Signal' && deviceList[0].type === 'SHUNTING')) {
@@ -502,7 +502,7 @@ export default {
                     operate.code = deviceList[deviceList.length - 1].code;
                     operate.param = {routeCode: route.code};
                     this.route = route;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                         this.deviceTimeNode = 0;
                         this.$store.dispatch('training/updateMapState',
                             [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}, {code: this.deviceList[1].code, _type: this.deviceList[1]._type, hasSelected: 1}]);
@@ -521,7 +521,7 @@ export default {
                         operate.code = deviceList[deviceList.length - 1].code;
                         operate.param = {routeCode: route.code};
                         this.route = route;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                             this.deviceTimeNode = 0;
                             this.$store.dispatch('training/updateMapState',
                                 [{code: this.deviceList[0].code, _type: this.deviceList[0]._type, hasSelected: 0}, {code: this.deviceList[1].code, _type: this.deviceList[1]._type, hasSelected: 1}]);
@@ -543,7 +543,7 @@ export default {
                     signalCode: model._type === 'Signal' ? model.code : model.signalCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -555,7 +555,7 @@ export default {
                 operation: this.Signal.guide.button.operation,
                 param: {signalCode: model.signalCode}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.$store.dispatch('training/updateMapState', [{code: model.code, _type: model._type, hasSelected: 1}]);
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -569,7 +569,7 @@ export default {
                 val: model.code,
                 param: { signalCode: model.code }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -580,14 +580,14 @@ export default {
                 operation: this.$store.state.menuOperation.buttonOperation,
                 param: { switchCode: model.code}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
         // 发送指令
         sendCommand(operate) {
-            this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid, response}) => {}).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
             }).finally(() =>{ this.clearOperate(); });
@@ -639,7 +639,7 @@ export default {
                 operation: this.Signal.guide.button.operation,
                 param: {signalCode: model.signalCode}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
             }).catch((e) => {
                 this.$refs.noticeInfo.doShow();
                 this.clearOperate();
@@ -723,12 +723,12 @@ export default {
             this.$store.dispatch('training/updateMapState', deviceState);
             this.deviceList = [];
             this.menuSignal = null;
-            Handler.clear(); // 清空操作组
+            // Handler.clear(); // 清空操作组
             this.$store.dispatch('menuOperation/setButtonOperation', this.operation);
         },
         routeCommit(trainCode, duration) {
             const operate = {over: true, cmdType: CMD.CTC.CTC_SET_ROUTE, param:{ tripNumber: trainCode || '', duration: duration >= 0 ? duration : null, force: false }};
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 this.clearOperate();
             }).catch((e) => {
                 console.log(e, 'error');
@@ -747,7 +747,7 @@ export default {
                 }
             } else if (this.operation === OperationEvent.MixinCommand.totalCancel.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     this.clearOperate();
                 }).catch((e) => {
                     this.$refs.noticeInfo.doShow();
@@ -755,7 +755,7 @@ export default {
                 });
             } else if (this.operation === OperationEvent.Signal.reopenSignal.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     this.clearOperate();
                 }).catch(() => {
                     this.$refs.noticeInfo.doShow();
@@ -763,7 +763,7 @@ export default {
                 });
             } else if (this.operation === OperationEvent.Signal.guide.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     this.$store.dispatch('training/updateMapState', [{code: this.selected.code, _type: this.selected._type, hasSelected: 0}]);
                     this.clearOperate();
                 }).catch(() => {
@@ -773,13 +773,13 @@ export default {
                 });
             } else if (this.operation === OperationEvent.Signal.humanTrainRoute.button.operation) {
                 const operate = {over: true, cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 }).catch((e) => {
                     this.$refs.noticeInfo.doShow();
                 }).finally(() => { this.clearOperate(); });
             } else if (this.switchOperation.includes(this.operation)) {
                 const operate = {over:true, cmdType: this.cmdType};
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 }).catch(() => {
                     this.$refs.noticeInfo.doShow();
                 }).finally(() => { this.clearOperate(); });
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue
index c1f7b93a3..5068abbbf 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -90,7 +90,7 @@ export default {
             };
 
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -117,7 +117,7 @@ export default {
                 this.loading = true;
                 this.doClose();
                 this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-                this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                     if (valid) {
                         this.loading = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue
index b0ebdb408..6f8cde2a9 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue
index 6bda8340d..3ff63fd05 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue
index 35b11bbfa..240d4b1e6 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue
index 5bee2a166..ff9dbd0c8 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/helpAbout.vue
@@ -99,7 +99,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue
index e45a673c3..98f8585b9 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/limitSpeed.vue
@@ -95,7 +95,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue
index 56c92607c..07586b360 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(error => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(error => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue
index 69fa03d70..1af1e9114 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/passwordBox.vue
@@ -122,7 +122,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -140,7 +140,7 @@ export default {
 
             if (this.model.password == '123456') {
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue
index ef57c9cd2..52ba3ec47 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/routeCancel.vue
@@ -117,7 +117,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue
index 32dd83a21..1d1a06303 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/setLimitSpeed.vue
@@ -222,7 +222,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -244,7 +244,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue
index 046b66327..75139bf30 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/stationControlConvert.vue
@@ -285,7 +285,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -326,7 +326,7 @@ export default {
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -351,7 +351,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -378,7 +378,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -405,7 +405,7 @@ export default {
 
             this.disabledSure = true;
             this.disabledClose = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue
index fba049a10..93227cf2f 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainAdd.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue
index a27d71f29..786bad2e9 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainDelete.vue
@@ -108,7 +108,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -130,7 +130,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue
index 97918ae44..f50209b87 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/trainTranstalet.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue b/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue
index 4a32473d5..808210bde 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuDialog/viewName.vue
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue
index 3612d1f02..d76aaa65c 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuSection.vue
@@ -199,7 +199,7 @@ export default {
                     sectionCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
index ecd9aded5..820955653 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuSignal.vue
@@ -376,7 +376,7 @@ export default {
             const step = {
                 operation: data.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     switch (data.operation) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue
index 0dec74176..3d6191e8c 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuStation.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuStation.vue
@@ -199,7 +199,7 @@ export default {
                     param: data.param
                 };
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
index 8dafb5bef..67d61edb4 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuStationStand.vue
@@ -17,7 +17,7 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -121,7 +121,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
index fafd63ef0..324661ac7 100644
--- a/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/menuTrain.vue
@@ -33,7 +33,7 @@ import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
@@ -252,7 +252,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
             if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
@@ -336,7 +336,7 @@ export default {
 
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -354,7 +354,7 @@ export default {
         // 		operation: OperationEvent.Train.editTrainId.menu.operation,
         // 		param: {}
         // 	};
-        // 	this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        // 	this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         // 		if (valid) {
         // 			this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         // 			this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -369,7 +369,7 @@ export default {
 
                 operation: OperationEvent.Train.setPlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -386,7 +386,7 @@ export default {
 
                 operation: OperationEvent.Train.destinationTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -403,7 +403,7 @@ export default {
 
                 operation: OperationEvent.Train.artificialTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -420,7 +420,7 @@ export default {
 
                 operation: OperationEvent.Train.detailTrainInfo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
@@ -437,7 +437,7 @@ export default {
 
                 operation: OperationEvent.Train.createTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainCreateNumber.doShow(operate, this.selected);
@@ -452,7 +452,7 @@ export default {
 
                 operation: OperationEvent.Train.deleteTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeleteNumber.doShow(operate, this.selected);
@@ -467,7 +467,7 @@ export default {
 
                 operation: OperationEvent.Train.editTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(operate, this.selected);
@@ -482,7 +482,7 @@ export default {
 
                 operation: OperationEvent.Train.moveTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveNumber.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue
index afbff9ddc..1484294d7 100644
--- a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/alarm.vue
@@ -176,7 +176,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -188,7 +188,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue
index e4ef062a6..9c0b3543d 100644
--- a/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/datie_ksk/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainControl.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainControl.vue
index 738d9509e..9f3096d8f 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainControl.vue
@@ -246,7 +246,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -270,7 +270,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -294,7 +294,7 @@ export default {
                         val: ''
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.doClose();
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }).catch(() => {
@@ -313,7 +313,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainCreateNumber.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainCreateNumber.vue
index e56f2f80d..d86b850d3 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainCreateNumber.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainCreateNumber.vue
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainDeleteNumber.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainDeleteNumber.vue
index 210e2dc87..57cfde74f 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainDeleteNumber.vue
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo copy.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo copy.vue
index 907727139..d3a11dc35 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo copy.vue	
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo copy.vue	
@@ -353,7 +353,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo.vue
index 907727139..d3a11dc35 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainDetailInfo.vue
@@ -353,7 +353,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainEditNumber.vue
index 570e22144..adca22a83 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainEditNumber.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/trainMoveNumber.vue b/src/jmapNew/theme/datie_tky/menus/dialog/trainMoveNumber.vue
index 7e7635d23..bdfaa11fc 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/trainMoveNumber.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/trainMoveNumber.vue
@@ -147,7 +147,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_tky/menus/dialog/updateTrip.vue
index 49a60e088..1521075c7 100644
--- a/src/jmapNew/theme/datie_tky/menus/dialog/updateTrip.vue
+++ b/src/jmapNew/theme/datie_tky/menus/dialog/updateTrip.vue
@@ -118,7 +118,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
index 58a4ec918..84e1ee257 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuSignal.vue
@@ -121,7 +121,7 @@ export default {
                     cmdType: data.nextCmdType
                 };
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue
index ceab65302..15d63f2c0 100644
--- a/src/jmapNew/theme/datie_tky/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_tky/menus/menuTrain.vue
@@ -33,7 +33,7 @@ import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import TrainStop from '@/jmapNew/theme/components/menus/dialog/trainStop';
@@ -252,7 +252,7 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
             if (station && station.controlMode === 'Interlock' && this.$route.query.ctc) {
                 this.menu.forEach(item => { item.disabled = true; });
@@ -333,7 +333,7 @@ export default {
 
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -351,7 +351,7 @@ export default {
         // 		operation: OperationEvent.Train.editTrainId.menu.operation,
         // 		param: {}
         // 	};
-        // 	this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        // 	this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         // 		if (valid) {
         // 			this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         // 			this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -366,7 +366,7 @@ export default {
 
                 operation: OperationEvent.Train.setPlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -383,7 +383,7 @@ export default {
 
                 operation: OperationEvent.Train.destinationTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -400,7 +400,7 @@ export default {
 
                 operation: OperationEvent.Train.artificialTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
@@ -417,7 +417,7 @@ export default {
 
                 operation: OperationEvent.Train.detailTrainInfo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
@@ -434,7 +434,7 @@ export default {
 
                 operation: OperationEvent.Train.createTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainCreateNumber.doShow(operate, this.selected);
@@ -449,7 +449,7 @@ export default {
 
                 operation: OperationEvent.Train.deleteTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeleteNumber.doShow(operate, this.selected);
@@ -464,7 +464,7 @@ export default {
 
                 operation: OperationEvent.Train.editTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(operate, this.selected);
@@ -479,7 +479,7 @@ export default {
 
                 operation: OperationEvent.Train.moveTrainNo.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveNumber.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/factory.js b/src/jmapNew/theme/factory.js
index 6d2d41951..36904a306 100644
--- a/src/jmapNew/theme/factory.js
+++ b/src/jmapNew/theme/factory.js
@@ -107,7 +107,18 @@ class Theme {
     loadMenuComponent(code) {
         return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/index`).default);
     }
-
+    // 加载行调菜单组件
+    loadDispatchWorkMenuComponent(code) {
+        return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/dispatchWorkMenu`).default);
+    }
+    loadLocalWorkMenuComponent(code) {
+        return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/localWorkMenu`).default);
+    }
+    loadCtcWorkMenuComponent(code) {
+        if (code == '16') {
+            return Object.assign({}, require(`./${this._mapMenu[code || this._code]}/menus/ctcWorkMenu`).default);
+        }
+    }
     // 新版本
     loadPlanParser(code) {
         return PlanParser.load(require(`./${this._runplan[code || this._code]}/planConfig`).default);
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue b/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue
index dafc5a645..f95b1b8db 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue
@@ -97,7 +97,7 @@ export default {
                 send: true,
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue
index 3a0fc2e7f..bfb300553 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue
@@ -170,7 +170,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = true;
@@ -185,7 +185,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = false;
@@ -206,7 +206,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -226,7 +226,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm2.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -244,7 +244,7 @@ export default {
                 type: MapDeviceType.LimitControl.type,
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (!this.isOpenMessage) {
                     this.doClose();
@@ -265,7 +265,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 8c79cb511..3045b812a 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue
@@ -253,7 +253,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -263,7 +263,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
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 31cc80c49..3ed5a0f74 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -83,7 +83,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -102,7 +102,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 e25a98720..730625ceb 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue
@@ -190,7 +190,7 @@ export default {
                     //     this.commitDisabled = true;
                     // }
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -210,7 +210,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -227,7 +227,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
index f38286c03..a1120a9d3 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/routerCommand.vue
@@ -118,7 +118,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -134,7 +134,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/foshan_01/menus/dialog/sectionAlxeReset.vue
index 25df808f0..f3e77bcf3 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/sectionAlxeReset.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/sectionAlxeReset.vue
@@ -105,7 +105,7 @@ export default {
                 val: this.sectionCode
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -123,7 +123,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue
index 49383c700..0e90845b4 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue
@@ -155,7 +155,7 @@ export default {
             };
             this.strategy = row.value;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -192,7 +192,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -212,7 +212,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue
index cc87831a9..fb9e130b7 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/standDetainTrainAll.vue
@@ -130,7 +130,7 @@ export default {
         //         val: this.upDown
         //     };
 
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //         }
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 020458ac7..83b05d8e0 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue
@@ -254,7 +254,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -281,7 +281,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -311,7 +311,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -342,7 +342,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -360,7 +360,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 e9f6e0e20..ebdfb7bf9 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue
@@ -86,7 +86,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 32a294093..72363b4ef 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue
@@ -105,7 +105,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 4a5f7eb3a..227efb2d2 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue
@@ -119,7 +119,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +134,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 156c7847b..a3c5eb2de 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue
@@ -115,7 +115,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -132,7 +132,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2d027f307..585b54512 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue
@@ -115,7 +115,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -135,7 +135,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 fe1cd856d..a0d9d00a8 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue
@@ -119,7 +119,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +134,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 4ce89ac90..56dbc0cee 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue
@@ -113,7 +113,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -130,7 +130,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 7053b6f0e..03c677575 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue
@@ -119,7 +119,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +134,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 32dc7bd28..b6678c367 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue
@@ -127,7 +127,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 b8e7a6d0e..c3c4b397c 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue
@@ -119,7 +119,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +134,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 7a0f7ad73..48b62137c 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue
@@ -112,7 +112,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -127,7 +127,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -144,7 +144,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 e1d67826b..5054ab8cf 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue
@@ -103,7 +103,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -118,7 +118,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -135,7 +135,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 7d5247d6d..6e8460ef8 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue
@@ -114,7 +114,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -129,7 +129,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue
index 1eaf52704..b630acec7 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/turnBackControl.vue
@@ -143,7 +143,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -160,7 +160,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/index.vue b/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenu.vue
similarity index 53%
rename from src/jmapNew/theme/beijing_01/menus/index.vue
rename to src/jmapNew/theme/foshan_01/menus/dispatchWorkMenu.vue
index 1c2ae33f3..95832458e 100644
--- a/src/jmapNew/theme/beijing_01/menus/index.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenu.vue
@@ -1,48 +1,44 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-    <menu-button ref="menuButton" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
+    <!-- <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" /> -->
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
     <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
     <menu-limit ref="menuLimit" :selected="selected" />
+    <menu-auto-Trun-route ref="menuAutoTrunRoute" :selected="selected" :work="'dispatchWork'" />
+
     <passive-alarm ref="passiveAlarm" />
-    <passive-contorl ref="passiveControl" pop-class="beijing-01__systerm" />
+    <passive-contorl ref="passiveControl" pop-class="foshan-01__systerm" />
     <passive-Timeout ref="passiveTimeout" />
   </div>
 </template>
-
 <script>
 import { mapGetters } from 'vuex';
-import MenuSignal from './menuSignal';
-import MenuButton from './menuButton';
+import MenuBar from './dispatchWorkMenuBar';
 import MenuStationStand from './menuStationStand';
-import MenuSwitch from './menuSwitch';
+// import MenuSwitch from './menuSwitch';
+import MenuSignal from './menuSignal';
 import MenuSection from './menuSection';
 import MenuTrain from './menuTrain';
-import MenuStation from './menuStation';
-import MenuBar from './menuBar';
 import MenuLimit from './menuLimit';
+import MenuAutoTrunRoute from './menuAutoTrunRoute';
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
-
 export default {
-    name: 'Menus',
+    name: 'DispatchWorkMenu',
     components: {
         MenuBar,
-        MenuButton,
-        MenuSignal,
-        MenuSwitch,
-        MenuSection,
         MenuStationStand,
-        MenuStation,
+        // MenuSwitch,
+        MenuSignal,
+        MenuSection,
         MenuTrain,
         MenuLimit,
         PassiveAlarm,
+        MenuAutoTrunRoute,
         PassiveContorl,
         PassiveTimeout
     },
@@ -57,49 +53,15 @@ export default {
     computed: {
         ...mapGetters('config', [
             'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
-    },
-    watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        }
+        ])
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
-            this.$refs['menuSignal'].setRouteSignal();
         });
-
-		this.$root.$on('dialogOpen', e => {
-			if (this.selected == e &&
-				this.selected &&
-				this.selected.instance &&
-				this.selected.instance.mouseEvent) {
-				this.selected.instance.mouseEvent.mouseover();
-			}
-		})
-
-		this.$root.$on('dialogClose', e => {
-			if (this.selected == e &&
-				this.selected &&
-				this.selected.instance &&
-				this.selected.instance.mouseEvent) {
-				this.selected.instance.__down = false;
-				this.selected.instance.mouseEvent.mouseout();
-				this.$jlmap.clearEvent();
-			}
-		})
-    },
-	beforeDestroy() {
-		this.$root.$off('dialogOpen');
-		this.$root.$off('dialogClose');
-	}
+    }
 };
 </script>
-
 <style>
     .menus .pop-menu {
         background: #F0F0F0;
@@ -113,48 +75,48 @@ export default {
         color: #B4B3B8;
     }
 
-    .beijing-01__systerm {
+    .foshan-01__systerm {
         overflow: hidden !important;
     }
 
-    .beijing-01__systerm .el-dialog {
-        background: rgba(100, 100, 100, 0.3);
-        border: 2px solid rgb(144, 144, 144, 0.8);
+    .foshan-01__systerm .el-dialog {
+        background: linear-gradient(to bottom, #9BB6D3, #B8D0EA);
+        border: 1px solid rgba(118, 162, 198, 1);
         border-radius: 6px;
         color: #000;
         font-size: 14px;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__header {
+    .foshan-01__systerm .el-dialog .el-dialog__header {
         padding: 10px;
         height: 26px;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__footer {
+    .foshan-01__systerm .el-dialog .el-dialog__footer {
         background: #F0F0F0;
         opacity: 1;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__body {
+    .foshan-01__systerm .el-dialog .el-dialog__body {
         padding: 10px;
-        margin: 5px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
+        margin: 2px;
         box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
         background: #F0F0F0;
         opacity: 1;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__title {
+    .foshan-01__systerm .el-dialog .el-dialog__title {
         position: absolute;
         top: 6px;
         color: #000;
         border-radius: 4px;
         padding: 0px 2px;
         height: 20px;
-        line-height: 20px
+        line-height: 15px;
+        font-size: 15px;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__title::before {
+    .foshan-01__systerm .el-dialog .el-dialog__title::before {
         content: '';
         position: absolute;
         top: 0;
@@ -166,7 +128,7 @@ export default {
         z-index: -1;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__headerbtn {
+    .foshan-01__systerm .el-dialog .el-dialog__headerbtn {
         background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
         border: 1px solid #fff;
         border-radius: 4px;
@@ -175,15 +137,15 @@ export default {
         line-height: 18px;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+    .foshan-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
         font-size: 16px;
     }
 
-    .beijing-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+    .foshan-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
         color: #fff;
     }
 
-    .beijing-01__systerm .el-dialog .el-button {
+    .foshan-01__systerm .el-dialog .el-button {
         height: 32px;
         line-height: 32px;
         padding: 0px;
@@ -194,31 +156,31 @@ export default {
         background: #F0F0F0;
     }
 
-    .beijing-01__systerm .el-dialog .expand {
+    .foshan-01__systerm .el-dialog .expand {
         width: 120px;
     }
 
-    .beijing-01__systerm .el-dialog .el-button:focus span {
+    .foshan-01__systerm .el-dialog .el-button:focus span {
         border: 1px dashed gray;
     }
 
-    .beijing-01__systerm .el-dialog .el-button:active {
+    .foshan-01__systerm .el-dialog .el-button:active {
         border: 2px inset #E2E2E2;
     }
 
-    .beijing-01__systerm .el-dialog .el-button:disabled {
+    .foshan-01__systerm .el-dialog .el-button:disabled {
         border: 2px inset #E2E2E2;
     }
 
-    .beijing-01__systerm .el-dialog .el-button:disabled span {
+    .foshan-01__systerm .el-dialog .el-button:disabled span {
         border: 0px;
     }
 
-    .beijing-01__systerm .el-dialog .el-input {
+    .foshan-01__systerm .el-dialog .el-input {
         border: 2px inset #E9E9E9;
     }
 
-    .beijing-01__systerm .el-dialog .el-input .el-input__inner {
+    .foshan-01__systerm .el-dialog .el-input .el-input__inner {
         color: #000;
         background: #fff !important;
         border: 0px;
@@ -226,16 +188,16 @@ export default {
         box-sizing: border-box;
     }
 
-    .beijing-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+    .foshan-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
         background: #F0F0F0 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-textarea {
+    .foshan-01__systerm .el-dialog .el-textarea {
         border: 2px inset #E9E9E9;
         border-radius: 0px;
     }
 
-    .beijing-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+    .foshan-01__systerm .el-dialog .el-textarea .el-textarea__inner {
         color: #000;
         background: #fff !important;
         border: 0px;
@@ -243,24 +205,24 @@ export default {
         box-sizing: border-box;
     }
 
-    .beijing-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+    .foshan-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
         background: #F0F0F0 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-table--border th.gutter {
+    .foshan-01__systerm .el-dialog .el-table--border th.gutter {
         background: #EBEADB !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-table {
+    .foshan-01__systerm .el-dialog .el-table {
         border: 2px inset #E9E9E9;
         color: #000 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-table .cell {
+    .foshan-01__systerm .el-dialog .el-table .cell {
         line-height: unset !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-table th.is-leaf {
+    .foshan-01__systerm .el-dialog .el-table th.is-leaf {
         background: #F0F0F0 !important;
         border-right: 1px solid #BDBDBD !important;
         border-bottom: 1px solid #BDBDBD !important;
@@ -269,42 +231,59 @@ export default {
         padding: 0px;
     }
 
-    .beijing-01__systerm .el-dialog .el-table tr td {
+    .foshan-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+        background: #fff !important;
+        border-right: 1px solid #fff !important;
+        border-bottom: 1px solid #EBEEF5 !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+    .foshan-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+        border-right: 1px solid #e2e2e2 !important;
+    }
+    .foshan-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+        border-right: 1px solid #e2e2e2 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table tr td {
         height: 20px !important;
         padding: 0px;
     }
 
-    .beijing-01__systerm .el-dialog .el-table .el-table__empty-text {
+    .foshan-01__systerm .el-dialog .el-table .el-table__empty-text {
         top: 15px !important;
+        line-height: normal;
+        max-width:60%;
     }
 
-    .beijing-01__systerm .el-dialog .current-row>td {
+    .foshan-01__systerm .el-dialog .current-row>td {
         background: #3399FF !important;
         color: #fff !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-checkbox__inner {
+    .foshan-01__systerm .el-dialog .el-checkbox__inner {
         border: 1px inset #dcdfe6 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-checkbox__label {
+    .foshan-01__systerm .el-dialog .el-checkbox__label {
         color: #000 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+    .foshan-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
         background: #E6E6E6 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+    .foshan-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
         color: #C5C9CC !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+    .foshan-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
         background: #fff !important;
         border: 1px inset #dcdfe6 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+    .foshan-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
         position: absolute;
         -webkit-box-sizing: content-box;
         box-sizing: content-box;
@@ -317,20 +296,20 @@ export default {
         top: 1px;
     }
 
-    .beijing-01__systerm .el-dialog .el-radio__inner {
+    .foshan-01__systerm .el-dialog .el-radio__inner {
         border: 1px inset #dcdfe6 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-radio__label {
+    .foshan-01__systerm .el-dialog .el-radio__label {
         color: #000 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+    .foshan-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
         background: #fff !important;
         border: 1px inset #dcdfe6 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+    .foshan-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
         width: 4px;
         height: 4px;
         border-radius: 100%;
@@ -340,42 +319,43 @@ export default {
         top: 50%;
     }
 
-    .beijing-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+    .foshan-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
         background: #E6E6E6 !important;
     }
 
-    .beijing-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+    .foshan-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
         color: #C5C9CC !important;
     }
 
-    .beijing-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
+    .foshan-01__systerm .el-dialog .base-label {
+        background: #F0F0F0;
+        padding: 0 5px;
         position: relative;
         left: -15px;
         top: -18px;
     }
 
-    .beijing-01__systerm .el-dialog .el-form-item label {
+    .foshan-01__systerm .el-dialog .el-form-item label {
         font-weight: normal !important;
         color: #000 !important;
     }
 
-    .beijing-01__systerm .el-dialog .context {
+    .foshan-01__systerm .el-dialog .context {
         height: 100px;
         border: 2px inset #E2E2E2;
         overflow-y: scroll;
     }
 
-    .beijing-01__systerm .el-dialog .table {
+    .foshan-01__systerm .el-dialog .table {
         margin-top: 10px;
     }
 
-    .beijing-01__systerm .el-dialog .notice {
+    .foshan-01__systerm .el-dialog .notice {
         margin-left: 62px;
         line-height: 30px;
     }
 
-    .beijing-01__systerm .el-dialog .button-group {
+    .foshan-01__systerm .el-dialog .button-group {
         margin-top: 10px;
     }
 </style>
diff --git a/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..8f75c74ac
--- /dev/null
+++ b/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,359 @@
+<template>
+  <div id="menuBarFoShan">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control ref="stationControl" :work="'dispatchWork'" />
+    <view-train-id ref="viewTrainId" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import StationControl from './menuDialog/stationControl';
+import ViewTrainId from './menuDialog/viewTrainId';
+import HelpAbout from './menuDialog/helpAbout';
+import { mapGetters } from 'vuex';
+export default {
+    name: 'DispatchWorkMenuBar',
+    components: {
+        MenuBar,
+        StationControl,
+        HelpAbout,
+        ViewTrainId
+    },
+    data() {
+        return {
+            menuNormal:[
+                {
+                    title: this.$t('menu.menuBar.system'),
+                    operate: OperationEvent.Command.mBar.system,
+                    click: this.undeveloped,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl
+                        },
+                        {
+                            title: '区域选择',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.display'),
+                    operate: OperationEvent.Command.mBar.view,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        }
+                        // {
+                        //     title: this.$t('menu.menuBar.setNameDisplay'),
+                        //     click: this.setNameDisplay,
+                        //     operate: OperationEvent.Command.view.setNameDisplay
+                        // },
+                        // {
+                        //     title: this.$t('menu.menuBar.setDeviceDisplay'),
+                        //     click: this.setDeviceDisplay,
+                        //     operate: OperationEvent.Command.view.setDeviceDisplay
+                        // }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed:{
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        initMenu() {
+            if (this.menuNormal[3]) {
+                this.menuNormal[3].children = this.initStationList();
+            }
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.$refs.menuBar.doClose();
+            }
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/foshan_01/menus/index.vue b/src/jmapNew/theme/foshan_01/menus/localWorkMenu.vue
similarity index 92%
rename from src/jmapNew/theme/foshan_01/menus/index.vue
rename to src/jmapNew/theme/foshan_01/menus/localWorkMenu.vue
index f60470bfe..b2c156313 100644
--- a/src/jmapNew/theme/foshan_01/menus/index.vue
+++ b/src/jmapNew/theme/foshan_01/menus/localWorkMenu.vue
@@ -1,56 +1,54 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" />
     <menu-button ref="menuButton" />
-    <menu-axle-reset ref="menuAxleReset" :selected="selected" />
-    <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
     <menu-limit ref="menuLimit" :selected="selected" />
+    <menu-axle-reset ref="menuAxleReset" :selected="selected" />
+    <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" :work="'localWork'" />
+
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" pop-class="foshan-01__systerm" />
     <passive-Timeout ref="passiveTimeout" />
   </div>
 </template>
-
 <script>
-import { mapGetters } from 'vuex';
-import MenuSignal from './menuSignal';
+import MenuBar from './localWorkMenuBar';
+import MenuStationStand from './menuStationStand';
 import MenuButton from './menuButton';
+import MenuSwitch from './menuSwitch';
+import MenuSignal from './menuSignal';
+import MenuSection from './menuSection';
+import MenuStation from './menuStation';
+import MenuLimit from './menuLimit';
 import MenuAxleReset from './menuAxleReset';
 import MenuAutoTrunRoute from './menuAutoTrunRoute';
-import MenuStationStand from './menuStationStand';
-import MenuSwitch from './menuSwitch';
-import MenuSection from './menuSection';
-import MenuTrain from './menuTrain';
-import MenuStation from './menuStation';
-import MenuBar from './menuBar';
-import MenuLimit from './menuLimit';
+
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
-
+import { mapGetters } from 'vuex';
 export default {
-    name: 'Menus',
+    name: 'LocalWorkMenu',
     components: {
         MenuBar,
+        MenuStationStand,
         MenuButton,
+        MenuSwitch,
+        MenuSignal,
+        MenuSection,
+        MenuStation,
+        MenuLimit,
         MenuAxleReset,
         MenuAutoTrunRoute,
-        MenuSignal,
-        MenuSwitch,
-        MenuSection,
-        MenuStationStand,
-        MenuStation,
-        MenuTrain,
-        MenuLimit,
         PassiveAlarm,
         PassiveContorl,
         PassiveTimeout
+
     },
     props: {
         selected: {
@@ -63,15 +61,7 @@ export default {
     computed: {
         ...mapGetters('config', [
             'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
-    },
-    watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        }
+        ])
     },
     mounted() {
         this.$nextTick(() => {
@@ -80,7 +70,6 @@ export default {
     }
 };
 </script>
-
 <style>
     .menus .pop-menu {
         background: #F0F0F0;
diff --git a/src/jmapNew/theme/foshan_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/foshan_01/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..9c60bb23c
--- /dev/null
+++ b/src/jmapNew/theme/foshan_01/menus/localWorkMenuBar.vue
@@ -0,0 +1,316 @@
+<template>
+  <div id="menuBarFoShan">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control ref="stationControl" :work="'localWork'" />
+    <view-train-id ref="viewTrainId" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import StationControl from './menuDialog/stationControl';
+import ViewTrainId from './menuDialog/viewTrainId';
+import HelpAbout from './menuDialog/helpAbout';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+export default {
+    name: 'LocalWorkMenuBar',
+    components: {
+        MenuBar,
+        StationControl,
+        HelpAbout,
+        ViewTrainId
+    },
+    data() {
+        return {
+            menuNormal:[
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl
+                        },
+                        {
+                            title: '区域选择',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.display'),
+                    operate: OperationEvent.Command.mBar.view,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                // {
+                //     title: '车站定位',
+                //     operate: '',
+                //     children: [
+                //     ]
+                // },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed:{
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    methods:{
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/foshan_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/foshan_01/menus/menuAutoTrunRoute.vue
index f117a8d22..aafc7f28f 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuAutoTrunRoute.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuAutoTrunRoute.vue
@@ -13,10 +13,9 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
-    name: 'MenuLimit',
+    name: 'MenuAutoTurnRoute',
     components: {
         PopMenu,
         TurnBackControl
@@ -32,32 +31,18 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
-                    }
-                ]
-            }
+            menuNormal: [
+                {
+                    label: '设置自动折返',
+                    handler: this.handlerTurnBack,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
+                },
+                {
+                    label: '取消自动折返',
+                    handler: this.cancelTurnBack,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
+                }
+            ]
         };
     },
     computed: {
@@ -87,7 +72,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -115,7 +105,7 @@ export default {
                     autoTurnBackCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.turnBackControl.doShow(operate, this.selected);
@@ -132,7 +122,7 @@ export default {
                     autoTurnBackCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.turnBackControl.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue b/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
index 1237a53ae..8e4f4c21a 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuAxleReset.vue
@@ -13,7 +13,7 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
@@ -32,17 +32,13 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '计轴复位',
-                        handler: this.handleAxleReset,
-                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-                    }
-                ],
-                Center: [
-                ]
-            }
+            menuNormal: [
+                {
+                    label: '计轴复位',
+                    handler: this.handleAxleReset,
+                    cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
+                }
+            ]
         };
     },
     computed: {
@@ -72,7 +68,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -96,7 +97,7 @@ export default {
                 start: true,
                 operation: OperationEvent.AxleReset.SetAxleReset.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.sectionAlxeReset.doShow(operate);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuBar.vue b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
deleted file mode 100644
index 4b2c3a155..000000000
--- a/src/jmapNew/theme/foshan_01/menus/menuBar.vue
+++ /dev/null
@@ -1,1203 +0,0 @@
-<template>
-  <div id="menuBar">
-    <div class="nav" style="padding-left:40px">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li
-            v-if="handleShow(item)"
-            :id="getDomId(item)"
-            :key="i"
-            class="nav-li"
-            @click.stop="selectedClassA(item, i)"
-          >
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template v-if="child.children && child.children.length > 0">
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li
-                    v-else
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="selectedClassB(child, j)"
-                  >
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li
-                          v-else-if="grandchild.show"
-                          :id="getDomId(grandchild)"
-                          :key="k"
-                          class="menu-li"
-                          @click.stop="hookClick(grandchild)"
-                        >
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li
-                    v-else-if="child.show"
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="hookClick(child)"
-                  >
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-    <station-control ref="stationControl" />
-    <view-train-id ref="viewTrainId" />
-    <detain-train-contorl ref="detainTrainContorl" />
-    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
-    <notice-info ref="noticeInfo" pop-class="foshan-01__systerm" />
-    <train-add ref="trainAdd" />
-    <train-transtalet ref="trainTranstalet" />
-    <train-delete ref="trainDelete" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-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';
-import TrainAdd from './menuDialog/trainAdd';
-import ViewTrainId from './menuDialog/viewTrainId';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-import TrainDelete from './menuDialog/trainDelete';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { EventBus } from '@/scripts/event-bus';
-import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuBar',
-    components: {
-        NoticeInfo,
-        StationControl,
-        DetainTrainContorl,
-        DetainTrainContorlUpDown,
-        TrainAdd,
-        TrainTranstalet,
-        TrainDelete,
-        ManageUser,
-        ViewTrainId,
-        HelpAbout
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            valid: true,
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '站遥控',
-                                operate: OperationEvent.MixinCommand.remoteControl.mbar,
-                                click: this.stationRemoteControl
-                            },
-                            {
-                                title: '区域选择',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.display'),
-                        operate: OperationEvent.Command.mBar.view,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            }
-                            // {
-                            //     title: this.$t('menu.menuBar.setNameDisplay'),
-                            //     click: this.setNameDisplay,
-                            //     operate: OperationEvent.Command.view.setNameDisplay
-                            // },
-                            // {
-                            //     title: this.$t('menu.menuBar.setDeviceDisplay'),
-                            //     click: this.setDeviceDisplay,
-                            //     operate: OperationEvent.Command.view.setDeviceDisplay
-                            // }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    // {
-                    //     title: '批处理命令',
-                    //     operate: OperationEvent.Command.mBar.detainControl,
-                    //     click: this.undeveloped,
-                    //     children: [
-                    //         {
-                    //             title: '全线扣车',
-                    //             operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                    //             click: this.setDetainTrainAll
-                    //         },
-                    //         {
-                    //             title: '取消全线扣车',
-                    //             operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                    //             click: this.cancelDetainTrainAll
-                    //         },
-                    //         {
-                    //             title: '取消上行全线扣车',
-                    //             operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                    //             click: this.cancelUpDetainTrainAll
-                    //         },
-                    //         {
-                    //             title: '取消下行全线扣车',
-                    //             operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                    //             click: this.cancelDownDetainTrainAll
-                    //         }
-                    //     ]
-                    // },
-                    {
-                        title: '信息管理',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ],
-                Center: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '站遥控',
-                                operate: OperationEvent.MixinCommand.remoteControl.mbar,
-                                click: this.stationRemoteControl
-                            },
-                            {
-                                title: '区域选择',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.display'),
-                        operate: OperationEvent.Command.mBar.view,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            }
-                            // {
-                            //     title: this.$t('menu.menuBar.setNameDisplay'),
-                            //     click: this.setNameDisplay,
-                            //     operate: OperationEvent.Command.view.setNameDisplay
-                            // },
-                            // {
-                            //     title: this.$t('menu.menuBar.setDeviceDisplay'),
-                            //     click: this.setDeviceDisplay,
-                            //     operate: OperationEvent.Command.view.setDeviceDisplay
-                            // }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    // {
-                    //     title: '批处理命令',
-                    //     operate: OperationEvent.Command.mBar.detainControl,
-                    //     click: this.undeveloped,
-                    //     children: [
-                    //         {
-                    //             title: '全线扣车',
-                    //             operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                    //             click: this.setDetainTrainAll
-                    //         },
-                    //         {
-                    //             title: '取消全线扣车',
-                    //             operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                    //             click: this.cancelDetainTrainAll
-                    //         },
-                    //         {
-                    //             title: '取消上行全线扣车',
-                    //             operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                    //             click: this.cancelUpDetainTrainAll
-                    //         },
-                    //         {
-                    //             title: '取消下行全线扣车',
-                    //             operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                    //             click: this.cancelDownDetainTrainAll
-                    //         }
-                    //     ]
-                    // },
-                    {
-                        title: '信息管理',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'started',
-            'steps',
-            'order',
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        },
-        '$store.state.training.operatemode': function (mode) {
-            this.initMenu();
-        },
-        '$store.state.training.started': function (val) {
-            this.closeMenu(true);
-        },
-        '$store.state.training.prdType': function () {
-            this.initMenu();
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        handleShow(item) {
-            if (item.hide) {
-                return false;
-            }
-            return true;
-        },
-        initStationList() {
-            const list = [];
-            this.stationList.forEach(station => {
-                if (station.visible) {
-                    const node = {
-                        title: station.name,
-                        operate: station.code,
-                        show: true,
-                        click: this.mapLocation,
-                        code: station.code
-                    };
-
-                    list.push(node);
-                }
-            });
-            return list;
-        },
-        initMenu(menu) {
-            const type = State2SimulationMap[this.$store.state.training.prdType];
-            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
-            if (this.menu[3]) {
-                this.menu[3].children = this.initStationList();
-            }
-            this.clickEvent();
-            this.closeMenu(true);
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                if (document.getElementById('menuBar')) {
-                    self.closeMenu(false);
-                }
-            };
-        },
-        getDomId(item) {
-            if (item && item.operate) {
-				return item.operate.domId;
-            }
-            return '';
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu(flag) {
-            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
-                this.classA = this.tempClassA = -1;
-                this.classB = this.tempClassB = -1;
-            }
-        },
-        hookClick(item, event) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            if (item && typeof item.click == 'function') {
-                item.click(item.operate);
-            }
-        },
-        selectedClassA(item, index) {
-            const order = this.order || 0;
-            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-                this.popupMenuA(item, index);
-            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-                this.popupMenuA(item, index);
-            }
-        },
-        // 弹出顶部菜单操作
-        popupMenuA(item, index) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            this.clickEvent();
-            this.tempClassA = index;
-			this.tempClassB = -1;
-
-			const operate = {
-                type: 'bar',
-                operation: item.operate.operation
-            };
-			this.$nextTick(() => {
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}
-				});
-			})
-        },
-        selectedClassB(item, index) {
-            const order = this.order || 0;
-            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-                this.popupMenuB(item, index);
-            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-                this.popupMenuB(item, index);
-            }
-        },
-        popupMenuB(item, index) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-			this.tempClassB = index;
-
-			const operate = {
-                type: 'bar',
-                operation: item.operate.operation
-            };
-			this.$nextTick(() => {
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}
-				});
-			});
-        },
-        // 设置地图定位
-        mapLocation(code) {
-            if (code) {
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
-                this.closeMenu(true);
-            }
-        },
-        // 设置列车识别号显示
-        setTrainIdDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewTrainId.doShow(operate);
-                }
-            });
-        },
-        // 站遥控
-        stationRemoteControl(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControl.doShow(operate);
-                }
-            });
-        },
-        // 设置全线扣车
-        setDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorl.doShow(operate);
-                }
-            });
-        },
-        // 取消全线扣车
-        cancelDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorl.doShow(operate);
-                }
-            });
-        },
-        // 取消上行扣车
-        cancelUpDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorlUpDown.doShow(operate);
-                }
-            });
-        },
-        // 取消下行扣车
-        cancelDownDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorlUpDown.doShow(operate);
-                }
-            });
-        },
-        // 添加计划车
-        addPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAdd.doShow(operate);
-                }
-            });
-        },
-        // 平移计划车
-        translatPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainTranstalet.doShow(operate);
-                }
-            });
-        },
-        // 删除计划车
-        delPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDelete.doShow(operate);
-                }
-            });
-        },
-        // 用户管理
-        userManage(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.manageUser.doShow(operate);
-                }
-            });
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $width: 30px;
-    $height: 30px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 180px;
-    $menuItemPadding: 5px;
-
-    #menuBar {
-        z-index: 36;
-        position: absolute;
-        width: inherit;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
-        background: linear-gradient(#FDFDFE, #DEE3F3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray !important;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-        max-height: 550px;
-        overflow-y: scroll;
-
-        &::-webkit-scrollbar {
-            width: 4px;
-        }
-
-        &::-webkit-scrollbar-thumb {
-            border-radius: 10px;
-            background: #c3c3c3;
-        }
-
-        &::-webkit-scrollbar-track {
-            border-radius: 0;
-            background: #f0f0f0;
-
-        }
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        display: flex;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/foshan_01/menus/menuButton.vue b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
index e7535ebcd..ab0e97326 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
+  <div id="menuButtons_box" class="menu menuButton" style="height:45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
     <button
       :id="MixinCommand.totalCancel.button.domId"
       :style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
@@ -243,7 +243,8 @@
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+import { SimulationUserType, OperateMode } from '@/scripts/ConstDic';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 
 export default {
     name: 'MapButtonMenu',
@@ -272,9 +273,6 @@ export default {
         Signal() {
             return OperationEvent.Signal;
         },
-        isShowBtn() {
-            return this.$store.state.training.prdType == '01';
-        },
         MixinCommand() {
             return OperationEvent.MixinCommand;
         }
@@ -287,6 +285,10 @@ export default {
             this.selectedChange();
         }
     },
+    beforeDestroy() {
+        this.resetMbmButton();
+        // Handler.clear(); // 清空操作组
+    },
     methods: {
         updateButtonShow(val, old) {
             if (old) {
@@ -308,24 +310,33 @@ export default {
                 }
             }
         },
+        resetMbmButton() {
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
+        },
         buttonDown(operation) {
             const operate = {
                 operation: operation
             };
             console.log(operate, '=====');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('training/emitTipFresh');
                 }
+            }).catch(res=>{
+                this.resetMbmButton();
             });
         },
         selectedChange() {
             const model = this.$store.state.menuOperation.selected;
             if (!model._type) {
-                Handler.clear();
-                this.$store.dispatch('menuOperation/setButtonOperation', null);
+                // Handler.clear();
+                if (this.$store.state.training.roles || (this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$store.state.training.operatemode === OperateMode.FAULT)) {
+                    //
+                } else {
+                    this.$store.dispatch('menuOperation/setButtonOperation', null);
+                }
             }
         }
     }
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 dc18de0da..626ef2394 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -90,7 +90,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.confirm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -117,7 +117,7 @@ export default {
                 operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
             }
             this.doClose();
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
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 408bce454..f22b15538 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 1103f6297..35ed4000b 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 21f466da0..78b3b2ed6 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 358448e66..f58f8f456 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -143,7 +143,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -167,7 +167,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
index ba57f5d46..63e6ef1fa 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -116,7 +116,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -144,7 +144,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -168,7 +168,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 773909d2e..c6c713b1b 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue
@@ -103,7 +103,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 0d46b5162..8f2daaa96 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 ba42ce7dc..173d2c8be 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
@@ -29,7 +29,7 @@
       </el-row>
       <el-form-item prop="stationType">
         <el-radio-group v-model="formModel.stationType">
-          <el-row :id="(controlProps[item]||{}).domNode.domId" v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px">
+          <el-row v-for="item in Object.keys(controlProps)" :id="(controlProps[item]||{}).domNode.domId" :key="item" style="padding-bottom: 10px">
             <el-radio :label="item" :disabled="!controlModeList.includes(item)" @change="handleChooseChangeControl(item)">
               {{ (controlProps[item]||{}).name }}</el-radio>
           </el-row>
@@ -55,11 +55,19 @@ export default {
     components: {
         TwoConfirmation
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         var validatePass = (rule, value, callback) => {
             const centralizedStation = this.$store.getters['map/getDeviceByCode'](value);
             if (this.controlModeList.includes(centralizedStation.controlMode)) {
-                callback(new Error(`该集中站已经是${(this.controlProps[centralizedStation.controlMode]||{}).name}模式`));
+                callback(new Error(`该集中站已经是${(this.controlProps[centralizedStation.controlMode] || {}).name}模式`));
             } else {
                 callback();
             }
@@ -123,9 +131,9 @@ export default {
         }
     },
     watch: {
-        '$store.state.training.prdType': function (val) {
-            this.initControlModeList(val);
-        },
+        // '$store.state.training.prdType': function (val) {
+        //     this.initControlModeList(val);
+        // },
         '$store.state.map.controlTransfer':function (controlTransferList) {
             controlTransferList.forEach(controlTransfer=>{
                 this.updateTableValue(controlTransfer);
@@ -133,10 +141,10 @@ export default {
         }
     },
     methods: {
-        initControlModeList(val) {
-            if (val === '01') {
+        initControlModeList() {
+            if (this.work === 'localWork') {
                 this.controlModeList = ['Emergency', 'Local'];
-            } else if (val === '02') {
+            } else if (this.work === 'dispatchWork') {
                 this.controlModeList = ['Center'];
             } else {
                 this.controlModeList = [];
@@ -158,7 +166,8 @@ export default {
                 this.operate = operate || {};
                 this.operation = operate.operation;
             }
-            this.initControlModeList(this.$store.state.training.prdType);
+            this.initControlModeList();
+            // this.$store.state.training.prdType
             this.centralizedStationList = [];
             this.stationList.forEach(item => {
                 if (item.centralized) {
@@ -179,7 +188,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -187,14 +196,14 @@ export default {
         },
         handleChooseChangeStation() {
             const operate = {
-				operation: OperationEvent.Command.order.choose1.operation,
+                operation: OperationEvent.Command.order.choose1.operation,
                 param: {
                     stationCodes: [this.formModel.stationCode]
                 },
                 val: this.formModel.stationCode
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -205,7 +214,7 @@ export default {
                 operation: this.controlProps[val].domNode.operation,
                 val
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -235,7 +244,7 @@ export default {
                 messages: ['确认将如下操作区域的控制模式由站控转为中控:']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -252,7 +261,7 @@ export default {
                 messages: ['确认将如下操作区域的控制模式由中控转为站控:']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -269,7 +278,7 @@ export default {
                 messages: ['确认将如下操作区域的控制模式由中控转为站控:']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
index 034de3c98..b75a6f8af 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6a4d82bfe..00246c67e 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue
@@ -109,7 +109,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 69cf646af..7f0e0b0a1 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
index 71954c9d7..18a46ae1b 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/viewTrainId.vue
@@ -145,7 +145,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -160,7 +160,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.setTrainDispaly();
diff --git a/src/jmapNew/theme/foshan_01/menus/menuLimit.vue b/src/jmapNew/theme/foshan_01/menus/menuLimit.vue
index c84d1d3ab..1175011c2 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuLimit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuLimit.vue
@@ -32,28 +32,28 @@ export default {
         return {
             menu: [{
                 label: '取消全线临时限速',
-                handler: this.cancelSpeed,
-                disabledCallback: '',
-                auth: { station: true, center: false }
-            }],
-            menuNormal: {
-                local: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        disabledCallback: '',
-                        auth: { station: true, center: false }
-                    }
-                ],
-                central: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        disabledCallback: '',
-                        auth: { station: false, center: true }
-                    }
-                ]
-            }
+                handler: this.cancelSpeed
+                // disabledCallback: '',
+                // auth: { station: true, center: false }
+            }]
+            // menuNormal: {
+            //     local: [
+            //         {
+            //             label: '取消全线临时限速',
+            //             handler: this.cancelSpeed,
+            //             disabledCallback: '',
+            //             auth: { station: true, center: false }
+            //         }
+            //     ],
+            //     central: [
+            //         {
+            //             label: '取消全线临时限速',
+            //             handler: this.cancelSpeed,
+            //             disabledCallback: '',
+            //             auth: { station: false, center: true }
+            //         }
+            //     ]
+            // }
         };
     },
     computed: {
@@ -109,7 +109,7 @@ export default {
                 label: MapDeviceType.LimitControl.label,
                 operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/menuSection.vue b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
index a83ad906b..b264861fd 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSection.vue
@@ -23,11 +23,11 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import AllLineCancelLimit from './dialog/allLineCancelLimit';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SectionMenu',
@@ -48,62 +48,63 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '全线取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType:CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                    // {
-                    //     label: '区段故障解锁',
-                    //     handler: this.fault,
-                    //     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '全线取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType:CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '区段激活',
+                    handler: this.active,
+                    cmdType: CMD.Section.CMD_SECTION_ACTIVE,
+                    isDisabled: sectionDevice => sectionDevice.cutOff !== 1,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '区段切除',
+                    handler: this.split,
+                    cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
+                    isDisabled: sectionDevice => sectionDevice.cutOff === 1,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (sectionDevice, work) => false,
+                    isShow: (signal, work) => true
+
+                },
+                {
+                    label: '全线取消限速',
+                    handler: this.cancelSpeed,
+                    cmdType:CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED,
+                    isDisabled: (sectionDevice, work) => false,
+                    isShow: (signal, work) => true
+
+                },
+                {
+                    label: '全线取消限速',
+                    handler: this.cancelSpeed,
+                    cmdType:CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED,
+                    isDisabled: (signal, work) => false,
+                    isShow: (sectionDevice, work) => work === 'dispatchWork'
+                }
+                // Local: [
+                //     // {
+                //     //     label: '区段故障解锁',
+                //     //     handler: this.fault,
+                //     //     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                //     // }
+                // ],
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -154,10 +155,13 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            // Center
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
-                cmdType: CMD.Section.CMD_Train_Init_Plan
+                cmdType: CMD.Section.CMD_Train_Init_Plan,
+                isDisabled: (sectionDevice, work) => false,
+                isShow: (sectionDevice, work) => work === 'dispatchWork'
             });
         }
     },
@@ -171,7 +175,12 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    menuItem.disabled = !judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                    menuItem.show = menuItem.isShow(this.selected, this.work);
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
@@ -201,6 +210,7 @@ export default {
                 commitOperate(menuOperate.Section.fault, {sectionCode:selectType.code}, 3).then(({valid, operate})=>{
                     if (valid) {
                         // this.$refs.sectionUnLock.doShow(operate, this.selected);
+                        this.$store.dispatch('menuOperation/setButtonOperation', null);
                     }
                 }).catch(error=>{
                     console.log(error);
@@ -214,6 +224,7 @@ export default {
                 commitOperate(menuOperate.Section.axlePreReset, {sectionCode:selectType.code}, 3).then(({valid, operate})=>{
                     if (valid) {
                         // this.$refs.sectionUnLock.doShow(operate, this.selected);
+                        this.$store.dispatch('menuOperation/setButtonOperation', null);
                     }
                 }).catch(error=>{
                     console.log(error);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
index 72154e0c9..56e2d3136 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSignal.vue
@@ -25,11 +25,11 @@ import RouterCommand from './dialog/routerCommand';
 import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SignalMenu',
@@ -51,120 +51,119 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '进路选排',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    // {
-                    //     label: '进路取消',
-                    //     handler: this.cancelTrainRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    // },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '进路引导',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    // {
-                    //     label: '人工解锁进路', // 信号机引导取消
-                    //     handler: this.humanTrainRoute,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
-                    // },
-                    // {
-                    //     label: '设置自动进路',
-                    //     handler: this.singalPassModel,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    // },
-                    // {
-                    //     label: '取消自动进路',
-                    //     handler: this.singalCancelPassModel,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    // },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '设置联锁自动进路',
-                        handler: this.setAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '取消联锁自动进路',
-                        handler: this.cancelAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '查询进路状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ],
-                Center: [
-                    {
-                        label: '进路选排',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '进路取消',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '进路选排',
+                    handler: this.arrangementRoute,
+                    cmdType:CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '进路取消',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    isDisabled: (signal, work) => false,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '进路引导',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '进路交人工控',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '进路交自动控',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '设置联锁自动进路',
+                    handler: this.setAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: signalDevice => signalDevice.fleetMode === 1,
+                    isShow: (signalDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '取消联锁自动进路',
+                    handler: this.cancelAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: signalDevice => signalDevice.fleetMode !== 1,
+                    isShow: (signalDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '设置联锁自动触发',
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER,
+                    isDisabled: signalDevice => signalDevice.ciControl === 1,
+                    isShow: (signalDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '取消联锁自动触发',
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: signalDevice => signalDevice.ciControl !== 1,
+                    isShow: (signalDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '查询进路状态',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                }
+                // Local: [
+                //     // {
+                //     //     label: '进路取消',
+                //     //     handler: this.cancelTrainRoute,
+                //     //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                //     // },
+                //
+                //     // {
+                //     //     label: '人工解锁进路', // 信号机引导取消
+                //     //     handler: this.humanTrainRoute,
+                //     //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
+                //     // },
+                //     // {
+                //     //     label: '设置自动进路',
+                //     //     handler: this.singalPassModel,
+                //     //     cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+                //     // },
+                //     // {
+                //     //     label: '取消自动进路',
+                //     //     handler: this.singalCancelPassModel,
+                //     //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+                //     // },
+                // ],
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -221,7 +220,12 @@ export default {
             };
         },
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -290,6 +294,7 @@ export default {
                 break;
             }
             }
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
         },
         // 排列进路
         arrangementRoute() {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuStation.vue b/src/jmapNew/theme/foshan_01/menus/menuStation.vue
index f8fd11562..e87e9a346 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuStation.vue
@@ -23,6 +23,7 @@ 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';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'StationMenu',
@@ -40,21 +41,25 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '上电解锁',
-                        handler: this.powerUnLock
-                    }
-                ],
-                Center: [
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '上电解锁',
+                    handler: this.powerUnLock,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signalDevice, work) => work === 'localWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -105,6 +110,13 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.centralized) {
+                // 编辑模式菜单列表
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    menuItem.show = menuItem.isShow(this.selected, this.work);
+                    menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                    this.menu.push(menuItem);
+                });
                 // 故障模式菜单列表
                 if (this.operatemode === OperateMode.FAULT) {
                     this.menu = [...this.menuForce];
@@ -161,7 +173,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.powerUnLock.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
index df6f552e9..df4a9f847 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuStationStand.vue
@@ -27,8 +27,8 @@ import StandDetainTrainAll from './dialog/standDetainTrainAll';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'StationStandMenu',
@@ -50,95 +50,112 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+            menuNormal: [
+                {
+                    label: '设置扣车',
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: stand => stand.centerHoldTrain === 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置扣车',
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.stationHoldTrain === 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: stand => stand.centerHoldTrain !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.stationHoldTrain !== 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: '全线取消扣车',
+                    handler: this.cancelDetainTrainAll,
+                    cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => {
+                        return false;
                     },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '全线取消扣车',
-                        handler: this.cancelDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '强制取消扣车',
-                        handler: this.cancelDetainTrainForce,
-                        cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '设置提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '查询站台状态',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-
-                ],
-                Center: [
-                    {
-                        label: '设置扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '全线取消扣车',
-                        handler: this.cancelDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '设置提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: '设置停站时间',
-                        handler: this.setStopTime,
-                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '设置运行等级',
-                        handler: this.setRunLevel,
-                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: '查询站台状态',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-
-                    // 全线取消跳停
-                ]
-            },
+                    isShow: (stand, work) => { return true; }
+                },
+                {
+                    label: '强制取消扣车',
+                    handler: this.cancelDetainTrainForce,
+                    cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN,
+                    isDisabled: stand => { return false; },
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: '设置提前发车',
+                    handler: this.earlyDeparture,
+                    cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: stand => stand.trainParking !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置提前发车',
+                    handler: this.earlyDeparture,
+                    cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: stand => stand.trainParking !== 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: '设置跳停',
+                    handler: this.setJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => { return stand.allSkip === 1; },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消跳停',
+                    handler: this.cancelJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => { return stand.allSkip !== 1 && stand.assignSkip !== 1; },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置停站时间',
+                    handler: this.setStopTime,
+                    cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置运行等级',
+                    handler: this.setRunLevel,
+                    cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查询站台状态',
+                    handler: this.detail,
+                    cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -185,7 +202,15 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
+            if (this.operatemode === OperateMode.ADMIN) {
+                this.menu = [...this.menu, ...this.menuForce];
+            }
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
index 352342615..c5ac56154 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuSwitch.vue
@@ -25,7 +25,7 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SwitchMenu',
@@ -45,77 +45,104 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '道岔强扳定位',
-                    //     handler: this.locate,
-                    //     cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    // },
-                    // {
-                    //     label: '道岔强扳反位',
-                    //     handler: this.reverse,
-                    //     cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    // },
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '全线取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType:CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '道岔总定',
-                        handler: this.locate,
-                        cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '道岔总反',
-                        handler: this.reverse,
-                        cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔封闭',
-                        handler: this.block,
-                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
-                    },
-                    {
-                        label: '道岔解封',
-                        handler: this.unblock,
-                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '道岔总定',
+                    handler: this.locate,
+                    cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: switchDevice => switchDevice.pos === 'N',
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔总反',
+                    handler: this.reverse,
+                    cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: switchDevice => switchDevice.pos === 'R',
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: switchDevice => switchDevice.singleLock === 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: switchDevice => switchDevice.singleLock !== 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔封闭',
+                    handler: this.block,
+                    cmdType:CMD.Switch.CMD_SWITCH_BLOCK,
+                    isDisabled: switchDevice => switchDevice.blockade === 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔解封',
+                    handler: this.unblock,
+                    cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK,
+                    isDisabled: switchDevice => switchDevice.blockade !== 1,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+
+                {
+                    label: '道岔强扳定位',
+                    handler: this.locate,
+                    cmdType:CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: switchDevice => switchDevice.pos === 'N',
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '道岔强扳反位',
+                    handler: this.reverse,
+                    cmdType:CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: switchDevice => switchDevice.pos === 'R',
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '区段激活',
+                    handler: this.active,
+                    cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '区段切除',
+                    handler: this.split,
+                    cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
+                    isDisabled: (signal, work) => false,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isDisabled: (signal, work) => false,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '全线取消限速',
+                    handler: this.cancelSpeed,
+                    cmdType:CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED,
+                    isDisabled: (signal, work) => false,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -167,7 +194,13 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
+
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
@@ -259,6 +292,7 @@ export default {
                 break;
             }
             }
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
         },
         // 单操到定位
         locate(selectType) {
@@ -270,7 +304,7 @@ export default {
             }
             commitOperate(menuOperate.Switch.locate, {switchCode: code}, type).then(({valid, operate})=>{
                 !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -284,7 +318,7 @@ export default {
             }
             commitOperate(menuOperate.Switch.reverse, {switchCode: code}, type).then(({valid, operate})=>{
                 !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -298,7 +332,7 @@ export default {
             }
             commitOperate(menuOperate.Switch.lock, {switchCode: code}, type).then(({valid, operate})=>{
                 !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -312,7 +346,7 @@ export default {
             }
             commitOperate(menuOperate.Switch.unlock, {switchCode: code}, type).then(({valid, operate})=>{
                 !selectType.code && this.$refs.sectionUnLock.doShow(operate, this.selected);
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -326,7 +360,7 @@ export default {
             }
             commitOperate(menuOperate.Switch.block, {switchCode: code}, type).then(({valid, operate})=>{
                 !selectType.code && this.$refs.switchControl.doShow(operate, this.selected);
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
@@ -340,14 +374,14 @@ export default {
             }
             commitOperate(menuOperate.Switch.unblock, {switchCode: code}, type).then(({valid, operate})=>{
                 !selectType.code && this.$refs.sectionUnLock.doShow(operate, this.selected);
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
         // 道岔强扳
         switchTurnoutForce(selectType) {
             commitOperate(menuOperate.Switch.turnoutForce, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
-            }).catch(error=>{
+            }).catch(()=>{
                 this.$refs.noticeInfo.doShow();
             });
         },
diff --git a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
index efe9dfc0e..5bb9cba52 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuTrain.vue
@@ -35,7 +35,6 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -69,56 +68,53 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [],
-                Center: [
-                    {
-                        label: '添加列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '删除列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '修改列车识别号',
-                        handler: this.editTrainId,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '修改车组号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '移动列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '交换列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '标记ATP切除',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT
-                    },
-                    {
-                        label: '标记ATP激活',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER
-                    },
-                    {
-                        label: '查看列车详细运行信息',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_INFO
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '添加列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                },
+                {
+                    label: '删除列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                },
+                {
+                    label: '修改列车识别号',
+                    handler: this.editTrainId,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                },
+                {
+                    label: '修改车组号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                },
+                {
+                    label: '移动列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                },
+                {
+                    label: '交换列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                },
+                {
+                    label: '标记ATP切除',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT
+                },
+                {
+                    label: '标记ATP激活',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER
+                },
+                {
+                    label: '查看列车详细运行信息',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_INFO
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -228,7 +224,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected) : false;
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -375,7 +376,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -405,7 +406,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDefine.doShow(operate, this.selected);
@@ -422,7 +423,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate, this.selected);
@@ -439,7 +440,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(operate, this.selected);
@@ -456,7 +457,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -472,7 +473,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -489,7 +490,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetHead.doShow(operate, this.selected);
@@ -506,7 +507,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWork.doShow(operate, this.selected);
@@ -523,7 +524,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
@@ -540,7 +541,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.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 28d6a3fc7..6dc95a15a 100644
--- a/src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -186,7 +186,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue
index 08799df1d..2afb8666c 100644
--- a/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/foshan_01/menus/passiveDialog/timeout.vue
@@ -77,7 +77,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -88,7 +88,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/confirmControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
index 0db032276..f65f5e70b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue
@@ -157,7 +157,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -177,7 +177,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -197,7 +197,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -217,7 +217,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -237,7 +237,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -257,7 +257,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -278,7 +278,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -299,7 +299,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -320,7 +320,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -336,7 +336,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index f9bbfa9db..6b60990a3 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -81,7 +81,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -99,7 +99,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
index 6a27a1a37..619553eb1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
@@ -139,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
index ecd048c58..8143f0c96 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeCmdControl.vue
@@ -276,7 +276,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
@@ -296,7 +296,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -322,7 +322,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -352,7 +352,7 @@ export default {
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -383,7 +383,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -400,7 +400,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue
index 6faaafe5e..05d695cda 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue
@@ -127,11 +127,10 @@ export default {
             const operate = {
                 over: true,
                 operation: OperationEvent.Signal.detail.menu.operation,
-                cmdType: CMD.Signal.CMD_STAND_VIEW_STATUS
+                cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
             };
-
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -148,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
index 722bb37eb..cddfe3a27 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeHandControl.vue
@@ -207,7 +207,7 @@ export default {
                 /** 进路交自动控*/
                 operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -231,7 +231,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -282,7 +282,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
index ac9590868..b7b4ba75b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue
@@ -134,7 +134,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -150,7 +150,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
index 34c120391..3e58e91b8 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/routeSelection.vue
@@ -211,7 +211,7 @@ export default {
                         val: row.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -244,7 +244,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
index f7f44983b..4359e0246 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/sectionCmdControl.vue
@@ -271,7 +271,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -300,7 +300,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -318,7 +318,6 @@ export default {
             const operate = {
                 send: true
             };
-
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
                 /** 区段解封*/
                 operate.operation = OperationEvent.Section.unlock.confirm2.operation;
@@ -332,10 +331,9 @@ export default {
                 operate.operation = OperationEvent.Section.axlePreReset.confirm2.operation;
                 operate.cmdType = CMD.Section.CMD_SECTION_AXIS_PRE_RESET;
             }
-
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -345,8 +343,7 @@ export default {
                 } else {
                     this.editRecord({ order: this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: this.$t('tip.executionFailed') });
                 }
-            }).catch((error) => {
-                console.log(error, '=====');
+            }).catch(() => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -368,7 +365,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -385,7 +382,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 38d862ce6..f52131573 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
@@ -179,7 +179,7 @@ export default {
             this.strategy = strategy;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -202,7 +202,7 @@ export default {
                     val: this.strategy + ''
                 };
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -222,7 +222,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
index b59e2e645..59d7c27d9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standControl.vue
@@ -160,7 +160,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.loading = false;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).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 bf9e4b2f1..8aa126a4c 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
@@ -149,7 +149,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -164,7 +164,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
index 96f23f99c..a7d873c02 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue
@@ -143,7 +143,7 @@ export default {
                 val: (this.rightUp && upDown) || (!this.rightUp && !upDown) ? '02' : '01'
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -160,7 +160,7 @@ export default {
                 }
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -176,7 +176,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
index 30bfc4fff..9f963aad7 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standRunLevel.vue
@@ -214,7 +214,7 @@ export default {
             this.time = time;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -227,7 +227,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -251,7 +251,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -272,7 +272,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
index dfc4761ad..c50cc879a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standStopTime.vue
@@ -185,7 +185,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -198,7 +198,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -212,7 +212,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -230,7 +230,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -248,7 +248,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
index 3e1a58bee..f0fa17211 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/switchCmdControl.vue
@@ -318,7 +318,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -351,7 +351,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -389,7 +389,7 @@ export default {
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -425,7 +425,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -441,7 +441,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 892466252..98256a37c 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
@@ -120,7 +120,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -137,7 +137,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 c225cd779..264226380 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -128,7 +128,7 @@ export default {
                         val: this.formModel.groupNumber
                     };
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 f502c7627..d8af32e3e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
@@ -92,7 +92,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 d7b08de6d..d4ee0cdca 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
@@ -154,7 +154,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -175,7 +175,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 a79c4f1d9..5ac4f424d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
@@ -159,7 +159,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..8c564ca4f
--- /dev/null
+++ b/src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenu.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-deplot-button ref="menuDeplotButton" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'dispatchWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'dispatchWork'" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="fuzhou-01__systerm" />
+    <passive-Timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuDeplotButton from './menuDeplotButton';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './dispatchWorkMenuBar';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuDeplotButton,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return {};
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {},
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.fuzhou-01__systerm {
+	overflow: hidden !important;
+}
+
+.fuzhou-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.fuzhou-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .base-label {
+	background: rgb(240 240 240);
+	position: relative;
+}
+
+.fuzhou-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.fuzhou-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.fuzhou-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.fuzhou-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..8b57f6598
--- /dev/null
+++ b/src/jmapNew/theme/fuzhou_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,374 @@
+<template>
+  <div id="menuBarFuzhou">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control-convert ref="stationControlConvert" pop-class="fuzhou-01__systerm" />
+    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
+    <view-train-id ref="viewTrainId" />
+    <view-name ref="viewName" />
+    <view-device ref="viewDevice" />
+    <train-transtalet ref="trainTranstalet" />
+    <add-runplan-line ref="addRunplanLine" />
+    <delete-runplan-line ref="deleteRunplanLine" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import StationControlConvert from './menuDialog/stationControlConvert';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import AddRunplanLine from './menuDialog/addRunplanLine';
+import DeleteRunplanLine from './menuDialog/deleteRunplanLine';
+import PasswordBox from './menuDialog/passwordBox';
+import ViewTrainId from './menuDialog/viewTrainId';
+import ViewName from './menuDialog/viewName';
+import ViewDevice from './menuDialog/viewDevice';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'DispatchWorkMenuBar',
+    components: {
+        MenuBar,
+        StationControlConvert,
+        PasswordBox,
+        ViewTrainId,
+        ViewName,
+        ViewDevice,
+        TrainTranstalet,
+        AddRunplanLine,
+        DeleteRunplanLine,
+        ManageUser,
+        HelpAbout
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: this.$t('menu.menuBar.system'),
+                    operate: OperationEvent.Command.mBar.system,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.view'),
+                    operate: OperationEvent.Command.mBar.check,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.refresh'),
+                    operate: OperationEvent.Command.mBar.fresh,
+                    click: this.refresh,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.display'),
+                    operate: OperationEvent.Command.mBar.view,
+                    click: this.undeveloped,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setNameDisplay'),
+                            click: this.setNameDisplay,
+                            operate: OperationEvent.Command.view.setNameDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setDeviceDisplay'),
+                            click: this.setDeviceDisplay,
+                            operate: OperationEvent.Command.view.setDeviceDisplay
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.stationMapSwitch'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.planCarOperation'),
+                    operate: OperationEvent.Command.mBar.planTrain,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.addPlanCar'),
+                            click: this.addPlanTrain,
+                            operate: OperationEvent.Command.planTrain.addPlanTrain
+                        },
+                        {
+                            title: this.$t('menu.menuBar.panPlanCar'),
+                            click: this.translatPlanTrain,
+                            operate: OperationEvent.Command.planTrain.translatPlanTrain
+                        },
+                        {
+                            title: this.$t('menu.menuBar.deletePlanCar'),
+                            click: this.delPlanTrain,
+                            operate: OperationEvent.Command.planTrain.delPlanTrain
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.trainNumberMaintenance'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.controlModeSwitch'),
+                    operate: OperationEvent.Command.mBar.remoteControl,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.toStationControl'),
+                            click: this.turnToStationControl,
+                            operate: OperationEvent.StationControl.requestStationControl.mbar,
+                            force: true
+                        },
+                        {
+                            title: this.$t('menu.menuBar.forcedStationControl'),
+                            click: this.mandatoryStationControl,
+                            operate: OperationEvent.StationControl.forcedStationControl.password,
+                            force: true
+                        },
+                        {
+                            title: this.$t('menu.menuBar.toCentralControl'),
+                            click: this.conterStationControl,
+                            operate: OperationEvent.StationControl.requestCentralControl.mbar
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.requestOperationArea'),
+                    operate: OperationEvent.Command.mBar.requestZone,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.schedulingLog'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.systemAnalysis'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.userManage'),
+                    operate: OperationEvent.Command.mBar.userManage,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.userManage'),
+                            click: this.userManage,
+                            operate: OperationEvent.Command.manage.userManage
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.historyQuery'),
+                    operate: OperationEvent.Command.mBar.historyQuery,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.help'),
+                    operate: OperationEvent.Command.mBar.help,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.about'),
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    methods: {
+        // 转为站控
+        turnToStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 强制转为站控
+        mandatoryStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
+        },
+        // 请求中控
+        conterStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        // 设置设备显示
+        setNameDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewName.doShow(operate);
+                }
+            });
+        },
+        // 设置名称显示
+        setDeviceDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewDevice.doShow(operate);
+                }
+            });
+        },
+        // 添加计划车
+        addPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // this.$refs.trainAdd.doShow(operate);
+                    this.$refs.addRunplanLine.doShow(operate);
+                }
+            });
+        },
+        // 平移计划车
+        translatPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainTranstalet.doShow(operate);
+                }
+            });
+        },
+        // 删除计划车
+        delPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    // this.$refs.trainDelete.doShow(operate);
+                    this.$refs.deleteRunplanLine.doShow(operate);
+                }
+            });
+        },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+
+            EventBus.$emit('refresh');
+        },
+        getLoginResult(operate) {
+            /** 密码校验*/
+            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+                if (operate.success) {
+                    /** 校验成功*/
+                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+                }
+            }
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+#menuBarFuzhou{
+	line-height:30px;
+}
+#menuBarChengdu3 #menuBar .menu-li-block .label{
+	padding: 0px 30px 0px 5px !important;
+}
+</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/index.vue b/src/jmapNew/theme/fuzhou_01/menus/index.vue
deleted file mode 100644
index e1116e3eb..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/index.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-  <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-    <menu-deplot-button ref="menuDeplotButton" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
-    <passive-alarm ref="passiveAlarm" />
-    <passive-contorl ref="passiveControl" pop-class="fuzhou-01__systerm" />
-    <passive-Timeout ref="passiveTimeout" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import MenuDeplotButton from './menuDeplotButton';
-import MenuSignal from './menuSignal';
-import MenuStationStand from './menuStationStand';
-import MenuSwitch from './menuSwitch';
-import MenuSection from './menuSection';
-import MenuTrain from './menuTrain';
-import MenuStation from './menuStation';
-import MenuBar from './menuBar';
-import PassiveAlarm from './passiveDialog/alarm';
-import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
-import PassiveTimeout from './passiveDialog/timeout';
-
-export default {
-    name: 'Menus',
-    components: {
-        MenuBar,
-        MenuDeplotButton,
-        MenuSignal,
-        MenuSwitch,
-        MenuSection,
-        MenuStationStand,
-        MenuStation,
-        MenuTrain,
-        PassiveAlarm,
-        PassiveContorl,
-        PassiveTimeout
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    computed: {
-        ...mapGetters('config', [
-            'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07' && this.$store.state.training.prdType != '09';
-        }
-    },
-    watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('config/updateMenuBar');
-            const _that = this;
-            window.onclick = function (e) {
-                if (!_that.$store.state.training.trainingStart) {
-                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
-                }
-                _that.$refs.menuStationStand.doClose();
-                _that.$refs.menuSwitch.doClose();
-                _that.$refs.menuSignal.doClose();
-                _that.$refs.menuSection.doClose();
-                _that.$refs.menuTrain.doClose();
-                _that.$refs.menuStation.doClose();
-            };
-        });
-    },
-    beforeDestroy() {
-        window.onclick = function (e) {};
-    }
-};
-</script>
-
-<style>
-    .menus .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .menus .pop-menu span {
-        color: #000;
-    }
-
-    .menus .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .fuzhou-01__systerm {
-        overflow: hidden !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog {
-        background: rgba(100, 100, 100, 0.3);
-        border: 2px solid rgb(144, 144, 144, 0.8);
-        border-radius: 6px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__header {
-        padding: 5px;
-        height: 26px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__footer {
-        background: #F0F0F0;
-        opacity: 1;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 5px 5px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        background: #F0F0F0;
-        opacity: 1;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__title {
-        position: absolute;
-        top: 4px;
-        color: #000;
-        border-radius: 4px;
-        padding: 0px 2px;
-        height: 20px;
-        line-height: 20px
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__title::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        -webkit-filter: blur(10px);
-        filter: blur(10px);
-        height: 20px;
-        width: -webkit-fill-available;
-        background: rgba(128, 128, 128, 0.8);
-        z-index: -1;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid #fff;
-        border-radius: 4px;
-        top: 4px;
-        right: 5px;
-        line-height: 16px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #F0F0F0;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
-        background: #F0F0F0 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .current-row>td {
-        background: #3399FF !important;
-        color: #fff !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .base-label {
-        background: rgb(240 240 240);
-        position: relative;
-    }
-
-    .fuzhou-01__systerm .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .fuzhou-01__systerm .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .fuzhou-01__systerm .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .fuzhou-01__systerm .el-dialog .button-group {
-        margin-top: 10px;
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/localWorkMenu.vue b/src/jmapNew/theme/fuzhou_01/menus/localWorkMenu.vue
new file mode 100644
index 000000000..f2a39bbda
--- /dev/null
+++ b/src/jmapNew/theme/fuzhou_01/menus/localWorkMenu.vue
@@ -0,0 +1,358 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar v-if="!noShowBar" ref="menuBar" :selected="selected" />
+    <menu-deplot-button ref="menuDeplotButton" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="fuzhou-01__systerm" />
+    <passive-timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuDeplotButton from './menuDeplotButton';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './localWorkMenuBar';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuDeplotButton,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        noShowBar() {
+            return this.$store.state.training.roles === 'DEPOT_DISPATCHER' || this.$store.state.training.roles === 'SIGNAL_BUILDING';
+        }
+    },
+    watch: {},
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.fuzhou-01__systerm {
+	overflow: hidden !important;
+}
+
+.fuzhou-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.fuzhou-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.fuzhou-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.fuzhou-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.fuzhou-01__systerm .el-dialog .base-label {
+	background: rgb(240 240 240);
+	position: relative;
+}
+
+.fuzhou-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.fuzhou-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.fuzhou-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.fuzhou-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.fuzhou-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..ce0565ba3
--- /dev/null
+++ b/src/jmapNew/theme/fuzhou_01/menus/localWorkMenuBar.vue
@@ -0,0 +1,285 @@
+<template>
+  <div id="menuBarFuzhou">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control-convert ref="stationControlConvert" pop-class="fuzhou-01__systerm" />
+    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
+    <view-train-id ref="viewTrainId" />
+    <view-name ref="viewName" />
+    <view-device ref="viewDevice" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import StationControlConvert from './menuDialog/stationControlConvert';
+import PasswordBox from './menuDialog/passwordBox';
+import ViewTrainId from './menuDialog/viewTrainId';
+import ViewName from './menuDialog/viewName';
+import ViewDevice from './menuDialog/viewDevice';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'LocalWorkMenu',
+    components: {
+        MenuBar,
+        StationControlConvert,
+        PasswordBox,
+        ViewTrainId,
+        ViewName,
+        ViewDevice,
+        ManageUser,
+        HelpAbout
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: this.$t('menu.menuBar.system'),
+                    operate: OperationEvent.Command.mBar.system,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.view'),
+                    operate: OperationEvent.Command.mBar.check,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.refresh'),
+                    operate: OperationEvent.Command.mBar.fresh,
+                    click: this.refresh,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.display'),
+                    operate: OperationEvent.Command.mBar.view,
+                    click: this.undeveloped,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setNameDisplay'),
+                            click: this.setNameDisplay,
+                            operate: OperationEvent.Command.view.setNameDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setDeviceDisplay'),
+                            click: this.setDeviceDisplay,
+                            operate: OperationEvent.Command.view.setDeviceDisplay
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.stationMapSwitch'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.controlModeSwitch'),
+                    operate: OperationEvent.Command.mBar.remoteControl,
+                    click: this.undeveloped,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.toStationControl'),
+                            click: this.turnToStationControl,
+                            operate: OperationEvent.StationControl.requestStationControl.mbar
+                        },
+                        {
+                            title: this.$t('menu.menuBar.forcedStationControl'),
+                            click: this.mandatoryStationControl,
+                            operate: OperationEvent.StationControl.forcedStationControl.password
+                        },
+                        {
+                            title: this.$t('menu.menuBar.toCentralControl'),
+                            click: this.conterStationControl,
+                            operate: OperationEvent.StationControl.requestCentralControl.mbar,
+                            force: true
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.requestOperationArea'),
+                    operate: OperationEvent.Command.mBar.requestZone,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.historyQuery'),
+                    operate: OperationEvent.Command.mBar.historyQuery,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.userManage'),
+                    operate: OperationEvent.Command.mBar.userManage,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.userManage'),
+                            click: this.userManage,
+                            operate: OperationEvent.Command.manage.userManage
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.help'),
+                    operate: OperationEvent.Command.mBar.help,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.about'),
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    methods: {
+        // 转为站控
+        turnToStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 强制转为站控
+        mandatoryStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
+        },
+        // 请求中控
+        conterStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        // 设置设备显示
+        setNameDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewName.doShow(operate);
+                }
+            });
+        },
+        // 设置名称显示
+        setDeviceDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewDevice.doShow(operate);
+                }
+            });
+        },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+
+            EventBus.$emit('refresh');
+        },
+        getLoginResult(operate) {
+            /** 密码校验*/
+            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+                if (operate.success) {
+                    /** 校验成功*/
+                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+                }
+            }
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+#menuBarFuzhou{
+	line-height:30px;
+}
+#menuBarChengdu3 #menuBar .menu-li-block .label{
+	padding: 0px 30px 0px 5px !important;
+}
+</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue b/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
deleted file mode 100644
index 6933e3919..000000000
--- a/src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
+++ /dev/null
@@ -1,496 +0,0 @@
-<template>
-  <div id="menuBarFuzhou">
-    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
-    <station-control-convert ref="stationControlConvert" pop-class="fuzhou-01__systerm" />
-    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
-    <view-train-id ref="viewTrainId" />
-    <view-name ref="viewName" />
-    <view-device ref="viewDevice" />
-    <!-- <train-add ref="trainAdd" /> -->
-    <train-transtalet ref="trainTranstalet" />
-    <!-- <train-delete ref="trainDelete" /> -->
-    <add-runplan-line ref="addRunplanLine" />
-    <delete-runplan-line ref="deleteRunplanLine" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-  </div>
-</template>
-<script>
-// import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
-import MenuBar from '@/jmapNew/theme/components/menus/menuBar';
-import StationControlConvert from './menuDialog/stationControlConvert';
-// import TrainAdd from './menuDialog/trainAdd';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-// import TrainDelete from './menuDialog/trainDelete';
-import AddRunplanLine from './menuDialog/addRunplanLine';
-import DeleteRunplanLine from './menuDialog/deleteRunplanLine';
-import PasswordBox from './menuDialog/passwordBox';
-import ViewTrainId from './menuDialog/viewTrainId';
-import ViewName from './menuDialog/viewName';
-import ViewDevice from './menuDialog/viewDevice';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MenuBarFuzhou',
-    components: {
-        MenuBar,
-        StationControlConvert,
-        PasswordBox,
-        ViewTrainId,
-        ViewName,
-        ViewDevice,
-        // TrainAdd,
-        TrainTranstalet,
-        // TrainDelete,
-        AddRunplanLine,
-        DeleteRunplanLine,
-        ManageUser,
-        HelpAbout
-    },
-    data() {
-        return {
-            menuNormal: {
-                Local: [
-                    {
-                        title: this.$t('menu.menuBar.system'),
-                        operate: OperationEvent.Command.mBar.system,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.view'),
-                        operate: OperationEvent.Command.mBar.check,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.refresh'),
-                        operate: OperationEvent.Command.mBar.fresh,
-                        click: this.refresh,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.display'),
-                        operate: OperationEvent.Command.mBar.view,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setNameDisplay'),
-                                click: this.setNameDisplay,
-                                operate: OperationEvent.Command.view.setNameDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setDeviceDisplay'),
-                                click: this.setDeviceDisplay,
-                                operate: OperationEvent.Command.view.setDeviceDisplay
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.stationMapSwitch'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.controlModeSwitch'),
-                        operate: OperationEvent.Command.mBar.remoteControl,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.toStationControl'),
-                                click: this.turnToStationControl,
-                                operate: OperationEvent.StationControl.requestStationControl.mbar
-                            },
-                            {
-                                title: this.$t('menu.menuBar.forcedStationControl'),
-                                click: this.mandatoryStationControl,
-                                operate: OperationEvent.StationControl.forcedStationControl.password
-                            },
-                            {
-                                title: this.$t('menu.menuBar.toCentralControl'),
-                                click: this.conterStationControl,
-                                operate: OperationEvent.StationControl.requestCentralControl.mbar,
-                                force: true
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.requestOperationArea'),
-                        operate: OperationEvent.Command.mBar.requestZone,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.historyQuery'),
-                        operate: OperationEvent.Command.mBar.historyQuery,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.userManage'),
-                        operate: OperationEvent.Command.mBar.userManage,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.userManage'),
-                                click: this.userManage,
-                                operate: OperationEvent.Command.manage.userManage
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.help'),
-                        operate: OperationEvent.Command.mBar.help,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.about'),
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ],
-                Center: [
-                    {
-                        title: this.$t('menu.menuBar.system'),
-                        operate: OperationEvent.Command.mBar.system,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.view'),
-                        operate: OperationEvent.Command.mBar.check,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.refresh'),
-                        operate: OperationEvent.Command.mBar.fresh,
-                        click: this.refresh,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.display'),
-                        operate: OperationEvent.Command.mBar.view,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setNameDisplay'),
-                                click: this.setNameDisplay,
-                                operate: OperationEvent.Command.view.setNameDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setDeviceDisplay'),
-                                click: this.setDeviceDisplay,
-                                operate: OperationEvent.Command.view.setDeviceDisplay
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.stationMapSwitch'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.planCarOperation'),
-                        operate: OperationEvent.Command.mBar.planTrain,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.addPlanCar'),
-                                click: this.addPlanTrain,
-                                operate: OperationEvent.Command.planTrain.addPlanTrain
-                            },
-                            {
-                                title: this.$t('menu.menuBar.panPlanCar'),
-                                click: this.translatPlanTrain,
-                                operate: OperationEvent.Command.planTrain.translatPlanTrain
-                            },
-                            {
-                                title: this.$t('menu.menuBar.deletePlanCar'),
-                                click: this.delPlanTrain,
-                                operate: OperationEvent.Command.planTrain.delPlanTrain
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.trainNumberMaintenance'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.controlModeSwitch'),
-                        operate: OperationEvent.Command.mBar.remoteControl,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.toStationControl'),
-                                click: this.turnToStationControl,
-                                operate: OperationEvent.StationControl.requestStationControl.mbar,
-                                force: true
-                            },
-                            {
-                                title: this.$t('menu.menuBar.forcedStationControl'),
-                                click: this.mandatoryStationControl,
-                                operate: OperationEvent.StationControl.forcedStationControl.password,
-                                force: true
-                            },
-                            {
-                                title: this.$t('menu.menuBar.toCentralControl'),
-                                click: this.conterStationControl,
-                                operate: OperationEvent.StationControl.requestCentralControl.mbar
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.requestOperationArea'),
-                        operate: OperationEvent.Command.mBar.requestZone,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.schedulingLog'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.systemAnalysis'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.userManage'),
-                        operate: OperationEvent.Command.mBar.userManage,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.userManage'),
-                                click: this.userManage,
-                                operate: OperationEvent.Command.manage.userManage
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.historyQuery'),
-                        operate: OperationEvent.Command.mBar.historyQuery,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.help'),
-                        operate: OperationEvent.Command.mBar.help,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.about'),
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    // computed: {
-    //     ...mapGetters('map', [
-    //         'stationList'
-    //     ])
-    // },
-    methods: {
-        // 转为站控
-        turnToStationControl(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControlConvert.doShow(operate);
-                }
-            });
-        },
-        // 强制转为站控
-        mandatoryStationControl(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.passwordBox.doShow(operate);
-                }
-            });
-        },
-        // 请求中控
-        conterStationControl(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControlConvert.doShow(operate);
-                }
-            });
-        },
-        // 设置列车识别号显示
-        setTrainIdDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewTrainId.doShow(operate);
-                }
-            });
-        },
-        // 设置设备显示
-        setNameDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewName.doShow(operate);
-                }
-            });
-        },
-        // 设置名称显示
-        setDeviceDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewDevice.doShow(operate);
-                }
-            });
-        },
-        // 添加计划车
-        addPlanTrain(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    // this.$refs.trainAdd.doShow(operate);
-                    this.$refs.addRunplanLine.doShow(operate);
-                }
-            });
-        },
-        // 平移计划车
-        translatPlanTrain(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainTranstalet.doShow(operate);
-                }
-            });
-        },
-        // 删除计划车
-        delPlanTrain(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    // this.$refs.trainDelete.doShow(operate);
-                    this.$refs.deleteRunplanLine.doShow(operate);
-                }
-            });
-        },
-        // 用户管理
-        userManage(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.manageUser.doShow(operate);
-                }
-            });
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        // 刷新
-        refresh() {
-
-            EventBus.$emit('refresh');
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        undeveloped() {
-            this.$refs.menuBar.doClose();
-            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                callback: action => {
-                }
-            });
-        },
-        blankClickClose() {
-            this.$refs.menuBar.doClose();
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-    #menuBarFuzhou{
-        line-height:30px;
-    }
-    #menuBarChengdu3 #menuBar .menu-li-block .label{
-        padding: 0px 30px 0px 5px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
index 33930fc00..5289f7742 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
@@ -149,7 +149,7 @@ import PasswordBox from '@/jmapNew/theme/components/menus/childDialog/passwordIn
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 // import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
@@ -193,7 +193,7 @@ export default {
             return OperationEvent.Station;
         },
         isShowBtn() {
-            return this.$store.state.training.prdType == '09';
+            return this.$store.state.training.roles === 'DEPOT_DISPATCHER' || this.$store.state.training.roles === 'SIGNAL_BUILDING';
         }
     },
     watch: {
@@ -203,7 +203,7 @@ export default {
     },
     beforeDestroy() {
         this.resetMbmButton();
-        Handler.clear(); // 清空操作组
+        // Handler.clear(); // 清空操作组
     },
     methods: {
         updateButtonShow(val, old) {
@@ -231,7 +231,7 @@ export default {
         // 执行操作
         trainingOperation(operate) {
             const that = this;
-            that.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            that.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     const stationCode = this.$store.state.training.roleDeviceCode;
                     if (stationCode) {
@@ -343,7 +343,7 @@ export default {
                 this.Signal.cancelTrainRoute.button.operation
             ];
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.operation = operation;
                     this.$store.dispatch('menuOperation/setButtonOperation', operation); // 按钮菜单是否被按下
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue
index f8ee65b54..c741315d1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/addRunplanLine.vue
@@ -336,7 +336,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
index fc163055f..cb1145ad3 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -94,7 +94,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -120,7 +120,7 @@ export default {
                 operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
             }
             this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.doClose();
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
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 bf60a4b57..4dd38aa02 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 60e9e86e9..4fa605e80 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
@@ -100,7 +100,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 caa0513c0..d643fc594 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 399524280..f79f74323 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 540980bac..8ad9d34a4 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 4a584361e..ff170bf28 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
@@ -123,7 +123,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -138,7 +138,7 @@ export default {
             }
             if (this.model.password == '123456') {
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (valid) {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
index 187a35af3..3cbdbd8ca 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
@@ -270,7 +270,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -293,8 +293,11 @@ export default {
             if (selection && selection.length) {
                 const operate = {
                     operation: '',
-                    val: stationCodeList.join('::'),
-                    selection: selection
+                    // val: stationCodeList.join('::'),
+                    selection: selection,
+                    param: {
+                        stationCodes: stationCodeList
+                    }
                 };
 
                 if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl)) {
@@ -306,7 +309,7 @@ export default {
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -321,7 +324,7 @@ export default {
             const operate = {
                 messages: [this.$t('menu.menuDialog.confirmStationControlTip')],
                 operation: OperationEvent.StationControl.requestStationControl.menu.operation,
-                val: stationCodeList.join('::'),
+                // val: stationCodeList.join('::'),
                 selection: this.selection,
                 param: {
                     stationCodes: stationCodeList
@@ -333,7 +336,7 @@ export default {
             });
 
             this.disabledSure = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -349,7 +352,7 @@ export default {
             const operate = {
                 messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
                 operation: OperationEvent.StationControl.forcedStationControl.menu.operation,
-                val: stationCodeList.join('::'),
+                // val: stationCodeList.join('::'),
                 selection: this.selection,
                 param: {
                     stationCodes: stationCodeList
@@ -361,7 +364,7 @@ export default {
             });
 
             this.disabledSure = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -377,7 +380,7 @@ export default {
             const operate = {
                 messages: [this.$t('menu.menuDialog.confirmInTheControlTip')],
                 operation: OperationEvent.StationControl.requestCentralControl.menu.operation,
-                val: stationCodeList.join('::'),
+                // val: stationCodeList.join('::'),
                 selection: this.selection,
                 param: {
                     stationCodes: stationCodeList
@@ -389,7 +392,7 @@ export default {
             });
 
             this.disabledSure = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
index 8fabbbd62..1364d482a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 aa6c40359..97fb54142 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
@@ -108,7 +108,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 93e99626e..df9b83db6 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 7ee693654..9986e4fcd 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
@@ -96,7 +96,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -111,7 +111,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 7f07ea0e0..a09135113 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
@@ -130,7 +130,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -145,7 +145,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 0204b3055..6629194b9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
@@ -145,7 +145,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -160,7 +160,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.setTrainDispaly();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
index 7f49298d4..92f27a3f8 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSection.vue
@@ -24,9 +24,9 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SectionMenu',
@@ -44,91 +44,78 @@ export default {
         selected: {
             type: Object,
             default() {
-                return null;
+                return {};
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
             }
         }
     },
     data() {
         return {
             menu: [],
-            logicMenu: [
+            menuNormal: [
+                {
+                    label: '故障解锁',
+                    handler: this.fault,
+                    cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
+                    isDisabled: (section, work) => false,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: this.$t('menu.menuSection.sectionResection'),
+                    handler: this.split,
+                    cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
+                    isDisabled: (section, work) => section.cutOff === 1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: this.$t('menu.menuSection.sectionActive'),
+                    handler: this.active,
+                    cmdType: CMD.Section.CMD_SECTION_ACTIVE,
+                    isDisabled: (section, work) => section.cutOff !== 1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: '计轴预复位',
+                    handler: this.axlePreReset,
+                    cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET,
+                    isDisabled: (section, work) => false,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: this.$t('menu.menuSection.sectionBlockade'),
+                    handler: this.lock,
+                    cmdType: CMD.Section.CMD_SECTION_BLOCK,
+                    // isDisabled: section => section.blockade === 1,
+                    isDisabled: (section, work) => section.blockade === 1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: this.$t('menu.menuSection.sectionUnblock'),
+                    handler: this.unlock,
+                    cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
+                    isDisabled: (section, work) => section.blockade !== 1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
                 {
                     label: '设置限速',
                     handler: this.setSpeed,
-                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (section, work) => section.speedUpLimit !== -1,
+                    isShow: (section, work) => section.type === '02'
                 },
                 {
                     label: '取消限速',
                     handler: this.cancelSpeed,
-                    cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
+                    cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
+                    isDisabled: (section, work) => section.speedUpLimit === -1,
+                    isShow: (section, work) => section.type === '02'
                 }
             ],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '故障解锁',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionResection'),
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionActive'),
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '计轴预复位',
-                        handler: this.axlePreReset,
-                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionBlockade'),
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionUnblock'),
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    }
-                ],
-                Center: [
-                    {
-                        label: '故障解锁',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionResection'),
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionActive'),
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '计轴预复位',
-                        handler: this.axlePreReset,
-                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionBlockade'),
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSection.sectionUnblock'),
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    }
-                ]
-            },
             menuForce: [
                 {
                     label: this.$t('menu.menuSection.setFault'),
@@ -179,27 +166,23 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
-                cmdType: CMD.Section.CMD_Train_Init_Plan
+                cmdType: CMD.Section.CMD_Train_Init_Plan,
+                isDisabled: (section, work) => false,
+                isShow: (section, work) => true
             });
         }
     },
     methods: {
         initMenu() {
-            // 编辑模式菜单列表
-            if (this.selected.type == '01' || this.selected.type == '03') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
-            } else if (this.selected.type == '02') {
-                const logic = {
-                    Local: [...this.menuNormal.Local, ...this.logicMenu],
-                    Center: [...this.menuNormal.Center, ...this.logicMenu]
-                };
-                this.menu = MenuContextHandler.covert(logic);
-            } else {
-                this.menu = [];
-            }
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
                 this.menu = this.menuForce;
@@ -216,7 +199,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainAddPlan.doShow(step, this.selected);
@@ -262,8 +245,7 @@ export default {
             // 故障解锁
             case OperationEvent.Section.fault.button.operation: {
                 commitOperate(menuOperate.Section.fault, {sectionCode: selectType.code}, 3).then(({valid, operate}) => {
-                    if (valid) {
-                    } else {
+                    if (!valid) {
                         this.$refs.noticeInfo.doShow();
                     }
                 }).catch((error) => {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
index 786ab0cd0..072440d95 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue
@@ -23,11 +23,11 @@ import RouteHandControl from './dialog/routeHandControl';
 import RouteDetail from './dialog/routeDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'SignalMenu',
@@ -48,6 +48,12 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -55,142 +61,113 @@ export default {
             menu: [],
             clickNum:0,
             oldSelected:null,
-            menuNormal: {
-                Local: [
-                    {
-                        label: this.$t('menu.menuSignal.routeSelect'),
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeCancel'),
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalBlock'),
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalDeblock'),
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalReopen'),
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalOff'),
-                        handler: this.signalClose,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
-                    },
-                    {
-                        label: '进路引导',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.setInterlockAutoRoute'),
-                        handler: this.setAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.cancelInterlockAutoRoute'),
-                        handler: this.cancelAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.setInterlockAutoTrigger'),
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.cancelInterlockAutoTrigger'),
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '查询进路控制模式',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ],
-                Center: [
-                    {
-                        label: this.$t('menu.menuSignal.routeSelect'),
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.routeCancel'),
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalBlock'),
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalDeblock'),
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalOff'),
-                        handler: this.signalClose,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
-                    },
-                    {
-                        label: this.$t('menu.menuSignal.signalReopen'),
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '引导进路办理',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    // {
-                    //     label: this.$t('menu.menuSignal.setInterlockAutoRoute'),
-                    //     handler: this.setAutoInterlock,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuSignal.cancelInterlockAutoRoute'),
-                    //     handler: this.cancelAutoInterlock,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuSignal.setInterlockAutoTrigger'),
-                    //     handler: this.setAutoTrigger,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuSignal.cancelInterlockAutoTrigger'),
-                    //     handler: this.cancelAutoTrigger,
-                    //     cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
-                    // },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交ATS自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路控制模式',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: this.$t('menu.menuSignal.routeSelect'),
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSignal.routeCancel'),
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSignal.signalBlock'),
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => signal.blockade === 1,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSignal.signalDeblock'),
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => signal.blockade !== 1,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSignal.signalReopen'),
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSignal.signalOff'),
+                    handler: this.signalClose,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '进路引导',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '引导进路办理',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuSignal.setInterlockAutoRoute'),
+                    handler: this.setAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: (signal, work) => signal.fleetMode === 1,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: this.$t('menu.menuSignal.cancelInterlockAutoRoute'),
+                    handler: this.cancelAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: (signal, work) => signal.fleetMode === 0,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: this.$t('menu.menuSignal.setInterlockAutoTrigger'),
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER,
+                    isDisabled: (signal, work) => signal.ciControl === 1,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: this.$t('menu.menuSignal.cancelInterlockAutoTrigger'),
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: (signal, work) => signal.ciControl !== 1,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '进路交人工控',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '进路交ATS自动控',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查询进路控制模式',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuSignal.setFault'),
@@ -299,7 +276,12 @@ export default {
     },
     methods: {
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
index 0677a90fa..03ac492d1 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStation.vue
@@ -19,8 +19,8 @@ import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'StationMenu',
@@ -38,61 +38,54 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: this.$t('menu.menuStation.fullSiteSetInterlockAutoTrigger'),
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: this.$t('menu.menuStation.fullSiteCancelInterlockAutoTrigger'),
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
-                    }
-                    // {
-                    //     label: this.$t('menu.menuStation.powerUnLock'),
-                    //     handler: this.powerUnLock,
-                    //     auth: { station: true, center: false }
-                    //     // cmdType: CMD.Station.
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuStation.execKeyOperationTest'),
-                    //     handler: this.execKeyOperationTest,
-                    //     auth: { station: true, center: false }
-                    //     // cmdType: CMD.Station.
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '全站进路交人工控',
-                        handler: this.humanControlALL,
-                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '全站进路ATS自排',
-                        handler: this.atsAutoControlALL,
-                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: this.$t('menu.menuStation.execKeyOperationTest'),
-                        handler: this.execKeyOperationTest,
-                        cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    }
-                    // {
-                    //     label: this.$t('menu.menuStation.execKeyOperationTest'),
-                    //     handler: this.execKeyOperationTest,
-                    //     auth: { station: false, center: true },
-                    //     cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
-                    //     // cmdType: CMD.Section.
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: this.$t('menu.menuStation.fullSiteSetInterlockAutoTrigger'),
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: this.$t('menu.menuStation.fullSiteCancelInterlockAutoTrigger'),
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '全站进路交人工控',
+                    handler: this.humanControlALL,
+                    cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '全站进路ATS自排',
+                    handler: this.atsAutoControlALL,
+                    cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStation.execKeyOperationTest'),
+                    handler: this.execKeyOperationTest,
+                    cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuStation.setStoppage'),
@@ -138,8 +131,11 @@ export default {
     methods: {
         initMenu() {
             this.menu = [];
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menuNormal.forEach(menuItem => {
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
index bacecb53c..e0054c41a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuStationStand.vue
@@ -27,8 +27,8 @@ import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     name: 'StationStandMenu',
@@ -50,97 +50,103 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: this.$t('menu.menuStationStand.setDetainTrain'),
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrain'),
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
-                        handler: this.cancelDetainTrainForce,
-                        cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.jumpStop'),
-                        handler: this.setJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelJumpStop'),
-                        handler: this.cancelJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.getStationStandStatus'),
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ],
-                Center: [
-                    {
-                        label: this.$t('menu.menuStationStand.setDetainTrain'),
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrain'),
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelDetainTrainAll'),
-                        handler: this.cancelDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.jumpStop'),
-                        handler: this.setJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.cancelJumpStop'),
-                        handler: this.cancelJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setStopTime'),
-                        handler: this.setStopTime,
-                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setRunLevel'),
-                        handler: this.setRunLevel,
-                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setEarlyDeparture'),
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.setBackStrategy'),
-                        handler: this.setBackStrategy,
-                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
-                    },
-                    {
-                        label: this.$t('menu.menuStationStand.getStationStandStatus'),
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: this.$t('menu.menuStationStand.setDetainTrain'),
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain === 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.cancelDetainTrain'),
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.setDetainTrain'),
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.stationHoldTrain === 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.cancelDetainTrain'),
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.stationHoldTrain !== 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
+                    handler: this.cancelDetainTrainForce,
+                    cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => true
+                },
+                {
+                    label: this.$t('menu.menuStationStand.jumpStop'),
+                    handler: this.setJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 0,
+                    isShow: (stand, work) => true
+                },
+                {
+                    label: this.$t('menu.menuStationStand.cancelJumpStop'),
+                    handler: this.cancelJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 1 && stand.assignSkip !== 1,
+                    isShow: (stand, work) => true
+                },
+                {
+                    label: this.$t('menu.menuStationStand.setStopTime'),
+                    handler: this.setStopTime,
+                    cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.setRunLevel'),
+                    handler: this.setRunLevel,
+                    cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.setEarlyDeparture'),
+                    handler: this.earlyDeparture,
+                    cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: (stand, work) => stand.trainParking !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.setBackStrategy'),
+                    handler: this.setBackStrategy,
+                    cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuStationStand.getStationStandStatus'),
+                    handler: this.detail,
+                    cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuStationStand.setFault'),
@@ -191,8 +197,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce];
             }
@@ -202,17 +212,15 @@ export default {
                 this.menu = this.menuForce;
             }
             // 非故障模式 且 角色为车站值班员时 增加PSL盘
-            if (this.operatemode !== OperateMode.FAULT && this.$store.state.training.prdType === '01') {
-                this.menu = [
-                    ...this.menu,
-                    {
-                        label: 'PSL',
-                        handler: this.openPsl
-                    }
-                ];
-            }
-
-            // this.menu = MenuContextHandler.covert(this.menu);
+            // if (this.operatemode !== OperateMode.FAULT && this.work === 'localWork') {
+            //     this.menu = [
+            //         ...this.menu,
+            //         {
+            //             label: 'PSL',
+            //             handler: this.openPsl
+            //         }
+            //     ];
+            // }
         },
         doShow(point) {
             this.initMenu();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
index a12eab041..2bf468422 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuSwitch.vue
@@ -11,364 +11,333 @@
 </template>
 
 <script>
-import PopMenu from '@/components/PopMenu'
-import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl'
-import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault'
-import SwitchCmdControl from './dialog/switchCmdControl'
-import SpeedCmdControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl'
-import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock'
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
-import CMD from '@/scripts/cmdPlugin/CommandEnum'
-import { mapGetters } from 'vuex'
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic'
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler'
-import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate'
+import PopMenu from '@/components/PopMenu';
+import SwitchControl from '@/jmapNew/theme/components/menus/dialog/switchControl';
+import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import SwitchCmdControl from './dialog/switchCmdControl';
+import SpeedCmdControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
+import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
-  name: 'SwitchMenu',
-  components: {
-    PopMenu,
-    SwitchControl,
-    SwitchCmdControl,
-    SpeedCmdControl,
-    NoticeInfo,
-    SetFault,
-    SwitchHookLock,
-  },
-  props: {
-    selected: {
-      type: Object,
-      default() {
-        return null
-      },
+    name: 'SwitchMenu',
+    components: {
+        PopMenu,
+        SwitchControl,
+        SwitchCmdControl,
+        SpeedCmdControl,
+        NoticeInfo,
+        SetFault,
+        SwitchHookLock
     },
-  },
-  data() {
-    return {
-      menu: [],
-      menuNormal: {
-        Local: [
-          {
-            label: '道岔单锁',
-            handler: this.lock,
-            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
-          },
-          {
-            label: '道岔单解',
-            handler: this.unlock,
-            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
-          },
-          {
-            label: '道岔封锁',
-            handler: this.block,
-            cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
-          },
-          {
-            label: '道岔解封',
-            handler: this.unblock,
-            cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
-          },
-          {
-            label: '道岔转动',
-            handler: this.switchTurnout,
-            cmdType: CMD.Switch.CMD_SWITCH_TURN,
-          },
-          {
-            label: '故障解锁',
-            handler: this.fault,
-            cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
-          },
-          {
-            label: '计轴预复位',
-            handler: this.axlePreReset,
-            cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET,
-          },
-          {
-            label: this.$t('menu.menuSwitch.sectionResection'),
-            handler: this.split,
-            cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
-          },
-          {
-            label: this.$t('menu.menuSwitch.sectionActive'),
-            handler: this.active,
-            cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
-          },
-          {
-            label: '设置限速',
-            handler: this.setSpeed,
-            cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
-          },
-          {
-            label: '取消限速',
-            handler: this.cancelSpeed,
-            cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
-          },
-        ],
-        Center: [
-          {
-            label: '道岔单锁',
-            handler: this.lock,
-            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
-          },
-          {
-            label: '道岔单解',
-            handler: this.unlock,
-            cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
-          },
-          {
-            label: '道岔封锁',
-            handler: this.block,
-            cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
-          },
-          {
-            label: '道岔解封',
-            handler: this.unblock,
-            cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
-          },
-          {
-            label: '道岔转动',
-            handler: this.switchTurnout,
-            cmdType: CMD.Switch.CMD_SWITCH_TURN,
-          },
-          {
-            label: '故障解锁',
-            handler: this.fault,
-            cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
-          },
-          {
-            label: this.$t('menu.menuSwitch.sectionResection'),
-            handler: this.split,
-            cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
-          },
-          {
-            label: this.$t('menu.menuSwitch.sectionActive'),
-            handler: this.active,
-            cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
-          },
-          {
-            label: '设置限速',
-            handler: this.setSpeed,
-            cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
-          },
-          {
-            label: '取消限速',
-            handler: this.cancelSpeed,
-            cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
-          },
-          //  缺少计轴预复位
-        ],
-      },
-      menuForce: [
-        {
-          label: this.$t('menu.menuSwitch.setFault'),
-          handler: this.setStoppage,
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
         },
-        {
-          label: this.$t('menu.menuSwitch.cancelFault'),
-          handler: this.cancelStoppage,
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: [
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.singleLock === 1,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.singleLock !== 1,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '道岔封锁',
+                    handler: this.block,
+                    cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.blockade === 1,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '道岔解封',
+                    handler: this.unblock,
+                    cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.blockade !== 1,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '道岔转动',
+                    handler: this.switchTurnout,
+                    cmdType: CMD.Switch.CMD_SWITCH_TURN,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '故障解锁',
+                    handler: this.fault,
+                    cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '计轴预复位',
+                    handler: this.axlePreReset,
+                    cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSwitch.sectionResection'),
+                    handler: this.split,
+                    cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: this.$t('menu.menuSwitch.sectionActive'),
+                    handler: this.active,
+                    cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '设置限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '取消限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                }
+            ],
+            menuForce: [
+                {
+                    label: this.$t('menu.menuSwitch.setFault'),
+                    handler: this.setStoppage
+                },
+                {
+                    label: this.$t('menu.menuSwitch.cancelFault'),
+                    handler: this.cancelStoppage
+                },
+                {
+                    label: this.$t('menu.menuSection.triggerFaultManagement'),
+                    handler: this.triggerFaultManagement,
+                    cmdType: CMD.Fault.CMD_TRIGGER_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', ['mode', 'operatemode']),
+        ...mapGetters('menuOperation', ['buttonOperation'])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
         },
-        {
-          label: this.$t('menu.menuSection.triggerFaultManagement'),
-          handler: this.triggerFaultManagement,
-          cmdType: CMD.Fault.CMD_TRIGGER_FAULT,
+        '$store.state.menuOperation.selectedCount': function (val) {
+            if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Switch') {
+                this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected);
+                this.$parent.$refs.menuDeplotButton.clearCountDown();
+            }
+        }
+    },
+    methods: {
+        initMenu() {
+            // 编辑模式菜单列表
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
+            // 故障模式菜单列表
+            if (this.operatemode === OperateMode.FAULT) {
+                const menuHook = [
+                    {
+                        label: '道岔钩锁',
+                        handler: this.hookLock
+                    }
+                ];
+                this.menu = [...this.menuForce, ...menuHook];
+            }
         },
-      ],
+        operationHandler(buttonOperation, selected) {
+            const map = new Map([
+                [OperationEvent.Switch.locate.button.operation, menuOperate.Switch.locate],
+                [OperationEvent.Switch.reverse.button.operation, menuOperate.Switch.reverse],
+                [OperationEvent.Switch.lock.button.operation, menuOperate.Switch.lock],
+                [OperationEvent.Switch.unlock.button.operation, menuOperate.Switch.unlock],
+                [OperationEvent.Switch.block.button.operation, menuOperate.Switch.block],
+                [OperationEvent.Switch.unblock.button.operation, menuOperate.Switch.unblock]
+            ]);
+            commitOperate(map.get(buttonOperation), { switchCode: selected.code }, 3)
+                .then(({ valid }) => {
+                    if (!valid) {
+                        this.$refs.noticeInfo.doShow();
+                    }
+                })
+                .catch((error) => {
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
+                });
+        },
+        doShow(point) {
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected);
+                }
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected);
+                }
+            });
+        },
+        // 道岔单锁
+        lock() {
+            commitOperate(menuOperate.Switch.lock, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔解封
+        unlock() {
+            commitOperate(menuOperate.Switch.unlock, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔封锁
+        block() {
+            commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔解封
+        unblock() {
+            commitOperate(menuOperate.Switch.unblock, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔强扳
+        switchTurnoutForce() {
+            commitOperate(menuOperate.Switch.turnoutForce, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔转动
+        switchTurnout() {
+            commitOperate(menuOperate.Switch.turnout, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔故障解锁
+        fault() {
+            commitOperate(menuOperate.Switch.fault, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔计轴预复位
+        axlePreReset() {
+            commitOperate(menuOperate.Switch.axlePreReset, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段切除
+        split() {
+            commitOperate(menuOperate.Switch.split, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 区段激活
+        active() {
+            commitOperate(menuOperate.Switch.active, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.switchControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔设置速度
+        setSpeed() {
+            commitOperate(menuOperate.Switch.setSpeed, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.speedCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔取消速度
+        cancelSpeed() {
+            commitOperate(menuOperate.Switch.cancelSpeed, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
+                if (valid) {
+                    this.$refs.speedCmdControl.doShow(operate, this.selected);
+                }
+            });
+        },
+        // 道岔钩锁
+        hookLock() {
+            this.$refs.switchHookLock.doShow(this.selected);
+        },
+        triggerFaultManagement() {
+            this.$store.dispatch('training/setTriggerFaultCount', this.selected);
+        }
     }
-  },
-  computed: {
-    ...mapGetters('training', ['mode', 'operatemode']),
-    ...mapGetters('menuOperation', ['buttonOperation']),
-  },
-  watch: {
-    '$store.state.menuOperation.menuCount': function (val) {
-      if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
-        this.doShow(this.$store.state.menuOperation.menuPosition)
-      } else {
-        this.doClose()
-      }
-    },
-    '$store.state.menuOperation.selectedCount': function (val) {
-      if (this.buttonOperation && this.$store.state.menuOperation.selected._type == 'Switch') {
-        this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected)
-        this.$parent.$refs.menuDeplotButton.clearCountDown()
-      }
-    },
-  },
-  methods: {
-    initMenu() {
-      // 编辑模式菜单列表
-      this.menu = MenuContextHandler.covert(this.menuNormal)
-      if (this.operatemode === OperateMode.ADMIN) {
-        this.menu = [...this.menu, ...this.menuForce]
-      }
-
-      // 故障模式菜单列表
-      if (this.operatemode === OperateMode.FAULT) {
-        // if (!this.$store.state.scriptRecord.bgSet) {
-        const menuHook = [
-          {
-            label: '道岔钩锁',
-            handler: this.hookLock,
-          },
-        ]
-        this.menu = [...this.menuForce, ...menuHook]
-        // } else {
-        //     this.menu = this.menuForce;
-        // }
-      }
-    },
-    operationHandler(buttonOperation, selected) {
-      const map = new Map([
-        [OperationEvent.Switch.locate.button.operation, menuOperate.Switch.locate],
-        [OperationEvent.Switch.reverse.button.operation, menuOperate.Switch.reverse],
-        [OperationEvent.Switch.lock.button.operation, menuOperate.Switch.lock],
-        [OperationEvent.Switch.unlock.button.operation, menuOperate.Switch.unlock],
-        [OperationEvent.Switch.block.button.operation, menuOperate.Switch.block],
-        [OperationEvent.Switch.unblock.button.operation, menuOperate.Switch.unblock],
-      ])
-      commitOperate(map.get(buttonOperation), { switchCode: selected.code }, 3)
-        .then(({ valid }) => {
-          if (valid) {
-          } else {
-            this.$refs.noticeInfo.doShow()
-          }
-        })
-        .catch((error) => {
-          console.error(error)
-          this.$refs.noticeInfo.doShow()
-        })
-    },
-    doShow(point) {
-      this.initMenu()
-      if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-        this.$refs.popMenu.resetShowPosition(point)
-      }
-    },
-    doClose() {
-      if (this.$refs && this.$refs.popMenu) {
-        this.$refs.popMenu.close()
-      }
-    },
-    // 设置故障
-    setStoppage() {
-      commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.setFault.doShow(menuOperate.Common.setFault, this.selected)
-        }
-      })
-    },
-    // 取消故障
-    cancelStoppage() {
-      commitOperate(menuOperate.Common.cancelFault, { code: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.setFault.doShow(menuOperate.Common.cancelFault, this.selected)
-        }
-      })
-    },
-    // 道岔单锁
-    lock() {
-      commitOperate(menuOperate.Switch.lock, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔解封
-    unlock() {
-      commitOperate(menuOperate.Switch.unlock, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchCmdControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔封锁
-    block() {
-      commitOperate(menuOperate.Switch.block, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔解封
-    unblock() {
-      commitOperate(menuOperate.Switch.unblock, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchCmdControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔强扳
-    switchTurnoutForce() {
-      commitOperate(menuOperate.Switch.turnoutForce, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔转动
-    switchTurnout() {
-      commitOperate(menuOperate.Switch.turnout, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔故障解锁
-    fault() {
-      commitOperate(menuOperate.Switch.fault, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchCmdControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔计轴预复位
-    axlePreReset() {
-      commitOperate(menuOperate.Switch.axlePreReset, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchCmdControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 区段切除
-    split() {
-      commitOperate(menuOperate.Switch.split, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 区段激活
-    active() {
-      commitOperate(menuOperate.Switch.active, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.switchControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔设置速度
-    setSpeed() {
-      commitOperate(menuOperate.Switch.setSpeed, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.speedCmdControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔取消速度
-    cancelSpeed() {
-      commitOperate(menuOperate.Switch.cancelSpeed, { switchCode: this.selected.code }, 0).then(({ valid, operate }) => {
-        if (valid) {
-          this.$refs.speedCmdControl.doShow(operate, this.selected)
-        }
-      })
-    },
-    // 道岔钩锁
-    hookLock() {
-      this.$refs.switchHookLock.doShow(this.selected)
-    },
-    triggerFaultManagement() {
-      this.$store.dispatch('training/setTriggerFaultCount', this.selected)
-    },
-  },
-}
+};
 </script>
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index b9b2a13b1..a5a0689d2 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -26,7 +26,6 @@ import TrainDelete from './dialog/trainDelete';
 import TrainMove from './dialog/trainMove';
 import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
 import TrainOperation from './menuDialog/trainOperation';
@@ -53,46 +52,37 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [],
-                Center: [
-                    {
-                        label: this.$t('menu.menuTrain.addTrainId'),
-                        handler: this.addTrainId,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.deleteTrainId'),
-                        handler: this.delTrainId,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE
-                    },
-                    {
-                        label: this.$t('menu.menuTrain.editTrainId'),
-                        handler: this.editTrainId,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    }
-                    // {
-                    //     label: this.$t('menu.menuTrain.editTrainNo'),
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.moveTrainId'),
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.switchTrainId'),
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: this.$t('menu.menuTrain.addTrainId'),
+                    handler: this.addTrainId,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuTrain.deleteTrainId'),
+                    handler: this.delTrainId,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: this.$t('menu.menuTrain.editTrainId'),
+                    handler: this.editTrainId,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -108,26 +98,10 @@ export default {
                 }
             ],
             menuDirective: [
-                // {
-                //     label: '确认运行至前方站',
-                //     handler: this.nextStation
-                // },
-                // {
-                //     label: '越引导信号行驶',
-                //     handler: this.handleOverFuideSignal
-                // },
-                // {
-                //     label: '越红灯行驶',
-                //     handler: this.handleOverEedLight
-                // },
                 {
                     label: '开关门',
                     handler: this.handleOpenOrCloseDoor
                 },
-                // {
-                //     label: '限速指令',
-                //     handler: this.handleSpeedLimit
-                // },
                 {
                     label: '换端',
                     handler: this.handleTurnDirection
@@ -217,8 +191,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            // this.menu = MenuContextHandler.menuFiltration(this.menuNormal);
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
             }
@@ -239,7 +217,6 @@ export default {
         },
         doShow(point) {
             this.initMenu();
-
             if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
                 this.$refs.popMenu.resetShowPosition(point);
             }
@@ -378,7 +355,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -397,7 +374,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -414,7 +391,7 @@ export default {
                     groupNumber: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(step, this.selected);
@@ -430,7 +407,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -447,7 +424,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -464,7 +441,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(step, this.selected);
@@ -481,7 +458,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/fuzhou_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
index 836fe3a2e..48d629e50 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/alarm.vue
@@ -31,7 +31,7 @@
       <el-row>
         <el-col :span="9">
           <el-form-item :label="$t('menu.passiveDialog.alarmDate')">
-            <el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled />
+            <el-input v-model="model.alarmDate" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -83,8 +83,9 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import { UserOperationType } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
+import { parseTime } from '@/utils/index';
 export default {
     name: 'AlarmDetail',
     data() {
@@ -124,14 +125,13 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.awaitAlarm.domId : '';
         }
     },
     watch: {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && elem.success) {
                 const operate = this.$store.state.training.operate;
-                // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
                 const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     type: operate.type,
@@ -151,7 +151,7 @@ export default {
                 moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
                 level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
                 confirm: this.$t('menu.passiveDialog.confirmStatus'),
-                alarmDate: new Date(),
+                alarmDate: parseTime(this.$store.state.training.initTime),
                 type: this.$t('menu.passiveDialog.systemEvent'),
                 childType: this.$t('menu.passiveDialog.childTypeTips'),
                 timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
@@ -170,23 +170,13 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
         },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.alarm.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
         commit() {
             const operate = {
-                operation: OperationEvent.Command.close.alarm.operation
+                cancel: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation:OperationEvent.StationControl.requestStationControl.awaitAlarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
index 36cfbfc7a..0e1ab8d18 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/passiveDialog/timeout.vue
@@ -77,7 +77,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -88,7 +88,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
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 e70bd6014..d98083cf5 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue
@@ -139,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 7f81e90f2..96afb2905 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue
@@ -140,7 +140,7 @@ export default {
                 val: `${upDown}`
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -158,7 +158,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 c6154a711..73e3a05d8 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue
@@ -198,7 +198,7 @@ export default {
             this.time = time;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -213,7 +213,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -238,7 +238,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -258,7 +258,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6de7778ac..aa708cc99 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue
@@ -182,7 +182,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -197,7 +197,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -213,7 +213,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -232,7 +232,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -249,7 +249,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 70b765c25..cbb4116a8 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue
@@ -262,7 +262,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -288,7 +288,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -319,7 +319,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -349,7 +349,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -366,7 +366,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 c109556be..cfe59f2e5 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue
@@ -82,7 +82,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -98,7 +98,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 dab0edeec..1e5b56233 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue
@@ -104,7 +104,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 91522ebfa..cdfacdbba 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
@@ -268,7 +268,7 @@ export default {
                 step.operation = OperationEvent.Train.moveTrainId.menu.operation;
                 step.param = params;
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.tempTableData = [];
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue
index a92789546..15b8643a4 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue
@@ -120,7 +120,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -137,7 +137,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 a13fab8b2..c6b230eb6 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 376ad1b07..698b2e77d 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue
@@ -92,7 +92,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 36f7445c5..7f57b5b0d 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue
@@ -154,7 +154,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -175,7 +175,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6dbc67b82..38282e542 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue
@@ -159,7 +159,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/haerbin_01/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..40e33a06b
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/dispatchWorkMenu.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" work="dispatchWork" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" work="dispatchWork" />
+    <menu-train ref="menuTrain" :selected="selected" work="dispatchWork" />
+    <menu-signal ref="menuSignal" :selected="selected" work="dispatchWork" />
+    <menu-switch ref="menuSwitch" :selected="selected" work="dispatchWork" />
+    <menu-section ref="menuSection" :selected="selected" work="dispatchWork" />
+    <menu-station ref="menuStation" :selected="selected" work="dispatchWork" />
+    <menu-button ref="menuButton" :selected="selected" work="dispatchWork" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="haerbin-01__systerm" />
+    <passive-Timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuTrain from './menuTrain';
+import MenuBar from './dispatchWorkMenuBar';
+import MenuButton from './menuButton';
+import MenuSignal from './menuSignal';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuStation from './menuStation';
+import MenuStationStand from './menuStationStand';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuBar,
+        MenuButton,
+        MenuTrain,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStation,
+        MenuStationStand,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.haerbin-01__systerm {
+	overflow: hidden !important;
+}
+
+.haerbin-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.haerbin-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.haerbin-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.haerbin-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.haerbin-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.haerbin-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.haerbin-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.haerbin-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+.haerbin-01__systerm .nav-border .el-button {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 5px !important;
+	color: #000;
+	background: #FFFFFF;
+}
+.haerbin-01__systerm .nav-border-other .el-button {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 5px !important;
+}
+</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/haerbin_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..3234b9bc2
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,371 @@
+<template>
+  <div id="menuBar" style="height: 130px">
+    <div class="haerbin-01__systerm nav">
+      <el-row style="padding: 3px;">
+        <el-col :span="16">
+          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 5px;">
+            <el-row style="padding: 4px;">
+              <div class="tip-content-box">
+                <div v-if="tipContent[0]">{{ `${tipContent[0].level}` }}</div>
+                <div v-if="tipContent[0]">{{ `${tipContent[0].time}` }}</div>
+                <div v-if="tipContent[0]">{{ `${tipContent[0].confirm ? '确认': '未确认'}` }}</div>
+              </div>
+              <div class="tip-content-box">
+                <div v-if="tipContent[1]">{{ `${tipContent[1].level}` }}</div>
+                <div v-if="tipContent[1]">{{ `${tipContent[1].time}` }}</div>
+                <div v-if="tipContent[1]">{{ `${tipContent[1].confirm ? '确认': '未确认'}` }}</div>
+              </div>
+              <div class="tip-content-box">
+                <div v-if="tipContent[2]">{{ `${tipContent[2].level}` }}</div>
+                <div v-if="tipContent[2]">{{ `${tipContent[2].time}` }}</div>
+                <div v-if="tipContent[2]">{{ `${tipContent[2].confirm ? '确认': '未确认'}` }}</div>
+              </div>
+            </el-row>
+            <el-row class="button-row">
+              <div class="div-simulate-button" @click="undeveloped">系统</div>
+              <div class="div-simulate-button" @click="undeveloped">联锁</div>
+              <div class="div-simulate-button" @click="trainControlShow">列监</div>
+              <div class="div-simulate-button" @click="undeveloped">站控</div>
+              <div class="div-simulate-button" @click="undeveloped">车场</div>
+              <div class="div-simulate-button" @click="undeveloped">编表</div>
+              <div class="div-simulate-button" @click="undeveloped">车辆段</div>
+            </el-row>
+            <el-row class="button-row" style="margin-top: 10px;">
+              <div class="div-simulate-button" @click="undeveloped">轨道</div>
+              <div class="div-simulate-button" @click="undeveloped">调度</div>
+              <div class="div-simulate-button" @click="undeveloped">录放</div>
+              <div class="div-simulate-button" @click="undeveloped">管理</div>
+              <div class="div-simulate-button" @click="undeveloped">列车信息</div>
+              <div class="div-simulate-button" @click="undeveloped">职权</div>
+              <div style="width: 80px;" />
+            </el-row>
+          </div>
+        </el-col>
+        <el-col :span="4">
+          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 5px;">
+            <el-row style="height: 68px;display: flex; justify-content: space-between;align-items: center;">
+              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#FFF' }" :class="{'headerBox' :isNoConfirmLevelA}" @click="showHimAlarm('A')">A</div>
+              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#FFF' }" :class="{'headerBox' :isNoConfirmLevelB}" @click="showHimAlarm('B')">B</div>
+              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelC?'#F00':'#FFF' }" @click="showHimAlarm('C')">C</div>
+              <img :src="voiceIcon" style="width: 40px;height: 40px;" @click="controlAudio(false)">
+            </el-row>
+            <el-row class="button-row">
+              <div style="width: 80px;" class="div-simulate-button" @click="showHimAlarm">报警</div>
+              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">运图</div>
+            </el-row>
+            <el-row class="button-row" style="margin-top: 10px;">
+              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">报表</div>
+              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">时刻表</div>
+            </el-row>
+          </div>
+        </el-col>
+        <el-col :span="4" style="border: 2px solid #DDD9CA;border-radius: 5px;">
+          <el-row style="height: 68px;" />
+          <el-row class="button-row">
+            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">考评</div>
+            <div style="width: 80px;" class="div-simulate-button" @click="showLogDetail">日志</div>
+          </el-row>
+          <el-row class="button-row" style="margin-top: 10px;">
+            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">锁屏</div>
+            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">退出</div>
+          </el-row>
+        </el-col>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
+    <alarm-table-low ref="alarmTableLow" />
+    <alarm-table-hmi ref="alarmTableHmi" />
+    <train-control ref="trainControl" :offset="10" />
+    <log-detail ref="logDetail" />
+    <audio id="buzzer" controls loop="loop" style="width: 0;height: 0">
+      <source :src="buzzerAudio" type="audio/mpeg">
+    </audio>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+import voiceOpen from '@/assets/voiceOpen.png';
+import voiceClose from '@/assets/voiceClose.png';
+import BuzzerAudio from '@/assets/buzzer.mp3';
+import AlarmTableHmi from './menuDialog/alarmTableHmi';
+import AlarmTableLow from './menuDialog/alarmTableLow';
+import TrainControl from './dialog/trainControl';
+import LogDetail from './menuDialog/logDetail';
+
+export default {
+    name: 'DispatchWorkMenuBar',
+    components: {
+        NoticeInfo,
+        AlarmTableLow,
+        AlarmTableHmi,
+        TrainControl,
+        LogDetail
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            modelType:'text',
+            keydownTimes:0,
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            tipContent: [],
+            sound: false,
+            buzzerAudio: BuzzerAudio,
+            noConfirmMapA: {},
+            noConfirmMapB: {},
+            confirmNoRecoverMapA: {},
+            confirmNoRecoverMapB: {},
+            confirmNoRecoverMapC: {},
+            noConfirmMapAString: '{}',
+            noConfirmMapBString: '{}',
+            confirmNoRecoverMapAString: '{}',
+            confirmNoRecoverMapBString: '{}',
+            confirmNoRecoverMapCString: '{}'
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        },
+        voiceIcon() {
+            return this.sound ? voiceOpen : voiceClose;
+        },
+        isNoConfirmLevelA() {
+            return this.noConfirmMapAString !== '{}';
+        },
+        isNoConfirmLevelB() {
+            return this.noConfirmMapBString !== '{}';
+        },
+        isNoRecoverLevelA() {
+            return this.confirmNoRecoverMapAString !== '{}';
+        },
+        isNoRecoverLevelB() {
+            return this.confirmNoRecoverMapBString !== '{}';
+        },
+        isNoRecoverLevelC() {
+            return this.confirmNoRecoverMapCString !== '{}';
+        }
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.socket.simulationAlarmInfo': function(val) {
+            (val || []).forEach(item => {
+                if (!item.confirmed) {
+                    this.tipContent.push(item);
+                    this.handleAlarm(item);
+                    if (this.tipContent.length > 3) {
+                        this.tipContent.shift();
+                    }
+                    if (item.level === 'A') {
+                        this.noConfirmMapA[item.code] = item;
+                        this.noConfirmMapAString = JSON.stringify(this.noConfirmMapA);
+                    } else if (item.level === 'B') {
+                        this.noConfirmMapB[item.code] = item;
+                        this.noConfirmMapBString = JSON.stringify(this.noConfirmMapB);
+                    }
+                } else if (!item.recovered) {
+                    if (item.level === 'A') {
+                        delete this.noConfirmMapA[item.code];
+                        this.confirmNoRecoverMapA[item.code] = item;
+                        this.noConfirmMapAString = JSON.stringify(this.noConfirmMapA);
+                        this.confirmNoRecoverMapAString = JSON.stringify(this.confirmNoRecoverMapA);
+                    } else if (item.level === 'B') {
+                        delete this.noConfirmMapB[item.code];
+                        this.confirmNoRecoverMapB[item.code] = item;
+                        this.noConfirmMapBString = JSON.stringify(this.noConfirmMapB);
+                        this.confirmNoRecoverMapBString = JSON.stringify(this.confirmNoRecoverMapB);
+                    } else if (item.level === 'C') {
+                        this.confirmNoRecoverMapC[item.code] = item;
+                        this.confirmNoRecoverMapCString = JSON.stringify(this.confirmNoRecoverMapC);
+                    }
+                } else {
+                    if (item.level === 'A') {
+                        delete this.noConfirmMapA[item.code];
+                        delete this.confirmNoRecoverMapA[item.code];
+                        this.noConfirmMapAString = JSON.stringify(this.noConfirmMapA);
+                        this.confirmNoRecoverMapAString = JSON.stringify(this.confirmNoRecoverMapA);
+                    } else if (item.level === 'B') {
+                        delete this.noConfirmMapB[item.code];
+                        delete this.confirmNoRecoverMapB[item.code];
+                        this.noConfirmMapBString = JSON.stringify(this.noConfirmMapB);
+                        this.confirmNoRecoverMapBString = JSON.stringify(this.confirmNoRecoverMapB);
+                    } else if (item.level === 'C') {
+                        delete this.confirmNoRecoverMapC[item.code];
+                        this.confirmNoRecoverMapCString = JSON.stringify(this.confirmNoRecoverMapC);
+                    }
+                }
+            });
+        }
+    },
+    mounted() {},
+    methods: {
+        handleAlarm(val) {
+            if (val.level === 'A' || val.level === 'B') {
+                this.controlAudio(true);
+            }
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        },
+        showLogDetail() {
+            this.$refs.logDetail.doShow();
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        },
+        showHimAlarm(level) {
+            this.$refs.alarmTableHmi.doShow(level);
+        },
+        showLowAlarm(level) {
+            this.$refs.alarmTableLow.doShow(level);
+        },
+        trainControlShow() {
+            this.$refs.trainControl.doShow();
+        },
+        controlAudio(val) {
+            const audio = document.getElementById('buzzer');
+            this.sound = val;
+            if (audio !== null) {
+                if (val) {
+                    audio.play();
+                } else if (val === false) {
+                    audio.pause();
+                }
+            }
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+@import "src/styles/mixin.scss";
+$width: 30px;
+$height: 90px;
+$menuPadding: 10px;
+$menuItemHeight: 30px;
+$menuItemWidth: 190px;
+$menuItemPadding: 5px;
+
+#menuBar {
+	z-index: 37;
+	position: absolute;
+	width: inherit;
+}
+.nav {
+	display: block;
+	cursor: pointer;
+	color: #0000;
+	background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+	background: linear-gradient(#FDFDFE, #DEE3F3);
+	/*background: #FFFFFF;*/
+	border: 1px solid #B6BCCC !important;
+	border-bottom: 2px solid #B6BCCC !important;
+	list-style: none;
+}
+
+.active {
+	position: absolute;
+	display: block !important;
+}
+
+.div-simulate-button{
+	height: 20px;
+	line-height: 20px;
+	display: inline-block;
+	font-size: 14px;
+	color: #303030;
+	border: 1px solid #44556D;
+	background: #FFF;
+	text-align: center;
+	border-radius: 5px;
+	width: 80px;
+}
+.tip-content-box{
+	height: 20px;
+	width: 100%;
+	line-height: 20px;
+	background: #001528;
+	color: #C20F29;
+	font-size: 14px;
+	display: flex;
+	justify-content: space-around;
+}
+.button-row{
+	height: 20px;
+	line-height: 20px;
+	display: flex;
+	justify-content:space-between;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.4;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+
+@-webkit-keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.4;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
+.headerBox {
+	background: #f00;
+	animation: fade 600ms infinite;
+	-webkit-animation: fade 600ms infinite;
+}
+</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/index.vue b/src/jmapNew/theme/haerbin_01/menus/index.vue
deleted file mode 100644
index 4b41d47f1..000000000
--- a/src/jmapNew/theme/haerbin_01/menus/index.vue
+++ /dev/null
@@ -1,369 +0,0 @@
-<template>
-  <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-if="$store.state.training.prdType === '01' || $store.state.training.prdType === '02'" ref="menuBar" :selected="selected" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
-    <menu-button v-if="isShowButton" ref="menuButton" :selected="selected" />
-    <passive-alarm ref="passiveAlarm" />
-    <passive-contorl ref="passiveControl" pop-class="haerbin-01__systerm" />
-    <passive-Timeout ref="passiveTimeout" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import MenuTrain from './menuTrain';
-import MenuBar from './menuBar';
-import MenuButton from './menuButton';
-import MenuSignal from './menuSignal';
-import MenuSwitch from './menuSwitch';
-import MenuSection from './menuSection';
-import MenuStation from './menuStation';
-import MenuStationStand from './menuStationStand';
-import PassiveAlarm from './passiveDialog/alarm';
-import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
-import PassiveTimeout from './passiveDialog/timeout';
-
-export default {
-    name: 'Menus',
-    components: {
-        MenuBar,
-        MenuButton,
-        MenuTrain,
-        MenuSignal,
-        MenuSwitch,
-        MenuSection,
-        MenuStation,
-        MenuStationStand,
-        PassiveAlarm,
-        PassiveContorl,
-        PassiveTimeout
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    computed: {
-        ...mapGetters('config', [
-            'width'
-        ]),
-        isShowButton() {
-            return this.$store.state.training.prdType === '01' || this.$store.state.training.prdType === '02';
-        }
-    },
-    watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('config/updateMenuBar');
-        });
-    }
-};
-</script>
-
-<style>
-    .menus .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .menus .pop-menu span {
-        color: #000;
-    }
-
-    .menus .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .haerbin-01__systerm {
-        overflow: hidden !important;
-    }
-
-    .haerbin-01__systerm .el-dialog {
-        background: rgba(100, 100, 100, 0.3);
-        border: 2px solid rgb(144, 144, 144, 0.8);
-        border-radius: 6px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__header {
-        padding: 5px;
-        height: 26px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__footer {
-        background: #F0F0F0;
-        opacity: 1;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 5px 5px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        background: #F0F0F0;
-        opacity: 1;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__title {
-        position: absolute;
-        top: 4px;
-        color: #000;
-        border-radius: 4px;
-        padding: 0px 2px;
-        height: 20px;
-        line-height: 20px
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__title::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        -webkit-filter: blur(10px);
-        filter: blur(10px);
-        height: 20px;
-        width: -webkit-fill-available;
-        background: rgba(128, 128, 128, 0.8);
-        z-index: -1;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__headerbtn {
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid #fff;
-        border-radius: 4px;
-        top: 4px;
-        right: 5px;
-        line-height: 16px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button {
-        height: 32px;
-        line-height: 32px;
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #F0F0F0;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table th.is-leaf {
-        background: #F0F0F0 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .current-row>td {
-        background: #3399FF !important;
-        color: #fff !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .haerbin-01__systerm .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .haerbin-01__systerm .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .haerbin-01__systerm .el-dialog .button-group {
-        margin-top: 10px;
-    }
-    .haerbin-01__systerm .nav-border .el-button {
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-        border-radius: 5px !important;
-        color: #000;
-        background: #FFFFFF;
-    }
-    .haerbin-01__systerm .nav-border-other .el-button {
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-        border-radius: 5px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/localWorkMenu.vue b/src/jmapNew/theme/haerbin_01/menus/localWorkMenu.vue
new file mode 100644
index 000000000..a04763162
--- /dev/null
+++ b/src/jmapNew/theme/haerbin_01/menus/localWorkMenu.vue
@@ -0,0 +1,366 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" work="localWork" />
+    <menu-train ref="menuTrain" :selected="selected" work="localWork" />
+    <menu-signal ref="menuSignal" :selected="selected" work="localWork" />
+    <menu-switch ref="menuSwitch" :selected="selected" work="localWork" />
+    <menu-section ref="menuSection" :selected="selected" work="localWork" />
+    <menu-station ref="menuStation" :selected="selected" work="localWork" />
+    <menu-button ref="menuButton" :selected="selected" work="localWork" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="haerbin-01__systerm" />
+    <passive-Timeout ref="passiveTimeout" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuTrain from './menuTrain';
+import MenuBar from './localWorkMenuBar';
+import MenuButton from './menuButton';
+import MenuSignal from './menuSignal';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuStation from './menuStation';
+import MenuStationStand from './menuStationStand';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'LocalWorkMenus',
+    components: {
+        MenuBar,
+        MenuButton,
+        MenuTrain,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStation,
+        MenuStationStand,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.haerbin-01__systerm {
+	overflow: hidden !important;
+}
+
+.haerbin-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.haerbin-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.haerbin-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.haerbin-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.haerbin-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.haerbin-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.haerbin-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.haerbin-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+.haerbin-01__systerm .nav-border .el-button {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 5px !important;
+	color: #000;
+	background: #FFFFFF;
+}
+.haerbin-01__systerm .nav-border-other .el-button {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 5px !important;
+}
+</style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue b/src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue
similarity index 55%
rename from src/jmapNew/theme/haerbin_01/menus/menuBar.vue
rename to src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue
index c0f7cc247..9e659b38c 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/localWorkMenuBar.vue
@@ -1,7 +1,7 @@
 <template>
-  <div id="menuBar" :style="{height: $store.state.training.prdType === '01'? '90px': '130px'}">
+  <div id="menuBar" style="height: 90px;">
     <div class="haerbin-01__systerm nav">
-      <el-row v-if="$store.state.training.prdType === '01'">
+      <el-row>
         <el-col :span="2">
           <div class="nav-border">
             <el-row>
@@ -64,76 +64,6 @@
           </div>
         </el-col>
       </el-row>
-      <el-row v-else-if="$store.state.training.prdType === '02'" style="padding: 3px;">
-        <el-col :span="16">
-          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 5px;">
-            <el-row style="padding: 4px;">
-              <div class="tip-content-box">
-                <div v-if="tipContent[0]">{{ `${tipContent[0].level}` }}</div>
-                <div v-if="tipContent[0]">{{ `${tipContent[0].time}` }}</div>
-                <div v-if="tipContent[0]">{{ `${tipContent[0].confirm ? '确认': '未确认'}` }}</div>
-              </div>
-              <div class="tip-content-box">
-                <div v-if="tipContent[1]">{{ `${tipContent[1].level}` }}</div>
-                <div v-if="tipContent[1]">{{ `${tipContent[1].time}` }}</div>
-                <div v-if="tipContent[1]">{{ `${tipContent[1].confirm ? '确认': '未确认'}` }}</div>
-              </div>
-              <div class="tip-content-box">
-                <div v-if="tipContent[2]">{{ `${tipContent[2].level}` }}</div>
-                <div v-if="tipContent[2]">{{ `${tipContent[2].time}` }}</div>
-                <div v-if="tipContent[2]">{{ `${tipContent[2].confirm ? '确认': '未确认'}` }}</div>
-              </div>
-            </el-row>
-            <el-row class="button-row">
-              <div class="div-simulate-button" @click="undeveloped">系统</div>
-              <div class="div-simulate-button" @click="undeveloped">联锁</div>
-              <div class="div-simulate-button" @click="trainControlShow">列监</div>
-              <div class="div-simulate-button" @click="undeveloped">站控</div>
-              <div class="div-simulate-button" @click="undeveloped">车场</div>
-              <div class="div-simulate-button" @click="undeveloped">编表</div>
-              <div class="div-simulate-button" @click="undeveloped">车辆段</div>
-            </el-row>
-            <el-row class="button-row" style="margin-top: 10px;">
-              <div class="div-simulate-button" @click="undeveloped">轨道</div>
-              <div class="div-simulate-button" @click="undeveloped">调度</div>
-              <div class="div-simulate-button" @click="undeveloped">录放</div>
-              <div class="div-simulate-button" @click="undeveloped">管理</div>
-              <div class="div-simulate-button" @click="undeveloped">列车信息</div>
-              <div class="div-simulate-button" @click="undeveloped">职权</div>
-              <div style="width: 80px;" />
-            </el-row>
-          </div>
-        </el-col>
-        <el-col :span="4">
-          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 5px;">
-            <el-row style="height: 68px;display: flex; justify-content: space-between;align-items: center;">
-              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#FFF' }" :class="{'headerBox' :isNoConfirmLevelA}" @click="showHimAlarm('A')">A</div>
-              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#FFF' }" :class="{'headerBox' :isNoConfirmLevelB}" @click="showHimAlarm('B')">B</div>
-              <div style="width: 40px;" class="div-simulate-button" :style="{background:isNoRecoverLevelC?'#F00':'#FFF' }" @click="showHimAlarm('C')">C</div>
-              <img :src="voiceIcon" style="width: 40px;height: 40px;" @click="controlAudio(false)">
-            </el-row>
-            <el-row class="button-row">
-              <div style="width: 80px;" class="div-simulate-button" @click="showHimAlarm">报警</div>
-              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">运图</div>
-            </el-row>
-            <el-row class="button-row" style="margin-top: 10px;">
-              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">报表</div>
-              <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">时刻表</div>
-            </el-row>
-          </div>
-        </el-col>
-        <el-col :span="4" style="border: 2px solid #DDD9CA;border-radius: 5px;">
-          <el-row style="height: 68px;" />
-          <el-row class="button-row">
-            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">考评</div>
-            <div style="width: 80px;" class="div-simulate-button" @click="showLogDetail">日志</div>
-          </el-row>
-          <el-row class="button-row" style="margin-top: 10px;">
-            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">锁屏</div>
-            <div style="width: 80px;" class="div-simulate-button" @click="undeveloped">退出</div>
-          </el-row>
-        </el-col>
-      </el-row>
     </div>
     <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
     <alarm-table-low ref="alarmTableLow" />
@@ -156,6 +86,7 @@ import AlarmTableHmi from './menuDialog/alarmTableHmi';
 import AlarmTableLow from './menuDialog/alarmTableLow';
 import TrainControl from './dialog/trainControl';
 import LogDetail from './menuDialog/logDetail';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
 
 export default {
     name: 'MenuBar',
@@ -260,10 +191,8 @@ export default {
                 this.stationCode = code;
             }
         },
-        '$store.state.socket.simulationRoleList':function(list) {
-            if (list && list.length) {
-                this.checkRoleChange(list);
-            }
+        '$store.state.training.roleDeviceCode': function(val) {
+            this.stationCode = this.centralizedMap[val];
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
             (val || []).forEach(item => {
@@ -317,10 +246,6 @@ export default {
     mounted() {
         this.version = this.$store.state.map.version;
         this.initMenu();
-        /* 由于修改角色现行是先取消人员仿真角色后赋予，故menuBar会在仿真角色取消时销毁，在赋予特定角色是挂载，故此处处理 */
-        if (this.$store.state.socket.simulationRoleList && this.$store.state.socket.simulationRoleList.length) {
-            this.checkRoleChange(this.$store.state.socket.simulationRoleList);
-        }
     },
     methods: {
         handleAlarm(val) {
@@ -351,17 +276,21 @@ export default {
             });
             this.colsNum = 24 / this.centralizedStationList1.length;
             if (centralizedStationList.length) {
-                if (this.$store.state.map.showCentralizedStationCode) {
-                    this.stationCode = this.$store.state.map.showCentralizedStationCode;
+                if (this.$store.state.training.roleDeviceCode) {
+                    this.stationCode = this.centralizedMap[this.$store.state.training.roleDeviceCode];
                 } else {
                     this.stationCode = centralizedStationList[0].code;
                 }
             }
         },
         switchShowStation(stationCode) {
-            this.stationCode = stationCode;
-            this.$store.dispatch('map/setShowCentralizedStationNum');
-            this.$store.dispatch('map/setShowCentralizedStationCode', stationCode);
+            const member = this.$store.state.training.memberList.find(member => member.type === 'STATION_SUPERVISOR' && member.deviceCode === stationCode);
+            const data = [{userId: this.userId, memberId:member.id}];
+            assignUsersPlayRoles(data, this.$route.query.group).then(() => {
+                console.log('切换角色!');
+            }).catch(e => {
+                this.$message.error('切换车站失败！');
+            });
         },
         undeveloped() {
             this.doClose();
@@ -403,22 +332,9 @@ export default {
                 EventBus.$emit('closeMenu');
             });
         },
-        checkRoleChange(list) {
-            list.forEach(item => {
-                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId && item.type === 'STATION_SUPERVISOR') {
-                    this.switchShowStation(this.centralizedMap[item.deviceCode]);
-                }
-            });
-        },
-        showHimAlarm(level) {
-            this.$refs.alarmTableHmi.doShow(level);
-        },
         showLowAlarm(level) {
             this.$refs.alarmTableLow.doShow(level);
         },
-        trainControlShow() {
-            this.$refs.trainControl.doShow();
-        },
         controlAudio(val) {
             const audio = document.getElementById('buzzer');
             this.sound = val;
@@ -435,231 +351,118 @@ export default {
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $width: 30px;
-    $height: 90px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 190px;
-    $menuItemPadding: 5px;
+@import "src/styles/mixin.scss";
+$width: 30px;
+$height: 90px;
+$menuPadding: 10px;
+$menuItemHeight: 30px;
+$menuItemWidth: 190px;
+$menuItemPadding: 5px;
 
-    #menuBar {
-        z-index: 37;
-        position: absolute;
-        width: inherit;
-    }
-    .nav-border {
-        font-size: 12px;
-        color: #000;
-        text-align: center;
-		line-height: 45px;
-        border-top: 2px solid #7E8076;
-        border-left: 2px solid #6A6B64;
-        border-right: 2px solid #FBFBFA;
-        border-bottom: 2px solid #FBFBFA;
-    }
-    .nav-border-other {
-        font-size: 12px;
-        color: #000;
-        text-align: center;
-        border-top: 2px solid #7E8076;
-        border-left: 2px solid #6A6B64;
-        border-right: 2px solid #FBFBFA;
-        border-bottom: 2px solid #FBFBFA;
-    }
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
-        background: linear-gradient(#FDFDFE, #DEE3F3);
-        /*background: #FFFFFF;*/
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-    }
+#menuBar {
+	z-index: 37;
+	position: absolute;
+	width: inherit;
+}
+.nav-border {
+	font-size: 12px;
+	color: #000;
+	text-align: center;
+	line-height: 45px;
+	border-top: 2px solid #7E8076;
+	border-left: 2px solid #6A6B64;
+	border-right: 2px solid #FBFBFA;
+	border-bottom: 2px solid #FBFBFA;
+}
+.nav-border-other {
+	font-size: 12px;
+	color: #000;
+	text-align: center;
+	border-top: 2px solid #7E8076;
+	border-left: 2px solid #6A6B64;
+	border-right: 2px solid #FBFBFA;
+	border-bottom: 2px solid #FBFBFA;
+}
+.nav {
+	display: block;
+	cursor: pointer;
+	color: #0000;
+	background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+	background: linear-gradient(#FDFDFE, #DEE3F3);
+	/*background: #FFFFFF;*/
+	border: 1px solid #B6BCCC !important;
+	border-bottom: 2px solid #B6BCCC !important;
+	list-style: none;
+}
 
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
+.active {
+	position: absolute;
+	display: block !important;
+}
+.fake-button{
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 5px !important;
+	color: #000;
+	background: #FFFFFF;
+	margin: 5px auto;
+}
+.fake-button-active{
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 5px !important;
+	color: #70B6FF;
+	background: #ECF5FF;
+	margin: 5px auto;
+}
 
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray !important;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        display: flex;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: block;
-		float: left;
-        border-right: 1px inset #CACACA;
-        width: $width;
-    }
-
-    .menu-li-text .label {
-        display: block;
-		float: left;
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-    .fake-button{
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-        border-radius: 5px !important;
-        color: #000;
-        background: #FFFFFF;
-        margin: 5px auto;
-    }
-    .fake-button-active{
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-        border-radius: 5px !important;
-        color: #70B6FF;
-        background: #ECF5FF;
-        margin: 5px auto;
-    }
-
-    .loginClass{
-        width: 100px;
-        height: 20px;
-        text-align: center;
-        border: 1px solid rgb(204, 204, 204);
-        line-height: 20px;
-        margin: 5px auto;
-        border-radius: 5px;
-        background: #ffffff;
-        cursor: not-allowed;
-    }
-	.div-simulate-button{
-		height: 20px;
-		line-height: 20px;
-		display: inline-block;
-		font-size: 14px;
-		color: #303030;
-		border: 1px solid #44556D;
-		background: #FFF;
-		text-align: center;
-		border-radius: 5px;
-		width: 80px;
+.loginClass{
+	width: 100px;
+	height: 20px;
+	text-align: center;
+	border: 1px solid rgb(204, 204, 204);
+	line-height: 20px;
+	margin: 5px auto;
+	border-radius: 5px;
+	background: #ffffff;
+	cursor: not-allowed;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
 	}
-	.tip-content-box{
-		height: 20px;
-		width: 100%;
-		line-height: 20px;
-		background: #001528;
-		color: #C20F29;
-		font-size: 14px;
-		display: flex;
-		justify-content: space-around;
+	50% {
+		opacity: 0.4;
 	}
-	.button-row{
-		height: 20px;
-		line-height: 20px;
-		display: flex;
-		justify-content:space-between;
-	}
-	@keyframes fade {
-		from {
-			opacity: 1.0;
-		}
-		50% {
-			opacity: 0.4;
-		}
-		to {
-			opacity: 1.0;
-		}
+	to {
+		opacity: 1.0;
 	}
+}
 
-	@-webkit-keyframes fade {
-		from {
-			opacity: 1.0;
-		}
-		50% {
-			opacity: 0.4;
-		}
-		to {
-			opacity: 1.0;
-		}
+@-webkit-keyframes fade {
+	from {
+		opacity: 1.0;
 	}
-	.headerBox {
-		background: #f00;
-		animation: fade 600ms infinite;
-		-webkit-animation: fade 600ms infinite;
+	50% {
+		opacity: 0.4;
 	}
+	to {
+		opacity: 1.0;
+	}
+}
+.headerBox {
+	background: #f00;
+	animation: fade 600ms infinite;
+	-webkit-animation: fade 600ms infinite;
+}
 </style>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index d87117297..bcc1297b2 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -45,7 +45,7 @@
           <div class="nav-border">
             <div class="nav-border-top">
               <el-button :id="commandId" class="fl" :class="{'disabled': canCommand || secondConfirm}" style="line-height: 18px; margin-top: 4px;" plain :disabled="canCommand || secondConfirm" @click="command">执行</el-button>
-              <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="cancle">取消</el-button>
+              <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="cancel">取消</el-button>
             </div>
             <div v-if="!speedShow" class="nav-border-bottom">
               <el-table
@@ -63,7 +63,7 @@
               </el-table>
             </div>
             <div v-if="speedShow" class="nav-border-bottom">
-              <div style="height: 56px;width: 100%;background: #fff;overflow-y: scroll;text-align: left;">
+              <div :id="operationEvent.Section.setSpeed.choose.domId" style="height: 56px;width: 100%;background: #fff;overflow-y: scroll;text-align: left;">
                 <div class="speed-value-box" :style="{background: speedLimitValue===15? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(15)">15</div>
                 <div class="speed-value-box" :style="{background: speedLimitValue===25? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(25)">25</div>
                 <div class="speed-value-box" :style="{background: speedLimitValue===45? '#87CEFA': '#FFF'}" @click="setSpeedLimitValue(45)">45</div>
@@ -161,6 +161,7 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { TrainingMode } from '@/scripts/ConstDic';
 import * as adapter from '@/jmapNew/utils/adapter';
 import BanIcon from '@/assets/ban-heb.png';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     components: {
@@ -172,11 +173,18 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             tempData: [],
+            operationEvent: OperationEvent,
             speedLimitValue: 15,
             oldDevice: null, // 上一次点击元素
             canCommand: true,
@@ -229,7 +237,8 @@ export default {
     computed: {
         ...mapGetters('map', [
             'routeList',
-            'stationList'
+            'stationList',
+            'sectionList'
         ]),
         commandId() {
             return OperationEvent.Command.commandHaerbin.confirm.domId;
@@ -269,16 +278,11 @@ export default {
     },
     watch: {
         '$store.state.menuOperation.setMenuChangeCount': function (val) {
-            const State2SimulationMap = {
-                '01': 'Local',		// 现地工作站
-                '02': 'Center'		// 中心调度工作站
-            };
             if (this.selected._type && !this.trainOperationShow) {
-                const control = this.getStationControl(this.selected);
-                const type = State2SimulationMap[this.$store.state.training.prdType];
-                if (control && control.controlMode != type) {
+                const [stationCode, centralStationCode] = this.getStationCodes(this.selected);
+                if (!judgeStationControl(stationCode, centralStationCode, this.work)) {
                     this.clearAllMenuShow();
-                    if (type == 'Center' && this.selected._type == 'Station') {
+                    if (this.work === 'dispatchWork' && this.selected._type === 'Station') {
                         this.selectedObj = this.actualSelected;
                         if (this.selectedObj._type) {
                             this.canCommand = true;
@@ -287,7 +291,7 @@ export default {
                                 code: this.selectedObj.code,
                                 subType:this.$store.state.menuOperation.subType
                             };
-                            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                                 if (valid) {
                                     this.centralizedStationList = new Array(15).fill({});
                                     this.centralizedStationList[0] = { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' };
@@ -315,7 +319,7 @@ export default {
                     code: this.selectedObj.code,
                     subType:this.$store.state.menuOperation.subType
                 };
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         switch (this.selectedObj._type) {
@@ -362,15 +366,13 @@ export default {
                 }
             }
         },
-        '$store.state.training.prdType': function (val) {
-            this.trainOperationShow = false;
-            this.initMenus();
-            this.initRouteMenus();
-        },
-        '$store.state.training.started':function (val) {
+        '$store.state.trainingNew.trainingSwitch':function (val) {
             if (!val) {
                 this.doClose();
             }
+        },
+        '$store.state.training.roleDeviceCode': function (val) {
+            this.handleBasicMenu();
         }
     },
     mounted() {
@@ -405,22 +407,35 @@ export default {
         handleTrainOperate(type) {
             this.trainOperateType = type;
         },
-        getStationControl(selected) {
-            let control;
-            if (selected._type == 'StationStand') {
-                control = this.$store.getters['map/getDeviceStationCodeByStationCode'](selected.deviceStationCode);
-            } else if (selected._type == 'Station') {
-                control = this.$store.getters['map/getDeviceStationCodeByStationCode'](selected.code);
-            } else if (selected._type == 'Train') { // 车次窗单独处理
-                control = this.$store.getters['map/getStationCodeByTrain'](selected);
-            } else if (selected._type == 'TrainWindow') {
-                control = this.$store.getters['map/getDeviceTrainWindowCodeByStationCode'](selected.code);
-            } else if (selected._type == 'LimitControl') {
-                control = {controlMode: 'Center'};
-            } else {
-                control = this.$store.getters['map/getDeviceStationCodeByStationCode'](selected.stationCode);
+        getStationCodes(selected) {
+            let stationCode = '';
+            let centralStationCode = '';
+            if (selected._type === 'StationStand') {
+                stationCode = selected.stationCode;
+                centralStationCode = selected.deviceStationCode;
+            } else if (selected._type === 'Station') {
+                stationCode = selected.code;
+                centralStationCode = selected.stationCode;
+            } else if (selected._type === 'Train') { // 车次窗单独处理
+                if (selected.sectionCode) {
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                    stationCode = section.belongStation;
+                    centralStationCode = section.stationCode;
+                }
+            } else if (selected._type === 'TrainWindow') {
+                const section = this.sectionList.find(elem => elem.trainWindowSectionCode === selected.code);
+                if (section) {
+                    stationCode = section.belongStation;
+                    centralStationCode = section.stationCode;
+                }
+            } else if (selected._type === 'Section') {
+                stationCode = selected.belongStation;
+                centralStationCode = selected.stationCode;
+            } else if (selected._type === 'Switch' || selected._type === 'Signal') {
+                stationCode = selected.belongStationCode;
+                centralStationCode = selected.stationCode;
             }
-            return control;
+            return [stationCode, centralStationCode];
         },
         clickCommand(row) {
             this.clearAllMenuShow();
@@ -436,12 +451,6 @@ export default {
                 step.param = {
                     routeCode: this.route.code
                 };
-                // if (currentIndex == 2) {
-                //     step.param = {
-                //         signalCode: this.route.startSignalCode
-                //     };
-                // } else {
-                // }
             }
             if (this.tempData.length) {
                 row.show = true;
@@ -451,7 +460,7 @@ export default {
                 this.canCommand = false;
                 this.securityCommand = row.securityCommand;
                 step.operation = this.operate;
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -626,11 +635,12 @@ export default {
                 this.centralizedStationList[index] = basic;
             });
             this.tempData = [];
-            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode);
             this.tempData.push(station);
+            const code = station ? station.stationCode : '';
             this.param = {
-                stationCode: this.$store.state.map.showCentralizedStationCode,
-                stationCodes: [this.$store.state.map.showCentralizedStationCode]
+                stationCode: code,
+                stationCodes: [code]
             };
         },
         handleStationMenu() {
@@ -648,7 +658,7 @@ export default {
         },
         handleStandMenu() {
             this.clearAllMenuShow();
-            if (this.$store.state.training.prdType === '02') {
+            if (this.work === 'dispatchWork') {
                 this.deviceHighLight(this.oldDevice, false);
                 this.deviceHighLight(this.selectedObj, true);
                 this.oldDevice = this.selectedObj;
@@ -683,7 +693,7 @@ export default {
                 this.param.routeCodeList = routeCodeList;
             }
             if (this.cmdType == CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER || this.cmdType == CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER) {
-                this.param = { stationCode: this.selectedObj.code || this.$store.state.map.showCentralizedStationCode };
+                this.param = { stationCode: this.selectedObj.code || this.$store.state.training.roleDeviceCode };
             }
             if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
                 this.param.speedLimitValue = this.speedLimitValue;
@@ -699,12 +709,11 @@ export default {
                 step.over = true;
                 step.cmdType = this.cmdType;
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid && this.securityCommand) {
                     this.secondConfirm = true;
-                    const that = this;
                     this.timer = setTimeout(() => {
-                        that.cancle();
+                        this.cancel();
                     }, 15000);
                 } else if (valid) {
                     this.doClose();
@@ -720,12 +729,11 @@ export default {
             const step = {
                 operation: OperationEvent.Command.commandHaerbin.confrimCr1.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.cr1Confrim = true;
-                    const that = this;
                     this.timer = setTimeout(() => {
-                        that.cancle();
+                        this.cancel();
                     }, 10000);
                 }
             }).catch((error) => {
@@ -741,7 +749,7 @@ export default {
                 cmdType: this.cmdType,
                 operation: OperationEvent.Command.commandHaerbin.confrimCr2.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -751,10 +759,18 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-        cancle() {
+        cancel() {
             if (this.$store.state.training.mode != TrainingMode.TEACH) {
-                clearTimeout(this.timer);
-                this.doClose();
+                const operate = {
+                    cancel: true,
+                    operation: ''
+                };
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        clearTimeout(this.timer);
+                        this.doClose();
+                    }
+                });
             }
         },
         doClose() {
@@ -794,10 +810,18 @@ export default {
             });
         },
         setSpeedLimitValue(val) {
-            this.speedLimitValue = val;
+            const operate = {
+                operation: OperationEvent.Section.setSpeed.choose.operation,
+                param: { speedLimitValue: val }
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.speedLimitValue = val;
+                }
+            });
         },
         changeShowMode(flag) {
-            if (this.$store.state.training.prdType === '01') {
+            if (this.work === 'localWork') {
                 this.trainModel = {};
                 this.formModelTripNum = '';
                 this.formModelSectionName = '';
@@ -842,7 +866,7 @@ export default {
                 step.operation = OperationEvent.Train.moveTrainId.menu.operation;
                 step.param = params;
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.changeShowMode(true);
@@ -853,16 +877,16 @@ export default {
             });
         },
         initMenus() {
-            this.basicParamList = this.$store.state.training.prdType === '01' ? [
-                { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
-                { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
-                { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menu, show:false, securityCommand: true },
+            this.basicParamList = this.work === 'localWork' ? [
+                { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, show: false, disabledName: 'controlMode', mode: 'Center' },
+                { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, show: false, disabledName: 'controlMode', mode: 'None' },
+                { name: '强行站控', cmdType: CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL, operate: OperationEvent.StationControl.forcedStationControl.menuButton, show:false, securityCommand: true },
                 { name: '重启令解', cmdType: CMD.Station.CMD_STATION_RESTART, operate:OperationEvent.Station.stationRestart.menuButton, show: false, securityCommand: true},
-                { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false },
-                { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false },
-                { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false },
-                { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, show: false },
-                { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, show: false }
+                { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton, show: false },
+                { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton, show: false },
+                { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menuButton, show: false },
+                { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, show: false },
+                { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, show: false }
             ] : [
                 // { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
                 // { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
@@ -893,7 +917,7 @@ export default {
                 { name: '轨区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, show: false, securityCommand: true},
                 { name: '强解区段', cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, show: false, securityCommand: true }
             ];
-            this.signalParamList = this.$store.state.training.prdType === '01' ? [
+            this.signalParamList = this.work === 'localWork' ? [
                 { name: '追踪单开', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, show: false, disabledName: 'ciControl' },
                 { name: '追踪单关', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, show: false, disabledName: 'ciControl', antonymy: true },
                 { name: '自排单开', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, show: false, disabledName: 'atsControl' },
@@ -912,7 +936,7 @@ export default {
                 { name: '解封信号', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, show: false, securityCommand: true },
                 { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, show: false }
             ];
-            this.stationParamList = this.$store.state.training.prdType === '01' ? [
+            this.stationParamList = this.work === 'localWork' ? [
                 { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, show: false }
                 // { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
                 // { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }
@@ -926,7 +950,7 @@ export default {
                 { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, show: false }
                 // { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }
             ];
-            this.standParamList = this.$store.state.training.prdType === '01' ? [] : [
+            this.standParamList = this.work === 'localWork' ? [] : [
                 { name: '扣车', cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, operate: OperationEvent.StationStand.setDetainTrain.menuButton, show: false },
                 { name: '取消扣车', cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, operate: OperationEvent.StationStand.cancelDetainTrain.menuButton, show: false },
                 { name: '越站', cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, operate: OperationEvent.StationStand.setJumpStop.menuButton, show: false },
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue
index fd074f917..b18398d42 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSection.vue
@@ -2,7 +2,6 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" pop-menu-class="haerbin-01__systerm" />
     <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
-    <train-add-plan ref="trainAddPlan" pop-class="haerbin-01__systerm" />
     <set-fault ref="setFault" pop-class="haerbin-01__systerm" />
     <load-spare-train ref="loadSpareTrain" pop-class="haerbin-01__systerm" />
   </div>
@@ -10,13 +9,11 @@
 
 <script>
 import PopMenu from '@/components/PopMenu';
-import TrainAddPlan from '@/jmapNew/theme/components/menus/dialog/trainAddPlan';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 
@@ -25,7 +22,6 @@ export default {
     components: {
         PopMenu,
         NoticeInfo,
-        TrainAddPlan,
         SetFault,
         LoadSpareTrain
     },
@@ -40,12 +36,6 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置故障',
@@ -88,16 +78,7 @@ export default {
             }
         }
     },
-    mounted() {
-        // const isDev = process.env.NODE_ENV === 'development';
-        // if (isDev) {
-        //     this.menuNormal.Center.push({
-        //         label: '新建计划车',
-        //         handler: this.addPlanTrain,
-        //         cmdType: CMD.Section.CMD_Train_Init_Plan
-        //     });
-        // }
-    },
+    mounted() {},
     methods: {
         clickEvent() {
             const self = this;
@@ -106,12 +87,6 @@ export default {
             };
         },
         initMenu() {
-            // 编辑模式菜单列表
-            if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
-            } else {
-                this.menu = [];
-            }
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
                 this.menu = this.menuForce;
@@ -136,14 +111,6 @@ export default {
                 this.$refs.popMenu.close();
             }
         },
-        // // 新建计划车(开发专用)
-        // addPlanTrain() {
-        //     commitOperate(menuOperate.Train.createPlanTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
-        //         if (valid) {
-        //             this.$refs.trainAddPlan.doShow(operate);
-        //         }
-        //     });
-        // },
         // 设置故障
         setStoppage() {
             commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
index 48ce21e34..9639baf40 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
@@ -8,9 +8,7 @@
 <script>
 import PopMenu from '@/components/PopMenu';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
@@ -19,7 +17,6 @@ export default {
     name: 'SignalMenu',
     components: {
         PopMenu,
-        NoticeInfo,
         SetFault
     },
     props: {
@@ -34,12 +31,6 @@ export default {
         return {
             menu: [],
             systemName:'xian-01__systerm',
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置故障',
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStation.vue b/src/jmapNew/theme/haerbin_01/menus/menuStation.vue
index de34ca5ab..d26115d02 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuStation.vue
@@ -13,7 +13,6 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -35,32 +34,26 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置ZC故障',
                     handler: this.setStoppage,
-                    cmdType: CMD.Station.CMD_STATION_ADD_FAULT
+                    cmdType: CMD.Fault.CMD_SET_FAULT
                 },
                 {
                     label: '取消ZC故障',
                     handler: this.cancelStoppage,
-                    cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
                 },
                 {
                     label: '设置车站故障',
                     handler: this.setStationStoppage,
-                    cmdType: CMD.Station.CMD_STATION_ADD_FAULT
+                    cmdType: CMD.Fault.CMD_SET_FAULT
                 },
                 {
                     label: '取消车站故障',
                     handler: this.cancelStationStoppage,
-                    cmdType: CMD.Station.CMD_STATION_REMOVE_FAULT
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
                 },
                 {
                     label: '重启联锁机',
@@ -101,9 +94,6 @@ export default {
             };
         },
         initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = [...this.menuForce];
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
index e37804850..9eb3af287 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
@@ -13,7 +13,6 @@ import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -44,12 +43,12 @@ export default {
                 {
                     label: this.$t('menu.menuStationStand.setFault'),
                     handler: this.setStoppage,
-                    cmdType:CMD.Stand.CMD_STAND_ADD_FAULT
+                    cmdType:CMD.Fault.CMD_SET_FAULT
                 },
                 {
                     label: this.$t('menu.menuStationStand.cancelFault'),
                     handler: this.cancelStoppage,
-                    cmdType:CMD.Stand.CMD_STAND_REMOVE_FAULT
+                    cmdType:CMD.Fault.CMD_CANCEL_FAULT
                 },
                 {
                     label: '站台紧急停车',
@@ -96,7 +95,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
index b95b7f0e0..f716af1fb 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSwitch.vue
@@ -15,8 +15,6 @@ import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLo
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -38,12 +36,6 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置故障',
@@ -90,7 +82,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index 0838f2cfc..c5b174024 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -2,11 +2,6 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
-    <!-- <train-control ref="trainControl" /> -->
-    <!-- <train-delete ref="trainDelete" /> -->
-    <!-- <train-move ref="trainMove" /> -->
-    <!-- <train-switch ref="trainSwitch" /> -->
-    <!-- <train-edit-number ref="trainEditNumber" /> -->
     <speed-limit ref="speedLimit" pop-class="haerbin-01__systerm" />
     <set-fault ref="setFault" pop-class="haerbin-01__systerm" />
   </div>
@@ -20,12 +15,6 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import TrainControl from './dialog/trainControl';
-// import TrainDelete from './dialog/trainDelete';
-// import TrainMove from './dialog/trainMove';
-// import TrainSwitch from './dialog/trainSwitch';
-// import TrainEditNumber from './dialog/trainEditNumber';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -34,11 +23,6 @@ export default {
     components: {
         PopMenu,
         NoticeInfo,
-        // TrainControl,
-        // TrainDelete,
-        // TrainMove,
-        // TrainSwitch,
-        // TrainEditNumber,
         SetFault,
         SpeedLimit
     },
@@ -170,7 +154,6 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
             }
@@ -229,7 +212,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -343,7 +326,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainControl.doShow(step, this.selected);
@@ -360,7 +343,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainDelete.doShow(step, this.selected);
@@ -377,7 +360,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainControl.doShow(step, this.selected);
@@ -394,7 +377,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -411,7 +394,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainMove.doShow(step, this.selected);
@@ -428,7 +411,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', 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 83cea6fd8..3cdffd1b7 100644
--- a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -185,7 +185,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 a4635f698..bc81443bd 100644
--- a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue
@@ -79,7 +79,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -90,7 +90,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/childDialog/confirmTrain.vue
index 976b5eb63..b33295ce1 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/childDialog/confirmTrain.vue
@@ -135,7 +135,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/standDetainTrainAll.vue
index a289d5507..96d596601 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/standDetainTrainAll.vue
@@ -136,7 +136,7 @@ export default {
                 val: `${upDown}`
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -154,7 +154,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -170,7 +170,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/standRunLevel.vue
index c6154a711..73e3a05d8 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/standRunLevel.vue
@@ -198,7 +198,7 @@ export default {
             this.time = time;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -213,7 +213,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -238,7 +238,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -258,7 +258,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/standStopTime.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/standStopTime.vue
index 6de7778ac..aa708cc99 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/standStopTime.vue
@@ -182,7 +182,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -197,7 +197,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -213,7 +213,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -232,7 +232,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -249,7 +249,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/stationCmdControl.vue
index 70b765c25..cbb4116a8 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/stationCmdControl.vue
@@ -262,7 +262,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -288,7 +288,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -319,7 +319,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -349,7 +349,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -366,7 +366,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/stationHumanControlAll.vue
index f3e2594ae..00c66ca05 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/stationHumanControlAll.vue
@@ -78,7 +78,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -94,7 +94,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/stationSetRouteControlAll.vue
index 70aad0f4c..496edf908 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/stationSetRouteControlAll.vue
@@ -100,7 +100,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -116,7 +116,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue
index c4ee8d31b..250d6547a 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainControl.vue
@@ -195,7 +195,7 @@ export default {
                     operation: OperationEvent.Train.setPlanTrainId.menu.operation,
                     param: params
                 };
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.tempTableData = [];
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainCreate.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainCreate.vue
index 3ccf4f842..9699ad687 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainCreate.vue
@@ -116,7 +116,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -133,7 +133,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainDelete.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainDelete.vue
index 606b38c02..0a91de667 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainDelete.vue
@@ -110,7 +110,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -128,7 +128,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainEditNumber.vue
index 376ad1b07..698b2e77d 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainEditNumber.vue
@@ -92,7 +92,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainMove.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainMove.vue
index 23b8fe294..6210d9d57 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainMove.vue
@@ -152,7 +152,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -173,7 +173,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/nanjing_02/menus/dialog/trainSwitch.vue
index 9924dd30f..e00de864f 100644
--- a/src/jmapNew/theme/nanjing_02/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/dialog/trainSwitch.vue
@@ -157,7 +157,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -178,7 +178,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..1c88cbd5d
--- /dev/null
+++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenu.vue
@@ -0,0 +1,439 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-train ref="menuTrain" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" />
+    <menu-signal ref="menuSignal" :selected="selected" />
+    <menu-switch ref="menuSwitch" :selected="selected" />
+    <menu-section ref="menuSection" :selected="selected" />
+    <menu-station ref="menuStation" :selected="selected" />
+    <menu-button ref="menuButton" :selected="selected" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-control ref="passiveControl" pop-class="haerbin-01__systerm" />
+    <passive-timeout ref="passiveTimeout" />
+    <pop-menu ref="popMenu" :menu="menu" />
+    <set-fault ref="setFault" pop-class="nanjing-02__systerm" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import PopMenu from '@/components/PopMenu';
+import MenuTrain from './menuTrain';
+import MenuButton from './dispatchWorkMenuButton';
+import MenuSignal from './menuSignal';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuStation from './menuStation';
+import MenuStationStand from './menuStationStand';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveControl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuButton,
+        MenuTrain,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStation,
+        MenuStationStand,
+        PassiveAlarm,
+        PassiveControl,
+        PassiveTimeout,
+        PopMenu,
+        SetFault
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            loginActive: false,
+            inputStr: '',
+            menu: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: 'ATP重启',
+                    handler: this.atpRestart,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        ...mapGetters('training', [
+            'operatemode'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel) && !this.buttonOperation && this.operatemode === OperateMode.FAULT) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    methods: {
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        doShow(point) {
+            this.clickEvent();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            commitOperate(menuOperate.Common.setFault, { code: 'Server' }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.setFault, { _type: 'Server' });
+                }
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            commitOperate(menuOperate.Common.cancelFault, { code: 'Server' }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, { _type: 'Server' });
+                }
+            });
+        },
+        atpRestart() {
+            const step = {
+                over: true,
+                operation: menuOperate.Server.atpRestart.operation,
+                cmdType: menuOperate.Server.atpRestart.cmdType
+            };
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.doClose();
+                this.$messageBox(error.message || 'ATP重启失败！');
+            });
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        }
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.haerbin-01__systerm {
+	overflow: hidden !important;
+}
+
+.haerbin-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.haerbin-01__systerm .el-dialog .el-button {
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.haerbin-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.haerbin-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.haerbin-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.haerbin-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.haerbin-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.haerbin-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+.haerbin-01__systerm .el-button {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 1px !important;
+	color: #000;
+}
+</style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
new file mode 100644
index 000000000..65b092c98
--- /dev/null
+++ b/src/jmapNew/theme/nanjing_02/menus/dispatchWorkMenuButton.vue
@@ -0,0 +1,1525 @@
+<template>
+  <div class="haerbin-01__systerm">
+    <el-dialog
+      v-dialogDrag
+      class="haerbin-01__systerm __menuButton"
+      style="pointer-events: none"
+      title="Dialog"
+      z-index="2008"
+      :visible.sync="dialogVisible"
+      :modal="false"
+      :close-on-click-modal="false"
+      width="30%"
+      append-to-body
+      :before-close="handleClose"
+    >
+      <div style="margin-bottom: 30px">
+        <template v-if="secondConfirm">
+          <el-row>
+            <div style="display: flex;justify-content: space-between;margin: 10px 3px">
+              <el-button :id="cr1ConfrimId" class="fl" :class="{'disabled': cr1Confrim}" style="line-height: 18px; margin-top: 4px;" :disabled="cr1Confrim" plain @click="clickCr1Confirm">CR1</el-button>
+              <el-button :id="cr2ConfirmId" class="fr" :class="{'disabled': !cr1Confrim}" style="line-height: 18px; margin-top: 4px;" :disabled="!cr1Confrim" plain @click="clickCr2Confirm">CR2</el-button>
+            </div>
+          </el-row>
+          <el-row>
+            <el-col :span="5">
+              <img :src="banIcon" class="ban-img">
+            </el-col>
+            <el-col :span="19">
+              <div style="display: flex;justify-content: flex-start;margin-top: 10px;">
+                <div style="height: 10px;width: 70px;background-color: #F00;" />
+                <div style="height: 10px;width: 70px;background-color: #0F0;margin-left: 40px;" />
+                <div style="height: 10px;width: 70px;background-color: #00F;margin-left: 40px;" />
+              </div>
+              <div class="color-strip-container" style="">
+                <div style="height: 10px;width: 70px;background-color: #F00;" />
+                <div style="height: 10px;width: 70px;background-color: #0F0;margin-left: 40px;" />
+                <div style="height: 10px;width: 70px;background-color: #00F;margin-left: 40px;" />
+              </div>
+            </el-col>
+          </el-row>
+        </template>
+        <template v-else>
+          <el-row style="text-align: center">
+            <template v-for="(item, index) in menuCmdList">
+              <div :key="index" class="nav-border-row row-width-box flex-row">
+                <div v-if="item.name && (item.disabled || !item.cmdType)" :id="item.operate.domId" class="fake-button-disabled">{{ item.name }}</div>
+                <div v-else-if="item.name && item.securityCommand" :id="item.operate.domId" class="fake-button-active" @click="interceptLogin(clickCommand)(item, index)">{{ item.name }}</div>
+                <div v-else-if="item.name && !item.securityCommand" :id="item.operate.domId" class="fake-button" @click="interceptLogin(clickCommand)(item, index)">{{ item.name }}</div>
+                <div v-else class="fake-button-grayk" />
+              </div>
+            </template>
+          </el-row>
+        </template>
+      </div>
+      <div v-if="dialogVisible" class="separator">
+        <el-button :id="commandId" class="fl" :class="{'disabled': canCommand || secondConfirm}" style="line-height: 18px; margin-top: 4px;" plain :disabled="canCommand || secondConfirm" @click="interceptLogin(command)()">执行</el-button>
+        <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="interceptLogin(cancle)()">取消</el-button>
+        <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="handleClose">关闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-dialogDrag
+      class="haerbin-01__systerm __menuButton"
+      style="pointer-events: none"
+      title="IBP"
+      z-index="2008"
+      :visible.sync="stationDialogVisible"
+      :modal="false"
+      append-to-body
+      :close-on-click-modal="false"
+      width="30%"
+      :before-close="handleStationClose"
+    >
+      <div class="station_buttonGroup">
+        <div class="station_buttonGroupL">
+          <div v-if="allowDetain" :id="setDetainTrainId" class="stationButton" @click="stationDetainTrain">此站扣车</div>
+          <div v-else class="stationButton disabled">此站扣车</div>
+          <div v-if="allowJump" :id="setBulkBuckleTrainId" class="stationButton station_jumpTrain" @click="stationAllJumpTrain">连续扣车</div>
+          <div v-else class="stationButton station_jumpTrain disabled">连续扣车</div>
+        </div>
+        <div class="station_buttonGroupR">
+          <div v-if="allowCancle" :id="cancelTrainId" class="stationButton" @click="stationCancleTrain">恢复原状</div>
+          <div v-else class="stationButton disabled">恢复原状</div>
+          <div v-if="allowJump" :id="setJumpStopId" class="stationButton station_jumpTrain" @click="stationJumpTrain">此站不停</div>
+          <div v-else class="stationButton station_jumpTrain disabled">此站不停</div>
+        </div>
+      </div>
+      <div class="station_line">{{ getTrackSection() }}</div>
+      <div v-if="stationDialogVisible" class="station_commandGroup">
+        <el-button plain class="station_updateStatus">更新</el-button>
+        <el-button plain class="station_close" @click="handleStationClose">关闭</el-button>
+        <el-button :id="commandId" plain class="station_command" :class="{'disabled': isAllowCommand}" :disabled="isAllowCommand" @click="stationToCommand">执行</el-button>
+      </div>
+    </el-dialog>
+    <div v-if="rightClickDialogVisible" style="position: fixed;z-index: 2;background-color: rgba(44,170,170,0.5);" :style="{top: menuPosition.y + 'px', left:menuPosition.x + 'px'}">
+      <el-row style="text-align: center; width: 500px;">
+        <template v-for="(item, index) in menuCmdList">
+          <div :key="index" class="nav-border-row row-width-box flex-row">
+            <div v-if="item.name && (item.disabled || !item.cmdType)" :id="item.operate.domId" class="fake-button-disabled">{{ item.name }}</div>
+            <div v-else-if="item.name && item.securityCommand" :id="item.operate.domId" class="fake-button-active" @click="interceptLogin(clickCommand)(item, index)">{{ item.name }}</div>
+            <div v-else-if="item.name && !item.securityCommand" :id="item.operate.domId" class="fake-button" @click="interceptLogin(clickCommand)(item, index)">{{ item.name }}</div>
+            <div v-else class="fake-button-grayk" />
+          </div>
+        </template>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" pop-class="nanjing-02__systerm" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { deepAssign } from '@/utils/index';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { TrainingMode, MouseEvent, OperateMode } from '@/scripts/ConstDic';
+import { EventBus } from '@/scripts/event-bus';
+import * as adapter from '@/jmapNew/utils/adapter';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import BanIcon from '@/assets/ban-heb.png';
+import { queryRunPlanList } from '@/api/runplan';
+import { simulationLoadRunPlan } from '@/api/simulation';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import * as _ from 'lodash';
+import {judgeStationControl} from '../../components/utils/menuJudge';
+
+export default {
+    components: {
+        NoticeInfo
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            tempData: [],
+            speedLimitValue: 15,
+            oldDevice: null, // 上一次点击元素
+            canCommand: true,
+            cr1Confrim: false,
+            runPlanList: [],
+            newRunPlanId: '',
+            operate: '',
+            cmdType: '',
+            securityCommand: '',
+            switchRelevanceSectionList: [], // 道岔关联的区段列表
+            param: {},
+            stationObj: null,
+            selectedObj: null,
+            currentSelected: null,
+            oldClickObj: null, // 上一次点击对象
+            route: null, // 进路对象
+            overlap: null, // 延续保护
+            selectRouteList: [],
+            menuCmdList: new Array(15).fill({}),
+            ciStationParamList: [],
+            atp:false,
+            ground:false,
+            guide:false,
+            basicParamList: [],
+            sectionParamList: [],
+            switchParamList: [],
+            signalParamList: [],
+            stationParamList: [],
+            standParamList: [],
+            routeParamList: [],
+            paramConfirm: false,
+            secondConfirm: false,
+            commandInfo: {},
+            banIcon: BanIcon,
+            timer: null,
+            operationType: 'cmd',
+            trainModel: {},
+            formModelTripNum: '',
+            formModelSectionName: '',
+            formModelNewTrip: '',
+            formModelNewGroup: '',
+            trainOperateType: '',
+            formModelNewSection: '',
+            dialogVisible: false,
+            tipList: [],
+            modeMatch: false,
+            stationDialogVisible:false,
+            rightClickDialogVisible: false,
+            isAllowCommand:true,
+            allowDetain:true,
+            allowCancle:true,
+            allowJump:true,
+            strategyList: [ // 折返策略
+                { value: '01', label: '不折返' },
+                { value: '02', label: '缺省折返' },
+                { value: '03', label: '换端' },
+                { value: '04', label: '自动折返' }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'operatemode'
+        ]),
+        ...mapGetters('map', [
+            'routeList',
+            'stationList',
+            'stationStandList',
+            'routeData',
+            'overlapList',
+            'overlapData',
+            'sectionList'
+        ]),
+        commandId() {
+            return OperationEvent.Command.commandHaerbin.confirm.domId;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        },
+        actualSelected() {
+            return adapter.adapterAsDevice(this.selected, this.mapDevice);
+        },
+        setDetainTrainId() {
+            return OperationEvent.StationStand.setDetainTrain.menuButton.domId;
+        },
+        cancelTrainId() {
+            return OperationEvent.StationStand.cancelTrain.menuButton.domId;
+        },
+        setJumpStopId() {
+            return OperationEvent.StationStand.setJumpStop.menuButton.domId;
+        },
+        setBulkBuckleTrainId() {
+            return OperationEvent.StationStand.setBulkBuckleTrain.menuButton.domId;
+        },
+        cr1ConfrimId() {
+            return OperationEvent.Command.commandHaerbin.confrimCr1.domId;
+        },
+        cr2ConfirmId() {
+            return OperationEvent.Command.commandHaerbin.confrimCr2.domId;
+        },
+        stationContorl() {
+            return this.getStationControl(this.currentSelected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {};
+        },
+        menuPosition() {
+            return this.$store.state.menuOperation.menuPosition;
+        },
+        runPlanName() {
+            return this.$store.state.runPlan.runPlanInfo.name;
+        },
+        trainCommitDisabled() {
+            return (this.trainOperateType === 'create' && this.formModelNewTrip && this.formModelNewTrip.length === 7 && this.formModelNewGroup && this.formModelNewGroup.length === 6) ||
+				(this.trainOperateType === 'update' && this.formModelNewTrip && this.formModelNewTrip.length === 7) || (this.trainOperateType === 'delete') ||
+				(this.trainOperateType === 'move' && this.formModelNewSection);
+        },
+        handleSectionList() {
+            const list = [];
+            this.sectionList.forEach(item => {
+                if ((item.type === '01' && !item.parentCode) || item.type === '04') {
+                    list.push({label: item.name, value: item.code});
+                } else if (item.type === '02') {
+                    const parentSection = this.$store.getters['map/getDeviceByCode'](item.parentCode) || {};
+                    list.push({label: parentSection.name + item.name, value: item.code});
+                }
+            });
+            return list;
+        }
+    },
+    watch: {
+        '$store.state.trainingNew.trainingSwitch':function (val) {
+            if (!val) {
+                this.doClose();
+            }
+        },
+        'selected': function (val) {
+            EventBus.$emit('sendMsg', {}); // 清空执行栏
+            this.initMenus();// 初始化菜单数据
+            this.selectedObj = this.actualSelected;
+            this.currentSelected = val;
+            this.rightClickDialogVisible = false;
+            if (this.selectedObj._type && val._event == MouseEvent.Left) {
+                const [stationCode, centralStationCode] = this.getStationCodes(this.currentSelected);
+                this.modeMatch = judgeStationControl(stationCode, centralStationCode, 'dispatchWork');
+                // 道岔区段  是道岔操作
+                if (this.selectedObj._type == 'Section' && this.selectedObj.type == '03') {
+                    this.selectedObj = this.selectedObj.switch;
+                }
+                this.canCommand = true;
+                const step = {
+                    operation: 'click',
+                    code: this.selected.code,
+                    subType:this.$store.state.menuOperation.subType
+                };
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                    if (valid) { this.handleDeviceMenu(); }
+                }).catch((error) => {
+                    console.error(error);
+                    if (error && error.code == '10017') {
+                        EventBus.$emit('sendMsg', {message: error.message});
+                    } else {
+                        EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    }
+                });
+                if (val._type !== 'Psd' && val._type !== 'StationStand' && val._type !== 'Train') {
+                    this.dialogVisible = true;
+                }
+                this.handleIbpShow();
+            } else {
+                const step = {
+                    operation: 'click',
+                    code: '',
+                    subType:this.$store.state.menuOperation.subType
+                };
+
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                    if (valid) {
+                        this.handleBasicMenu();
+                        this.dialogVisible = false;
+                    }
+                }).catch((error) => {
+                    console.error(error);
+                    if (error && error.code == '10017') {
+                        EventBus.$emit('sendMsg', {message: error.message});
+                    } else {
+                        EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    }
+                });
+
+            }
+        },
+        '$store.state.map.showCentralizedStationCode': function(val) {
+            this.cancle();
+            if (!this.oldSelected) {
+                this.handleBasicMenu();
+            }
+        },
+        '$store.state.map.mapStationStateUpdateCount': function() {
+            this.initCentralizedStationList([...this.menuCmdList]);
+        },
+        '$store.state.training.steps': function(steps) {
+            this.initTrainingStation(steps);
+            this.handleBasicMenu();
+        }
+    },
+    mounted() {
+        this.param = {};
+        this.initMenus();
+        this.handleBasicMenu();
+        queryRunPlanList(this.$route.query.mapId).then(resp =>{
+            if (resp.data && resp.data.length) {
+                resp.data.forEach(item => {
+                    this.runPlanList.push(item);
+                });
+            }
+        }).catch(() => {
+            this.$message.error('获取地图模板运行图列表失败！');
+        });
+        EventBus.$on('sendMsg', ({message = ''}) => {
+            this.tempData = [{name: message}];
+        });
+    },
+    methods: {
+        getStationCodes(selected) {
+            let stationCode = '';
+            let centralStationCode = '';
+            if (selected._type === 'StationStand') {
+                stationCode = selected.stationCode;
+                centralStationCode = selected.deviceStationCode;
+            } else if (selected._type === 'Station') {
+                stationCode = selected.code;
+                centralStationCode = selected.stationCode;
+            } else if (selected._type === 'Train') { // 车次窗单独处理
+                if (selected.sectionCode) {
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                    stationCode = section.belongStation;
+                    centralStationCode = section.stationCode;
+                }
+            } else if (selected._type === 'TrainWindow') {
+                const section = this.sectionList.find(elem => elem.trainWindowSectionCode === selected.code);
+                if (section) {
+                    stationCode = section.belongStation;
+                    centralStationCode = section.stationCode;
+                }
+            } else if (selected._type === 'Section') {
+                stationCode = selected.belongStation;
+                centralStationCode = selected.stationCode;
+            } else if (selected._type === 'Switch' || selected._type === 'Signal') {
+                stationCode = selected.belongStationCode;
+                centralStationCode = selected.stationCode;
+            }
+            return [stationCode, centralStationCode];
+        },
+        initTrainingStation(steps) {
+            if (steps && steps.length) {
+                const code = steps[0].code;
+                this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
+                if (this.stationObj) {
+                    this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
+                }
+            }
+        },
+        handleTrainOperate(type) {
+            this.trainOperateType = type;
+        },
+        initCentralizedStationList(list) {
+            const stationContorl = this.stationContorl;
+            this.menuCmdList = new Array(15).fill({});
+            const lists = list.filter(el => {
+                if (el.isShow && this.selectedObj._type == 'Section' && !el.isShow(this.oldClickObj)) {
+                    return false; // standTrack 站台轨
+                } else if (el.isShow && this.selectedObj._type == 'Station' && el.isShow(this.selectedObj.ciStation)) {
+                    return false;
+                }
+                return el;
+            });
+            lists.forEach((el, index) => {
+                if (el.disabledCb && stationContorl) {
+                    el.disabled = el.disabledCb(stationContorl, this.selectedObj);
+                }
+                this.menuCmdList[index] = el;
+            });
+        },
+        checkBelongCentralizedStationByInputStr(inputStr) {
+            const stationContorl = this.stationContorl;
+            return stationContorl && stationContorl.depot ? false : stationContorl.jp == inputStr;
+        },
+        interceptLogin(cb) {
+            return (args) => {
+                cb(args);
+            };
+        },
+        getTrackSection() {
+            if (this.selectedObj) {
+                const sectionModel = this.$store.getters['map/getDeviceByCode'](this.selectedObj.standTrackCode);
+                return sectionModel ? '轨道：' + sectionModel.name : '';
+            }
+        },
+        // 高亮设备
+        deviceHighLight(device, flag) {
+            if (device && device.instance && typeof device.instance.drawSelected === 'function' ) {
+                if (device._type === 'Section' && device.type === '04') {
+                    device.relevanceSectionList.forEach(item => {
+                        const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
+                        sectionModel && sectionModel.instance.drawSelected(flag);
+                    });
+                } else if (device._type === 'Section' && device.type === '01' && device.logicSectionCodeList && device.logicSectionCodeList.length) {
+                    device.logicSectionCodeList.forEach(item => {
+                        const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
+                        sectionModel && sectionModel.instance.drawSelected(flag);
+                    });
+                } else {
+                    device.instance.drawSelected(flag);
+                }
+            } else if (device) {
+                const model = this.$store.getters['map/getDeviceByCode'](device.code);
+                if (model.instance) {
+                    model.instance.drawSelected(flag);
+                }
+            }
+        },
+        handleDeviceMenu() {
+            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+            if (this.selectedObj) {
+                switch (this.selectedObj._type) {
+                case 'Switch':
+                    this.handleSwicthMenu();
+                    break;
+                case 'Signal':
+                    if (this.oldClickObj && this.oldClickObj.code != this.selectedObj.code) {
+                        this.checkSignal();
+                    } else {
+                        this.handleSingalMenu();
+                    }
+                    break;
+                case 'Section':
+                    if (this.operationType === 'train') {
+                        this.handleTrainParam();
+                    } else {
+                        this.handleSectionMenu();
+                    }
+                    break;
+                case 'Station':
+                    this.handleStationMenu();
+                    this.deviceHighLight(this.oldDevice, false);
+                    this.deviceHighLight(this.selectedObj, true);
+                    this.oldDevice = this.selectedObj;
+                    break;
+                default:
+                    this.handleBasicMenu();
+                    break;
+                }
+            }
+        },
+        handleClickLoadRunPlan(row) {
+            simulationLoadRunPlan(this.$route.query.group, this.newRunPlanId).then(response => {
+                this.$message.success('仿真加载指定运行计划成功！');
+            }).catch(() => {
+                this.$message.error('仿真加载指定运行计划失败！');
+            });
+        },
+        handleIbpShow() {
+            if (this.selectedObj._type == 'StationStand' && (this.$store.state.menuOperation.subType == 'StationPlatform' || this.$store.state.menuOperation.subType == 'StandDetain')) {
+                if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) {
+                    this.allowCancle = false;
+                } else {
+                    if (this.selectedObj.assignSkip || this.selectedObj.allSkip) {
+                        this.allowJump = false;
+                        this.allowCancle = true;
+                        this.allowDetain = false;
+                    }
+                    if (this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain) {
+                        this.allowDetain = false;
+                        this.allowCancle = true;
+                        this.allowJump = false;
+                    }
+                }
+                this.stationDialogVisible = true;
+            }
+        },
+        getStationControl(selected = {}) {
+            let control = null;
+            const model = this.$store.getters['map/getDeviceByCode'](selected.code) || {};
+            if (model._type == 'StationStand') {
+                control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.deviceStationCode);
+            } else if (model._type == 'Station') {
+                if (model.centralized) {
+                    control = model;
+                } else {
+                    this.stationList.forEach(el => {
+                        if (el.centralized &&
+							el.chargeStationCodeList.includes(model.code)) {
+                            control = this.$store.getters['map/getDeviceByCode'](el.code);
+                            return;
+                        }
+                    });
+                }
+            } else if (model._type == 'Train') { // 车次窗单独处理
+                control = model;
+            } else if (model._type == 'TrainWindow') {
+                control = this.$store.getters['map/getDeviceTrainWindowCodeByStationCode'](model.code);
+            } else if (model._type == 'LimitControl') {
+                control = {controlMode: 'Center'};
+            } else if (model._type == 'Psd') {
+                const stand = this.$store.getters['map/getDeviceByCode'](model.standCode);
+                control = this.$store.getters['map/getDeviceStationCodeByStationCode'](stand.deviceStationCode);
+            } else if (model._type) {
+                control = this.$store.getters['map/getDeviceStationCodeByStationCode'](model.stationCode);
+            }
+            return control;
+        },
+        selectRouteParam(code) {
+            if (this.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP) {
+                this.overlap = this.overlapData[code];
+                if (this.overlap) {
+                    this.param = {
+                        signalCode: this.selectedObj.code,
+                        overlapCode: this.overlap.code
+                    };
+                    this.canCommand = false;
+                }
+            } else {
+                this.route = this.routeData[code];
+                if (this.route) {
+                    this.param = {
+                        routeCode: this.route.code
+                    };
+                }
+                this.initCentralizedStationList(this.routeParamList);
+            }
+
+        },
+        handleSwicthMenu() { // 转换底部道岔菜单栏
+            // 获取道岔相关区段显示高亮
+            const section = this.$store.getters['map/getDeviceByCode'](this.selectedObj.sectionParentCode);
+            const sectionA = this.$store.getters['map/getDeviceByCode'](this.selectedObj.sectionACode); // 获取道岔相关的道岔计轴区段
+            const sectionB = this.$store.getters['map/getDeviceByCode'](this.selectedObj.sectionBCode);
+            const sectionC = this.$store.getters['map/getDeviceByCode'](this.selectedObj.sectionCCode);
+            this.switchRelevanceSectionList = [sectionA, sectionB, sectionC];
+            this.deviceHighLight(this.oldDevice, false);
+            this.switchRelevanceSectionList.forEach(model => {
+                this.deviceHighLight(model, true);
+            });
+            this.oldDevice = section;
+
+            this.initCentralizedStationList(this.switchParamList);
+            this.param = {
+                switchCode: this.selectedObj.code,
+                sectionCode: section.code
+            };
+
+            EventBus.$emit('sendMsg', {message: this.selectedObj.name});
+        },
+        handleSingalMenu() {
+            this.deviceHighLight(this.oldDevice, false);
+            this.deviceHighLight(this.selectedObj, true);
+            this.oldDevice = this.selectedObj;
+            if (this.oldClickObj) { // 清除上上次信号机背景
+                this.deviceHighLight(this.oldClickObj, false);
+            }
+
+            this.oldClickObj = deepAssign({}, this.selectedObj);
+            this.initCentralizedStationList(this.signalParamList);
+            this.param = {
+                signalCode: this.selectedObj.code
+            };
+
+            EventBus.$emit('sendMsg', {message: this.selectedObj.name});
+        },
+        handleSectionMenu() {
+            this.deviceHighLight(this.oldDevice, false);
+            this.deviceHighLight(this.selectedObj, true);
+            this.oldDevice = this.selectedObj;
+            this.oldClickObj = deepAssign({}, this.selectedObj);
+
+            this.initCentralizedStationList(this.sectionParamList);
+            this.param = {
+                sectionCode: this.selectedObj.code
+            };
+
+            EventBus.$emit('sendMsg', {message: this.selectedObj.name});
+        },
+        handleBasicMenu() {
+            this.stationObj = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            this.deviceHighLight(this.oldDevice, false);
+            if (this.oldClickObj) {
+                this.deviceHighLight(this.oldClickObj, false);
+            }
+
+            this.oldClickObj = null; // 清空上次点击信号机
+            this.initCentralizedStationList(this.basicParamList, this.stationObj);
+
+            this.param = {
+                stationCode: this.$store.state.map.showCentralizedStationCode,
+                stationCodes: [this.$store.state.map.showCentralizedStationCode]
+            };
+
+            EventBus.$emit('sendMsg', { message: this.stationObj ? this.stationObj.name : '' });
+        },
+        handleStationMenu() {
+            this.initCentralizedStationList(this.stationParamList);
+            this.param = { stationCode: this.selectedObj.code };
+
+            EventBus.$emit('sendMsg', {message: this.selectedObj.name});
+        },
+        handleStandMenu() {
+            this.deviceHighLight(this.oldDevice, false);
+            this.deviceHighLight(this.selectedObj, true);
+            this.oldDevice = this.selectedObj;
+
+            this.initCentralizedStationList(this.standParamList);
+            const data = Object.assign(this.selectedObj);
+            const station = this.$store.getters['map/getDeviceByCode'](this.selectedObj.stationCode);
+            data.name = `${station.name} ${data.right ? '上行' : '下行'}`;
+            this.param = { standCode: this.selectedObj.code };
+
+            EventBus.$emit('sendMsg', {message: data.name});
+        },
+        handleRouteMenu() { // 进路命令覆盖
+            this.initCentralizedStationList(this.routeParamList);
+            if (this.selectedObj._event === MouseEvent.Right && this.operatemode !== OperateMode.FAULT) {
+                this.rightClickDialogVisible = true;
+            }
+            // this.param = { routeCode: this.route.code };
+            if (this.route) {
+                this.param = { routeCode: this.route.code };
+            }
+            this.tempData = [];
+            this.selectRouteList.forEach(el => {
+                this.tempData.push(el);
+            });
+        },
+        // 校验上次点击信号机
+        checkSignal() {
+            this.route = null;
+            this.atp = false;
+            this.ground = false;
+            this.guide = false;
+            this.selectRouteList = [];
+            this.routeList.forEach(item => {
+                if (this.selectedObj.type !== 'TRANSMISSION' && item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.code) {
+                    this.selectRouteList.push(item);
+                } else if (this.selectedObj.type === 'TRANSMISSION' && item.startSignalCode == this.oldClickObj.code && item.endSignalCode == this.selectedObj.linkSignalCode) {
+                    this.selectRouteList.push(item);
+                }
+            });
+
+            if (this.selectRouteList.length) {
+                this.route = this.selectRouteList[0];
+                this.handleRouteMenu();
+                this.deviceHighLight(this.selectedObj, true);
+                this.oldDevice = this.selectedObj;
+            } else {
+                this.handleSingalMenu();
+            }
+        },
+        checkConfirmParam(row) {
+            this.param = {};
+            if (this.operate == OperationEvent.Signal.cancelTrainRoute.menuButton.operation || this.operate == OperationEvent.Signal.humanTrainRoute.menuButton.operation) {
+                this.param = {
+                    signalCode: this.route.startSignalCode
+                };
+            }
+            if (this.operate == OperationEvent.Signal.humanControl.menuButton.operation || this.operate == OperationEvent.Signal.atsAutoControl.menuButton.operation) {
+                const routeCodeList = [];
+                this.routeList.forEach(item => {
+                    if (item.startSignalCode == this.param.signalCode) {
+                        routeCodeList.push(item.code);
+                    }
+                });
+                this.param.routeCodeList = routeCodeList;
+            }
+
+            if (this.cmdType == CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER || this.cmdType == CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER) {
+                if (this.selectedObj.centralized) {
+                    this.param = { stationCode: this.selectedObj.code };
+                } else {
+                    this.stationList.forEach(station => {
+                        if (station.centralized && station.chargeStationCodeList.includes(this.selectedObj.code)) {
+                            this.param = { stationCode: station.code };
+                        }
+                    });
+                }
+            }
+
+            if (this.cmdType == CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED) {
+                this.param.speedLimitValue = -1;
+            }
+
+            if (this.cmdType === CMD.Stand.CMD_STAND_EARLY_DEPART) {
+                const stand = this.stationStandList.find(item => item.standTrackCode === this.selectedObj.code);
+                this.param.standCode = stand.code;
+            }
+            if (this.cmdType === CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY) {
+                const stand = this.stationStandList.find(item => item.standTrackCode === this.selectedObj.code);
+                this.param.standCode = stand.code;
+                this.param.standReentryStrategy = row.params.val;
+            }
+
+            if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
+                if (this.operate == OperationEvent.Section.setSpeed.menuButton.operation ||
+					this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) {
+                    this.canCommand = true;
+                }
+                let tip = '';
+                if (this.cmdType === CMD.Section.CMD_SECTION_SET_LIMIT_SPEED) {
+                    tip = '轨道区段限速设定';
+                } else if (this.cmdType === CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
+                    tip = '道岔区段限速设定';
+                }
+                this.menuCmdList = new Array(15).fill({ name: '' });
+                [65, 55, 45, 35, 25, 0].forEach((el, i) => {
+                    this.menuCmdList[i] = {
+                        name: `${el} km/h`,
+                        commandTip: `${tip}${el}KM`,
+                        cmdType: this.cmdType,
+                        operate: OperationEvent.Switch.setSpeed['choose' + el],
+                        next: true,
+                        param:{speedLimitValue:el},
+                        value: el
+                    };
+                });
+            }
+
+            if (this.cmdType == CMD.Section.CMD_STAND_SET_REENTRY_STRATEGY) {
+                this.param = {
+                    val: row.params ? row.params.val : ''
+                };
+            }
+        },
+        clickCommand(row) {
+            const step = {};
+
+            this.rightClickDialogVisible = false;
+
+            if (![OperationEvent.Command.common.choose].includes(row.operate)) {
+                this.commandInfo = row;
+            }
+
+            if (row.commandTip) {
+                EventBus.$emit('sendMsg', {message: row.commandTip});
+            }
+            if (row.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP) {
+                const overlapList = [];
+                this.overlapList.forEach(item => {
+                    if (item.signalCode === this.selectedObj.code) {
+                        overlapList.push(item);
+                    }
+                });
+                this.tempData = [...overlapList];
+            }
+
+            if (this.tempData.length) {
+                this.operate = row.operate.operation;
+                this.cmdType = row.cmdType;
+                this.canCommand = row.cmdType === CMD.Signal.CMD_SIGNAL_SET_OVERLAP;
+                step.operation = this.operate;
+
+                if (row.next) {
+                    step.val = row.name;
+                }
+
+                if (row.fillStationCode) {
+                    const station = this.stationObj || {};
+                    step.code = station.code;
+                }
+
+                if (row.param) {
+                    this.param = row.param;
+                }
+
+                step.param = this.param;
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                    if (valid) {
+                        this.checkConfirmParam(row);
+                        this.securityCommand = row.securityCommand || row.next;
+                    } else if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }
+                }).catch((error) => {
+                    if ( error && error.code == '10017') {
+                        EventBus.$emit('sendMsg', {message: error.message});
+                    } else {
+                        EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    }
+                });
+            }
+        },
+        command() {
+            const step = {
+                operation: OperationEvent.Command.commandHaerbin.confirm.operation,
+                param: this.param
+            };
+
+            if (!this.securityCommand) {
+                step.over = true;
+                step.cmdType = this.cmdType;
+            }
+
+            EventBus.$emit('sendMsg', {});
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid && this.securityCommand) {
+                    this.secondConfirm = true;
+                    const that = this;
+                    this.timer = setTimeout(() => {
+                        that.cancle();
+                    }, 15000);
+                } else if (valid) {
+                    this.doClose();
+                    this.handleClose();
+                    EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
+                }
+            }).catch((error) => {
+                this.doClose();
+                this.handleClose();
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                    this.$refs.noticeInfo.doShow(error.message);
+                } else {
+                    EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
+                    this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`);
+                }
+            });
+        },
+        clickCr1Confirm() {
+            clearTimeout(this.timer);
+            const step = {
+                operation: OperationEvent.Command.commandHaerbin.confrimCr1.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.cr1Confrim = true;
+                    const that = this;
+                    this.timer = setTimeout(() => {
+                        that.cancle();
+                    }, 10000);
+                }
+            }).catch((error) => {
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                    this.$refs.noticeInfo.doShow(error.message);
+                } else {
+                    EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    this.$refs.noticeInfo.doShow('命令执行失败！');
+                }
+                this.doClose();
+            });
+        },
+        clickCr2Confirm() {
+            clearTimeout(this.timer);
+            const step = {
+                over: true,
+                cmdType: this.cmdType,
+                operation: OperationEvent.Command.commandHaerbin.confrimCr2.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                    this.handleDeviceMenu();
+                    this.handleClose();
+                    EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
+                }
+            }).catch((error) => {
+                this.doClose();
+                this.handleDeviceMenu();
+                this.handleClose();
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                    this.$refs.noticeInfo.doShow(error.message);
+                } else {
+                    EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
+                    this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`);
+                }
+            });
+        },
+        handleRightClickClose() {
+            this.rightClickDialogVisible = false;
+        },
+        cancle() {
+            EventBus.$emit('sendMsg', {});
+            if (this.$store.state.training.mode != TrainingMode.TEACH) {
+                clearTimeout(this.timer);
+                this.doClose();
+            }
+        },
+        doClose() {
+            this.deviceHighLight(this.oldDevice, false); // 当前选中
+            this.changeShowMode('cmd');
+            this.operate = ''; // 清空指令
+            this.cmdType = '';
+            this.securityCommand = '';
+            this.speedLimitValue = '';
+            this.secondConfirm = false;
+            this.dialogVisible = false;
+            this.overlap = null;
+            this.cr1Confrim = false;
+            if (this.oldClickObj) {
+                this.deviceHighLight(this.oldClickObj, false);
+            }
+
+            this.canCommand = true; // 执行变为禁用
+            this.oldClickObj = null; // 清空上次点击信号机
+        },
+        handleOpen() {
+            this.dialogVisible = true;
+        },
+        handleClose() {
+            this.secondConfirm = false;
+            this.dialogVisible = false;
+        },
+        handleStationClose() {
+            this.cmdType = '';
+            this.operate = ''; // 清空指令
+            this.isAllowCommand = true;
+            this.stationDialogVisible = false;
+            this.allowJump = true;
+            this.allowCancle = true;
+            this.allowDetain = true;
+        },
+        handleTrainParam() {
+            if (this.selectedObj.type === '02') {
+                const parentSection = this.$store.getters['map/getDeviceByCode'](this.selectedObj.parentCode);
+                this.formModelSectionName = parentSection.name + this.selectedObj.name;
+            } else {
+                this.formModelSectionName = this.selectedObj.name;
+            }
+            this.trainOperateType = '';
+            this.$store.state.map.activeTrainList.forEach(trainCode => {
+                const trainModel = this.$store.getters['map/getDeviceByCode'](trainCode);
+                if (trainModel && trainModel.sectionCode === this.selectedObj.code) {
+                    this.formModelTripNum = trainModel.destinationCode + (trainModel.serviceNumber.substring(1)) + (trainModel.tripNumber.substring(1));
+                    this.trainModel = trainModel;
+                    this.formModelNewTrip = '';
+                }
+            });
+        },
+        pushTempData(list) {
+            this.tempData = [];
+            list.forEach(el => {
+                this.tempData.push(el);
+            });
+        },
+        changeShowMode(type) {
+            // if (this.$store.state.training.prdType === '01') {
+            //     this.trainModel = {};
+            //     this.formModelTripNum = '';
+            //     this.formModelSectionName = '';
+            //     this.formModelNewTrip = '';
+            //     this.formModelNewGroup = '';
+            //     this.trainOperateType = '';
+            //     this.operationType = type;
+            //     this.formModelNewSection = '';
+            // }
+        },
+        trainCommit() {
+            const params = {};
+            const step = {
+                over: true
+            };
+            if (this.trainOperateType === 'update') {
+                params.groupNumber = this.trainModel.groupNumber;
+                params.serviceNumber = '0' + this.formModelNewTrip.slice(3, 5);
+                params.tripNumber = '0' + this.formModelNewTrip.slice(5, 7);
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_PLAN;
+                step.operation = OperationEvent.Train.setPlanTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'create') {
+                params.sectionCode = this.selectedObj.code;
+                params.groupNumber = this.formModelNewGroup;
+                params.dn = this.formModelNewTrip.slice(0, 3);
+                params.sn = '0' + this.formModelNewTrip.slice(3, 5);
+                params.tn = '0' + this.formModelNewTrip.slice(5, 7);
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_ADD_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.addTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'delete') {
+                params.groupNumber = this.trainModel.groupNumber;
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_REMOVE_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.delTrainId.menu.operation;
+                step.param = params;
+            } else if (this.trainOperateType === 'move') {
+                params.groupNumber = this.trainModel.groupNumber;
+                params.sectionCode = this.formModelNewSection;
+                step.cmdType = CMD.TrainWindow.CMD_TRAIN_MOVE_TRAIN_TRACE;
+                step.operation = OperationEvent.Train.moveTrainId.menu.operation;
+                step.param = params;
+            }
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.changeShowMode('train');
+                }
+            }).catch((error) => {
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                    this.$refs.noticeInfo.doShow(error.message);
+                } else {
+                    EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    this.$refs.noticeInfo.doShow('命令执行失败！');
+                }
+            });
+        },
+        stationToCommand() {
+            const step = {
+                operation: OperationEvent.Command.commandHaerbin.confirm.operation,
+                over:true,
+                cmdType:this.cmdType
+            };
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.handleStationClose();
+                }
+            }).catch((error) => {
+                console.error(error);
+                this.handleStationClose();
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                    this.$refs.noticeInfo.doShow(error.message);
+                } else {
+                    EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    this.$refs.noticeInfo.doShow('命令执行失败！');
+                }
+            });
+        },
+        stationCommand(row) {
+            const step = {};
+            this.operate = row.operation;
+            step.operation = this.operate;
+            step.start = true;
+            step.param = row.param || {'standCode':this.selectedObj.code};
+            this.cmdType = row.cmdType;
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.isAllowCommand = false;
+                } else if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            }).catch((error) => {
+                if (error && error.code == '10017') {
+                    EventBus.$emit('sendMsg', {message: error.message});
+                    this.$refs.noticeInfo.doShow(error.message);
+                } else {
+                    EventBus.$emit('sendMsg', {message: '命令执行失败！'});
+                    this.$refs.noticeInfo.doShow('命令执行失败！');
+                }
+            });
+        },
+        stationDetainTrain() {
+            const row = {};
+            row.operation = OperationEvent.StationStand.setDetainTrain.menuButton.operation;
+            row.cmdType = CMD.Stand.CMD_STAND_SET_HOLD_TRAIN;
+            this.stationCommand(row);
+        },
+        stationCancleTrain() {
+            const row = {};
+            row.operation = OperationEvent.StationStand.cancelTrain.menuButton.operation;
+            row.cmdType = CMD.Stand.CMD_STAND_CANCEL_SETTING;
+            this.stationCommand(row);
+        },
+        stationJumpTrain() {
+            const row = {};
+            row.operation = OperationEvent.StationStand.setJumpStop.menuButton.operation;
+            row.cmdType = CMD.Stand.CMD_STAND_SET_JUMP_STOP;
+            this.stationCommand(row);
+        },
+        getSortStandList(right) {
+            const list = this.stationStandList.filter(el => el.right == right);
+            list.sort((stand1, stand2) => {
+                const station1 = this.$store.getters['map/getDeviceByCode'](stand1.stationCode);
+                const station2 = this.$store.getters['map/getDeviceByCode'](stand2.stationCode);
+                return station1.sn - station2.sn;
+            });
+            return list;
+        },
+        stationAllJumpTrain() {
+            // const list = this.stationStandList.filter(el => el.right == this.selectedObj.right);
+            const meFn = _.memoize(this.getSortStandList);
+            const list = meFn((this.selectedObj.right));
+            const index = list.findIndex(el => el.code == this.selectedObj.code);
+            let lists = list.slice(index);
+            if (this.selectedObj.right) {
+                lists = list.slice(0, index + 1);
+            }
+            const row = {};
+            row.operation = OperationEvent.StationStand.setBulkBuckleTrain.menuButton.operation;
+            row.cmdType = CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL;
+            row.param = { 'standCodes': lists.map(el => el.code) };
+            this.stationCommand(row);
+            // this.stationCommand(row);
+        },
+        getStationControlForbidden(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            return device && device.interlockMachineStarting;
+        },
+        initMenus() {
+            this.basicParamList = [
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' },
+                { name: '' }
+            ];
+            this.sectionParamList = this.selected && this.selected.type == '05' ? [
+                { name: '封锁岔心', commandTip: '封锁岔心', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
+            ] : [
+                { name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                { name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: 'NONE'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: 'NONE'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: 'DEFAULT'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: 'DEFAULT'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '上行换端', commandTip: '上行换端', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '下行换端', commandTip: '下行换端', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: 'UNMANNED'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: 'UNMANNED'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack }
+            ];
+            this.switchParamList = [
+                { name: '单独锁定', commandTip: '锁定道岔，阻止转换', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                { name: '转换道岔', commandTip: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.turnout.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                { name: '封锁道岔', commandTip: '禁止通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
+            ];
+
+            this.signalParamList = [
+                { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                { name: '封锁信号', commandTip: '封锁信号机，禁止开放', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                { name: '开放信号', commandTip: '设置信号机为开放状态', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                // { name: '解封信号', commandTip: '解封信号机，允许开放', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+
+                { name: '自排单开', commandTip: '设置单架信号机处于ATS自动排列进路模式', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },	// || stationControl.atsControl
+                { name: '自排单关', commandTip: '取消单架信号机处于ATS自动排列进路模式', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, operate: OperationEvent.Signal.humanControl.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }, //  || !stationControl.atsControl
+                { name: '追踪单开', commandTip: '设置单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }, //  || stationControl.ciControl
+                { name: '追踪单关', commandTip: '取消单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }, // || !stationControl.ciControl
+                { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl, device) => !this.modeMatch },
+
+                // { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
+                { name: '开启车队', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.setAutoInterlock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
+                { name: '取消车队', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.cancelAutoInterlock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
+                // { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
+            ];
+            this.stationParamList = [
+                { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
+
+                { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode || this.getStationControlForbidden(stationControl.code)), isShow: (ciStation) => !ciStation },
+                { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
+                { name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
+                { name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
+                { name: '关区信号', commandTip: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
+                { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl, device) => ['Local', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
+
+                { name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, disabledCb: (stationControl, device) => ['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) }
+            ];
+            this.routeParamList = [
+                { name: '排列进路', commandTip: '进路排列', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !this.route || this.getStationControlForbidden(stationControl.code) },
+                { name: '取消进路', commandTip: '取消排列', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !this.route || this.getStationControlForbidden(stationControl.code) }
+            ];
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/ {
+	.el-input--mini
+	.el-input__inner{
+		height: 20px;
+		line-height: 20px;
+	}
+}
+
+.speed-value-box{
+	height: 18px;
+	padding-left: 20px;
+	cursor: pointer;
+	width: 100%;
+	line-height: 18px;
+}
+
+.separator {
+	display: flex;
+	justify-content: flex-end;
+	margin: 15px;
+	border-top: 1px solid #000;
+}
+.selected-row {
+	margin-left:10px;
+	text-align: left;
+	line-height: 22px
+}
+.active{
+	background-color: #2e46f6 !important;
+	border: 1px solid #DADADA !important;
+}
+</style>
+<style lang="scss">
+.__menuButton {
+	.el-dialog,
+	.el-dialog__wrapper {
+		pointer-events: none !important;
+	}
+
+	.el-dialog__header,
+	.el-dialog__body {
+		pointer-events: all !important;
+	}
+}
+</style>
+<style lang="scss" scoped>
+#menuButton{
+	position: absolute;
+	bottom: 0;
+	height: 90px;
+	width: 1200px;
+	left: 0;
+	background: #FFFFFF;
+	z-index: 2;
+}
+
+.nav-border {
+	color: #000;
+	height: 90px;
+	text-align: center;
+	border-top: 2px solid #7E8076;
+	border-left: 2px solid #6A6B64;
+	border-right: 2px solid #FBFBFA;
+	border-bottom: 2px solid #FBFBFA;
+}
+.nav-border-top{
+	height: 30px;
+	padding: 0 20px;
+	width: 100%;
+	font-size: 12px;
+	color: #000;
+	border-bottom: 2px solid #FBFBFA;
+	.fl {
+		float: left;
+		width: 100px;
+	}
+	.fr{
+		float: right;
+		width: 100px;
+	}
+}
+
+.nav-border-bottom{
+	height: 56px;
+	width: 100%;
+	font-size: 12px;
+}
+.flex-box{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	align-items: center;
+}
+.nav-border-row{
+	height: 29px;
+	&.row-width-box{
+		width: 20%;
+		float: left;
+	}
+}
+.flex-row{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.fake-button{
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	border: 1px solid #426688;
+	background: #DDDDDD;
+	color: #000;
+	line-height: 18px;
+	cursor: pointer;
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+}
+
+.fake-button-grayk {
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	border: 1px solid #426688;
+	background: #DDDDDD;
+	color: #DDDDDD;
+	line-height: 18px;
+	cursor: not-allowed;
+}
+
+.fake-button-active{
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	line-height: 18px;
+	border: 1px solid #426688;
+	background: #77DBF0;
+	color: #000;
+	cursor: pointer;
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+}
+
+.fake-button-disabled{
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	line-height: 18px;
+	border: 1px solid #9B9B9B;
+	background: #DDDDDD;
+	color: #a0a0a0;
+	cursor: not-allowed;
+}
+
+.__menuButton .el-button {
+	background: #DDDDDD;
+	border: 1px solid #000 !important;
+	cursor: pointer;
+	&.disabled {
+		cursor: not-allowed;
+		border: 1px solid #D0CEC5 !important;
+		color: #a0a0a0!important;
+	}
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+}
+
+.__menuButton .el-print {
+	font-size: 12px;
+	height: 52px;
+	margin: 0px 20px;
+	border: 1px solid #d1d1d1;
+	width: auto;
+	overflow: auto;
+}
+
+.__menuButton {
+	.el-dialog,
+	.el-dialog__wrapper {
+		pointer-events: none !important;
+	}
+
+	.el-dialog__header,
+	.el-dialog__body {
+		pointer-events: all !important;
+	}
+}
+
+.color-strip-container{
+	display: flex;
+	justify-content: flex-start;
+	margin-top: 10px;
+	animation: colorStrip 2s ease-in-out infinite;
+	-moz-animation: colorStrip 2s ease-in-out infinite;
+	-webkit-animation: colorStrip 2s ease-in-out infinite;
+	-o-animation: colorStrip 2s ease-in-out infinite;
+}
+@keyframes colorStrip
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+@-moz-keyframes colorStrip /* Firefox */
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+@-webkit-keyframes colorStrip /* Safari 和 Chrome */
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+@-o-keyframes colorStrip /* Opera */
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+.ban-img{
+	height: 48px;
+	width: 48px;
+	animation: imageRotation 2s linear infinite;
+	-moz-animation: imageRotation 2s linear infinite;
+	-webkit-animation: imageRotation 2s linear infinite;
+	-o-animation: imageRotation 2s linear infinite;
+}
+@keyframes imageRotation
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+@-moz-keyframes imageRotation /* Firefox */
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+@-webkit-keyframes imageRotation /* Safari 和 Chrome */
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+@-o-keyframes imageRotation /* Opera */
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+
+.station_buttonGroup{
+	display: inline-block;
+	margin-top: 5px;
+	width: 100%;
+}
+.station_buttonGroupL{
+	margin-left: 10px;
+	float: left;
+}
+.station_buttonGroupR{
+	float: right;
+	margin-right: 10px;
+}
+.station_jumpTrain{
+	margin-top: 15px;
+}
+.station_line{
+	padding: 0px 10px;
+	width: 100%;
+	height: 20px;
+	text-align: center;
+	margin-top: 10px;
+	border:1px #ccc solid;
+}
+.station_commandGroup{
+	margin-top: 10px;
+	padding: 10px;
+}
+.station_command{
+	float: right;
+}
+.station_close{
+	float: right;
+}
+.moni_input{
+	border-top: 2px solid #585858;
+	border-left: 2px solid #585858;
+	border-right: 2px solid #F9F9F9;
+	border-bottom: 2px solid #F9F9F9;
+	background: #D4D0C8;
+}
+.stationButton{
+	font-size: 12px;
+	width: 100px;
+	border-radius: 1px !important;
+	border: 1px solid #426688;
+	background: #DDDDDD;
+	color: #000;
+	cursor: pointer;
+	text-align: center;
+	padding: 4px 0px;
+	cursor: pointer;
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+	&.disabled{
+		background: #f0f0f0;
+		color:#a0a0a0;
+		border: 1px solid #D0CEC5;
+		cursor: not-allowed;
+	}
+}
+</style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/index.vue b/src/jmapNew/theme/nanjing_02/menus/index.vue
deleted file mode 100644
index cc29a7a82..000000000
--- a/src/jmapNew/theme/nanjing_02/menus/index.vue
+++ /dev/null
@@ -1,477 +0,0 @@
-<template>
-  <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-if="$store.state.training.prdType === '01'" ref="menuBar" :selected="selected" :login-active="loginActive" :is-ignore-login="isIgnoreLogin" @login="login" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
-    <menu-button v-if="isShowButton" ref="menuButton" :selected="selected" :login-active="loginActive" :is-ignore-login="isIgnoreLogin" :input-str="inputStr" />
-    <passive-alarm ref="passiveAlarm" />
-    <passive-contorl ref="passiveControl" pop-class="haerbin-01__systerm" />
-    <passive-Timeout ref="passiveTimeout" />
-    <pop-menu ref="popMenu" :menu="menu" />
-    <set-fault ref="setFault" pop-class="nanjing-02__systerm" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import PopMenu from '@/components/PopMenu';
-import MenuTrain from './menuTrain';
-import MenuBar from './menuBar';
-import MenuButton from './menuButton';
-import MenuSignal from './menuSignal';
-import MenuSwitch from './menuSwitch';
-import MenuSection from './menuSection';
-import MenuStation from './menuStation';
-import MenuStationStand from './menuStationStand';
-import PassiveAlarm from './passiveDialog/alarm';
-import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
-import PassiveTimeout from './passiveDialog/timeout';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-import CommandHandler from '@/scripts/cmdPlugin/CommandHandler.js';
-
-export default {
-    name: 'Menus',
-    components: {
-        MenuBar,
-        MenuButton,
-        MenuTrain,
-        MenuSignal,
-        MenuSwitch,
-        MenuSection,
-        MenuStation,
-        MenuStationStand,
-        PassiveAlarm,
-        PassiveContorl,
-        PassiveTimeout,
-        PopMenu,
-        SetFault
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            loginActive: false,
-            inputStr: '',
-            menu: [
-                {
-                    label: '设置故障',
-                    handler: this.setStoppage,
-                    cmdType: CMD.Fault.CMD_SET_FAULT
-                },
-                {
-                    label: '取消故障',
-                    handler: this.cancelStoppage,
-                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
-                },
-                {
-                    label: 'ATP重启',
-                    handler: this.atpRestart,
-                    cmdType: CMD.Fault.CMD_SET_FAULT
-                }
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('config', [
-            'width'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ]),
-        ...mapGetters('training', [
-            'operatemode'
-        ]),
-        isShowButton() {
-            return this.$store.state.training.prdType === '01' || this.$store.state.training.prdType === '02';
-        },
-        isIgnoreLogin() {
-            return /jointTrainingNew/.test(this.$route.path) ||
-			/scriptDisplayNew/.test(this.$route.path) ||
-			/displayNew\/[teach|exam|manage]/.test(this.$route.path);
-        }
-    },
-    watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        },
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel) && !this.buttonOperation && this.operatemode === OperateMode.FAULT) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('config/updateMenuBar');
-        });
-    },
-    methods: {
-        login(inputStr) {
-            this.loginActive = !!inputStr;
-            this.inputStr = inputStr;
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        doShow(point) {
-            this.clickEvent();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        // 设置故障
-        setStoppage() {
-            commitOperate(menuOperate.Common.setFault, { code: 'Server' }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.setFault, { _type: 'Server' });
-                }
-            });
-        },
-        // 取消故障
-        cancelStoppage() {
-            commitOperate(menuOperate.Common.cancelFault, { code: 'Server' }, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, { _type: 'Server' });
-                }
-            });
-        },
-        atpRestart() {
-            CommandHandler.execute('Server_ATP_Restart', {}).then(resp => {
-                this.doClose();
-            }).catch(error => {
-                this.doClose();
-                this.$messageBox(error.message || 'ATP重启失败！');
-            });
-            // const step = {
-            //     over: true,
-            //     operation: menuOperate.Server.atpRestart.operation,
-            //     cmdType: menuOperate.Server.atpRestart.cmdType
-            //     //         param: {
-            //     //             code: 'Server',
-            //     //             faultType: 'Server_ATP_Restart'
-            //     //         }
-            // };
-            // this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-            //     if (valid) {
-            //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-            //         this.doClose();
-            //     } else {
-            //         this.doClose();
-            //         this.$messageBox('ATP重启失败！');
-            //     }
-            // }).catch((error) => {
-            //     this.loading = false;
-            //     this.doClose();
-            //     this.$messageBox(error.message || 'ATP重启失败！');
-            // });
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        }
-    }
-};
-</script>
-
-<style>
-    .menus .pop-menu {
-        background: #F0F0F0;
-    }
-
-    .menus .pop-menu span {
-        color: #000;
-    }
-
-    .menus .pop-menu .is-disabled span {
-        color: #B4B3B8;
-    }
-
-    .haerbin-01__systerm {
-        overflow: hidden !important;
-    }
-
-    .haerbin-01__systerm .el-dialog {
-        background: rgba(100, 100, 100, 0.3);
-        border: 2px solid rgb(144, 144, 144, 0.8);
-        border-radius: 6px;
-        color: #000;
-        font-size: 14px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__header {
-        padding: 5px;
-        height: 26px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__footer {
-        background: #F0F0F0;
-        opacity: 1;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__body {
-        padding-top: 10px;
-        padding-bottom: 10px;
-        padding-left: 5px;
-        padding-right: 5px;
-        margin: 0px 5px 5px;
-        border: 2px solid rgba(120, 121, 123, 0.5);
-        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-        background: #F0F0F0;
-        opacity: 1;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__title {
-        position: absolute;
-        top: 4px;
-        color: #000;
-        border-radius: 4px;
-        padding: 0px 2px;
-        height: 20px;
-        line-height: 20px
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__title::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        -webkit-filter: blur(10px);
-        filter: blur(10px);
-        height: 20px;
-        width: -webkit-fill-available;
-        background: rgba(128, 128, 128, 0.8);
-        z-index: -1;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__headerbtn {
-        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-        border: 1px solid #fff;
-        border-radius: 4px;
-        top: 4px;
-        right: 5px;
-        line-height: 16px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
-        font-size: 16px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
-        color: #fff;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button {
-        padding: 0px;
-        width: 80px;
-        border: 2px outset #E2E2E2;
-        border-radius: 0px !important;
-        color: #000;
-        background: #F0F0F0;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:focus span {
-        border: 1px dashed gray;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:active {
-        border: 2px inset #E2E2E2;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:disabled {
-        border: 2px inset #E2E2E2;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-button:disabled span {
-        border: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-input {
-        border: 2px inset #E9E9E9;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-input .el-input__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-textarea {
-        border: 2px inset #E9E9E9;
-        border-radius: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-textarea .el-textarea__inner {
-        color: #000;
-        background: #fff !important;
-        border: 0px;
-        border-radius: 0px !important;
-        box-sizing: border-box;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
-        background: #F0F0F0 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table {
-        border: 2px inset #E9E9E9;
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table .cell {
-        line-height: unset !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table th.is-leaf {
-        background: #F0F0F0 !important;
-        border-right: 1px solid #BDBDBD !important;
-        border-bottom: 1px solid #BDBDBD !important;
-        color: #000 !important;
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table tr td {
-        height: 20px !important;
-        padding: 0px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-table .el-table__empty-text {
-        top: 15px !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .current-row>td {
-        background: #3399FF !important;
-        color: #fff !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__label {
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
-        color: #C5C9CC !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
-        position: absolute;
-        -webkit-box-sizing: content-box;
-        box-sizing: content-box;
-        content: "";
-        border: 1px solid #000;
-        border-left: 0;
-        border-top: 0;
-        height: 7px;
-        left: 4px;
-        top: 1px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__inner {
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__label {
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
-        background: #fff !important;
-        border: 1px inset #dcdfe6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
-        width: 4px;
-        height: 4px;
-        border-radius: 100%;
-        background-color: #000 !important;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
-        background: #E6E6E6 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
-        color: #C5C9CC !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .base-label {
-        background: rgba(0, 0, 0, x);
-        position: relative;
-        left: -15px;
-        top: -18px;
-    }
-
-    .haerbin-01__systerm .el-dialog .el-form-item label {
-        font-weight: normal !important;
-        color: #000 !important;
-    }
-
-    .haerbin-01__systerm .el-dialog .context {
-        height: 100px;
-        border: 2px inset #E2E2E2;
-        overflow-y: scroll;
-    }
-
-    .haerbin-01__systerm .el-dialog .table {
-        margin-top: 10px;
-    }
-
-    .haerbin-01__systerm .el-dialog .notice {
-        margin-left: 62px;
-        line-height: 30px;
-    }
-
-    .haerbin-01__systerm .el-dialog .button-group {
-        margin-top: 10px;
-    }
-    .haerbin-01__systerm .el-button {
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-        border-radius: 1px !important;
-        color: #000;
-    }
-</style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/localWorkMenu.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenu.vue
new file mode 100644
index 000000000..0bb286b89
--- /dev/null
+++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenu.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :login-active="loginActive" :is-ignore-login="isIgnoreLogin" @login="login" />
+    <menu-train ref="menuTrain" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" />
+    <menu-signal ref="menuSignal" :selected="selected" />
+    <menu-switch ref="menuSwitch" :selected="selected" />
+    <menu-section ref="menuSection" :selected="selected" />
+    <menu-station ref="menuStation" :selected="selected" />
+    <menu-button ref="menuButton" :selected="selected" :login-active="loginActive" :is-ignore-login="isIgnoreLogin" :input-str="inputStr" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="haerbin-01__systerm" />
+    <passive-timeout ref="passiveTimeout" />
+    <pop-menu ref="popMenu" :menu="menu" />
+    <set-fault ref="setFault" pop-class="nanjing-02__systerm" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import PopMenu from '@/components/PopMenu';
+import MenuTrain from './menuTrain';
+import MenuBar from './localWorkMenuBar';
+import MenuButton from './localWorkMenuButton';
+import MenuSignal from './menuSignal';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuStation from './menuStation';
+import MenuStationStand from './menuStationStand';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
+import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuBar,
+        MenuButton,
+        MenuTrain,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStation,
+        MenuStationStand,
+        PassiveAlarm,
+        PassiveContorl,
+        PassiveTimeout,
+        PopMenu,
+        SetFault
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            loginActive: false,
+            inputStr: '',
+            menu: [
+                {
+                    label: '设置故障',
+                    handler: this.setStoppage,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                },
+                {
+                    label: '取消故障',
+                    handler: this.cancelStoppage,
+                    cmdType: CMD.Fault.CMD_CANCEL_FAULT
+                },
+                {
+                    label: 'ATP重启',
+                    handler: this.atpRestart,
+                    cmdType: CMD.Fault.CMD_SET_FAULT
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        ...mapGetters('training', [
+            'operatemode'
+        ]),
+        isIgnoreLogin() {
+            return /display\/[teach|exam|manage|joint|script]/.test(this.$route.path);
+        }
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        },
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel) && !this.buttonOperation && this.operatemode === OperateMode.FAULT) {
+                this.doShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    },
+    methods: {
+        login(inputStr) {
+            this.loginActive = !!inputStr;
+            this.inputStr = inputStr;
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.doClose();
+            };
+        },
+        doShow(point) {
+            this.clickEvent();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        // 设置故障
+        setStoppage() {
+            commitOperate(menuOperate.Common.setFault, { code: 'Server' }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.setFault, { _type: 'Server' });
+                }
+            });
+        },
+        // 取消故障
+        cancelStoppage() {
+            commitOperate(menuOperate.Common.cancelFault, { code: 'Server' }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.cancelFault, { _type: 'Server' });
+                }
+            });
+        },
+        atpRestart() {
+            const step = {
+                over: true,
+                operation: menuOperate.Server.atpRestart.operation,
+                cmdType: menuOperate.Server.atpRestart.cmdType
+            };
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            }).catch((error) => {
+                this.doClose();
+                this.$messageBox(error.message || 'ATP重启失败！');
+            });
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        }
+    }
+};
+</script>
+
+<style>
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.haerbin-01__systerm {
+	overflow: hidden !important;
+}
+
+.haerbin-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.haerbin-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.haerbin-01__systerm .el-dialog .el-button {
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.haerbin-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.haerbin-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.haerbin-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.haerbin-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.haerbin-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.haerbin-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.haerbin-01__systerm .el-dialog .base-label {
+	background: rgba(0, 0, 0, x);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.haerbin-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.haerbin-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.haerbin-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.haerbin-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.haerbin-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+.haerbin-01__systerm .el-button {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 1px !important;
+	color: #000;
+}
+</style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue
similarity index 51%
rename from src/jmapNew/theme/nanjing_02/menus/menuBar.vue
rename to src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue
index bb7644e1e..827de318e 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuBar.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuBar.vue
@@ -1,13 +1,13 @@
 <template>
-  <div id="menuBar" :style="{height: $store.state.training.prdType === '01'? '90px': '130px'}">
+  <div id="menuBar" style="height: 90px;">
     <div class="haerbin-01__systerm nav">
-      <el-row v-if="$store.state.training.prdType === '01'">
+      <el-row>
         <el-col :span="2">
           <div class="nav-border login">
-            <el-row>
+            <el-row :id="mBar.loginButton.domId">
               <el-button style="width: 100px;line-height: 19px;" plain @click="login">{{ loginText }}</el-button>
             </el-row>
-            <el-row>
+            <el-row :id="mBar.loginInput.domId">
               <span v-if="isLogin">{{ inputStr }}</span>
               <input v-if="!isLogin" v-model="inputStr" :type="modelType" style="width: 100px;height:20px;" :disabled="this.loginText == '登录'" @keyup.enter="validateData">
             </el-row>
@@ -62,109 +62,6 @@
           </div>
         </el-col>
       </el-row>
-      <el-row v-else-if="$store.state.training.prdType === '02'" style="padding: 3px;">
-        <el-col :span="20">
-          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;height: 132px;">
-            <el-row style="padding: 4px;">
-              <div class="tip-content-box">
-                <div v-if="tipContent[0]">{{ `${tipContent[0].level}` }}</div>
-                <div v-if="tipContent[0]">{{ `${tipContent[0].time}` }}</div>
-                <div v-if="tipContent[0]">{{ `${tipContent[0].confirm ? '确认': '未确认'}` }}</div>
-              </div>
-              <div class="tip-content-box">
-                <div v-if="tipContent[1]">{{ `${tipContent[1].level}` }}</div>
-                <div v-if="tipContent[1]">{{ `${tipContent[1].time}` }}</div>
-                <div v-if="tipContent[1]">{{ `${tipContent[1].confirm ? '确认': '未确认'}` }}</div>
-              </div>
-              <div class="tip-content-box">
-                <div v-if="tipContent[2]">{{ `${tipContent[2].level}` }}</div>
-                <div v-if="tipContent[2]">{{ `${tipContent[2].time}` }}</div>
-                <div v-if="tipContent[2]">{{ `${tipContent[2].confirm ? '确认': '未确认'}` }}</div>
-              </div>
-            </el-row>
-            <div style="padding: 5px;height:20px;line-height: 20px;border-top: 2px solid #DDD9CA;display: flex;justify-content: space-between;">
-              <!--<div class="div-simulate-button" @click="undeveloped">系统</div>-->
-              <!--<div class="div-simulate-button" @click="undeveloped">联锁</div>-->
-              <!--<div class="div-simulate-button" @click="trainControlShow">列监</div>-->
-              <!--<div class="div-simulate-button" @click="undeveloped">站控</div>-->
-              <!--<div class="div-simulate-button" @click="undeveloped">车场</div>-->
-              <!--<div class="div-simulate-button" @click="undeveloped">编表</div>-->
-              <!--<div class="div-simulate-button" @click="undeveloped">车辆段</div>-->
-              <div>
-                <div class="div-simulate-button" style="width: 40px;" @click="rpsClick">背投</div>
-                <div class="div-simulate-button" style="width: 40px;">车场</div>
-                <div class="div-simulate-button" style="width: 40px;" @click="troClick">轨道</div>
-                <div class="div-simulate-button" style="width: 40px;">系统</div>
-                <div class="div-simulate-button" style="width: 40px;" @click="traClick">列车</div>
-              </div>
-              <div>
-                <div class="div-simulate-button" style="width: 40px;">联锁</div>
-                <div class="div-simulate-button" style="width: 40px;">列监</div>
-                <div class="div-simulate-button" style="width: 40px;">运图</div>
-                <div class="div-simulate-button" style="width: 55px;" @click="ttlClick">时刻表</div>
-                <div class="div-simulate-button" style="width: 40px;">编表</div>
-                <div class="div-simulate-button" style="width: 40px;">调度</div>
-                <div class="div-simulate-button" style="width: 40px;">站控</div>
-                <div class="div-simulate-button" style="width: 40px;">计划</div>
-              </div>
-              <div>
-                <div class="div-simulate-button" style="width: 40px;">SDM</div>
-              </div>
-              <div>
-                <div class="div-simulate-button" style="width: 55px;">管理员</div>
-                <div class="div-simulate-button" style="width: 40px;">职权</div>
-              </div>
-              <div>
-                <div class="div-simulate-button" style="width: 40px;">拷屏</div>
-                <div class="div-simulate-button" style="width: 40px;">录放</div>
-                <div class="div-simulate-button" style="width: 40px;">布局</div>
-              </div>
-            </div>
-            <!--<el-row class="button-row" style="margin: 10px 0;">-->
-            <!--<div class="div-simulate-button" @click="undeveloped">轨道</div>-->
-            <!--<div class="div-simulate-button" @click="undeveloped">调度</div>-->
-            <!--<div class="div-simulate-button" @click="undeveloped">录放</div>-->
-            <!--<div class="div-simulate-button" @click="undeveloped">管理</div>-->
-            <!--<div class="div-simulate-button" @click="undeveloped">列车信息</div>-->
-            <!--<div class="div-simulate-button" @click="undeveloped">职权</div>-->
-            <!--<div style="width: 80px;" />-->
-            <!--</el-row>-->
-          </div>
-        </el-col>
-        <el-col :span="2">
-          <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;">
-            <el-row style="margin-top: 20px;margin-bottom: 18px;">
-              <el-col :span="16">
-                <el-row class="button-row">
-                  <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelA}" @click="showHimAlarm('A')">A</div>
-                  <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelB}" @click="showHimAlarm('B')">B</div>
-                  <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelC?'#F00':'#DDD' }" @click="showHimAlarm('C')">C</div>
-                  <!--<img :src="voiceIcon" style="width: 40px;height: 40px;" @click="controlAudio(false)">-->
-                </el-row>
-                <el-row class="button-row" style="margin-top: 20px;">
-                  <div style="width: 40px;" class="div-simulate-button" @click="showHimAlarm">报警</div>
-                  <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">运图</div>
-                </el-row>
-              </el-col>
-              <el-col :span="8">
-                <div style="width: 40px;height: 60px;line-height: 60px;" class="div-simulate-button" @click="controlAudio(false)">静音</div>
-              </el-col>
-            </el-row>
-            <el-row class="button-row" style="margin: 10px 0;">
-              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">档案</div>
-              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">归档</div>
-              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">统计</div>
-            </el-row>
-          </div>
-        </el-col>
-        <el-col :span="2" style="border: 2px solid #DDD9CA;border-radius: 1px;">
-          <el-row style="height: 88px;" />
-          <el-row class="button-row" style="margin: 10px 0;">
-            <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">锁屏</div>
-            <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">退出</div>
-          </el-row>
-        </el-col>
-      </el-row>
     </div>
     <alarm-table-low ref="alarmTableLow" />
     <alarm-table-hmi ref="alarmTableHmi" />
@@ -178,7 +75,6 @@
 <script>
 import { mapGetters } from 'vuex';
 import { EventBus } from '@/scripts/event-bus';
-// import { TrainingMode } from '@/scripts/ConstDic';
 import voiceOpen from '@/assets/voiceOpen.png';
 import voiceClose from '@/assets/voiceClose.png';
 import BuzzerAudio from '@/assets/buzzer.mp3';
@@ -186,7 +82,8 @@ import AlarmTableHmi from './menuDialog/alarmTableHmi';
 import AlarmTableLow from './menuDialog/alarmTableLow';
 import TrainControl from './dialog/trainControl';
 import LogDetail from './menuDialog/logDetail';
-
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
 export default {
     name: 'MenuBar',
     components: {
@@ -278,6 +175,9 @@ export default {
         },
         isLogin() {
             return this.isIgnoreLogin || this.loginActive;
+        },
+        mBar() {
+            return OperationEvent.Command.mBar;
         }
     },
     watch: {
@@ -305,6 +205,15 @@ export default {
                 this.checkRoleChange(list);
             }
         },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (val) {
+                this.loginText = '登录';
+                this.inputStr = '';
+                this.keydownTimes = 0;
+                this.modelType = 'text';
+                this.$emit('login', '');
+            }
+        },
         '$store.state.socket.simulationAlarmInfo': function(val) {
             (val || []).forEach(item => {
                 if (!item.confirmed) {
@@ -398,8 +307,8 @@ export default {
             });
             this.colsNum = 24 / this.centralizedStationList1.length;
             if (centralizedStationList.length) {
-                if (this.$store.state.map.showCentralizedStationCode) {
-                    this.stationCode = this.$store.state.map.showCentralizedStationCode;
+                if (this.centralizedMap[this.$store.state.training.roleDeviceCode]) {
+                    this.stationCode = this.centralizedMap[this.$store.state.training.roleDeviceCode];
                 } else {
                     this.stationCode = centralizedStationList[0].code;
                 }
@@ -407,8 +316,13 @@ export default {
         },
         switchShowStation(stationCode) {
             this.stationCode = stationCode;
-            this.$store.dispatch('map/setShowCentralizedStationNum');
-            this.$store.dispatch('map/setShowCentralizedStationCode', stationCode);
+            const member = this.$store.state.training.memberList.find(member => member.type === 'STATION_SUPERVISOR' && member.deviceCode === stationCode);
+            const data = [{userId: this.userId, memberId:member.id}];
+            assignUsersPlayRoles(data, this.$route.query.group).then(() => {
+                console.log('切换角色!');
+            }).catch(e => {
+                this.$message.error('切换车站失败！');
+            });
         },
         undeveloped() {
             this.doClose();
@@ -422,40 +336,62 @@ export default {
             this.$refs.logDetail.doShow();
         },
         login() {
-            const mapText = {
-                '注销': '登录',
-                '登录': '名称'
+            const operate = {
+                start: true,
+                operation: this.mBar.loginButton.operation
             };
-            this.loginText = mapText[this.loginText] || this.loginText;
-            this.inputStr = '';
-            this.$emit('login', '');
-        },
-        validateData() {
-            if (this.keydownTimes === 0) {
-                const station = this.stationList.filter(el => el.centralized).find(el => el.depot ? false : el.jp == this.inputStr );
-                if (station) {
-                    this.loginText = '密码';
-                    this.modelType = 'password';
+            this.$store.dispatch('trainingNew/next', operate).then(valid => {
+                if (valid) {
+                    const mapText = {
+                        '注销': '登录',
+                        '登录': '名称'
+                    };
+                    this.loginText = mapText[this.loginText] || this.loginText;
                     this.inputStr = '';
                     this.$emit('login', '');
-                    this.keydownTimes++;
-                    this.station = station;
-                } else {
-                    EventBus.$emit('sendMsg', {message: '登录名称错误！'});
                 }
-            } else if (this.keydownTimes === 1) {
-                if (this.inputStr == '1') {
-                    this.loginText = '注销';
-                    this.keydownTimes = 0;
-                    this.modelType = 'text';
-                    this.inputStr = this.station.jp;
-                    this.$emit('login', this.inputStr);
-                    EventBus.$emit('switchStationMode', this.station.code);
-                    EventBus.$emit('sendMsg', {message: `${this.inputStr} 登录成功！`});
-                } else {
-                    EventBus.$emit('sendMsg', {message: '密码错误！'});
+            });
+        },
+        validateData() {
+            const operate = {
+                operation: this.mBar.loginInput.operation,
+                param: {
+                    inputStr: this.inputStr,
+                    keydownTimes: this.keydownTimes
                 }
+            };
+            if (this.keydownTimes === 1) {
+                operate.cancel = true;
             }
+            this.$store.dispatch('trainingNew/next', operate).then(valid => {
+                if (valid) {
+                    if (this.keydownTimes === 0) {
+                        const station = this.stationList.filter(el => el.centralized).find(el => el.depot ? false : el.jp == this.inputStr );
+                        if (station) {
+                            this.loginText = '密码';
+                            this.modelType = 'password';
+                            this.inputStr = '';
+                            this.$emit('login', '');
+                            this.keydownTimes++;
+                            this.station = station;
+                        } else {
+                            EventBus.$emit('sendMsg', {message: '登录名称错误！'});
+                        }
+                    } else if (this.keydownTimes === 1) {
+                        if (this.inputStr == '1') {
+                            this.loginText = '注销';
+                            this.keydownTimes = 0;
+                            this.modelType = 'text';
+                            this.inputStr = this.station.jp;
+                            this.$emit('login', this.inputStr);
+                            EventBus.$emit('switchStationMode', this.station.code);
+                            EventBus.$emit('sendMsg', {message: `${this.inputStr} 登录成功！`});
+                        } else {
+                            EventBus.$emit('sendMsg', {message: '密码错误！'});
+                        }
+                    }
+                }
+            });
         },
         doClose() {
             this.$nextTick(() => {
@@ -506,269 +442,269 @@ export default {
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $width: 30px;
-    $height: 90px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 190px;
-    $menuItemPadding: 5px;
+@import "src/styles/mixin.scss";
+$width: 30px;
+$height: 90px;
+$menuPadding: 10px;
+$menuItemHeight: 30px;
+$menuItemWidth: 190px;
+$menuItemPadding: 5px;
 
-    #menuBar {
-        z-index: 37;
-        position: absolute;
-        width: inherit;
-    }
+#menuBar {
+	z-index: 37;
+	position: absolute;
+	width: inherit;
+}
 
-	.login {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
+.login {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.nav-border {
+	font-size: 12px;
+	color: #000;
+	text-align: center;
+	line-height: 45px;
+	border-top: 2px solid #7E8076;
+	border-left: 2px solid #6A6B64;
+	border-right: 2px solid #FBFBFA;
+	border-bottom: 2px solid #FBFBFA;
+}
+.nav {
+	display: block;
+	cursor: pointer;
+	color: #0000;
+	background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+	background: linear-gradient(#FDFDFE, #DEE3F3);
+	border: 1px solid #B6BCCC !important;
+	border-bottom: 2px solid #B6BCCC !important;
+	list-style: none;
+}
+
+.nav-li {
+	position: relative;
+	display: inline-block;
+	padding-left: $menuPadding;
+	padding-right: $menuPadding;
+}
+
+.nav-li:active {
+	background: #C9D0E1;
+	border-radius: 1px;
+}
+
+.nav-li-text {
+	font-size: 13px;
+	color: #000;
+	text-align: center;
+	text-decoration: none;
+}
+
+.nav-ul {
+	display: none;
+	position: absolute;
+	list-style: none;
+	border: 1px solid gray !important;
+	line-height: $menuItemHeight;
+	width: $menuItemWidth;
+	padding: 0px;
+	margin: 0px;
+}
+
+.menu-ul {
+	display: none;
+	list-style: none;
+	background: #F0F0F0;
+	line-height: $menuItemHeight;
+	width: $menuItemWidth;
+	bottom: $menuItemHeight;
+}
+
+.active {
+	position: absolute;
+	display: block !important;
+}
+
+.menu-ul-text {
+	font-size: 14px;
+	color: #000;
+	letter-spacing: 0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li {
+	text-align: left;
+	background: #F0F0F0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li-block {
+	display: flex;
+	letter-spacing: 0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li-text {
+	font-size: 14px;
+	color: #000;
+}
+
+.menu-li-text .status {
+	display: block;
+	float: left;
+	border-right: 1px inset #CACACA;
+	width: $width;
+}
+
+.menu-li-text .label {
+	display: block;
+	float: left;
+}
+
+.menu-li-block:hover {
+	background: #C9DEF7;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+}
+.fake-button{
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	border-radius: 1px !important;
+	color: #000;
+	background: #DDD;
+	margin: 5px auto;
+}
+
+.fake-button-disabled {
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F !important;
+	font-size: 12px;
+	border-radius: 1px !important;
+	color: #8f8f8f !important;
+	background: #DDD im !important;
+	margin: 5px auto;
+	cursor: not-allowed;
+	&:hover {
+		color: #8f8f8f !important;
+		background: #DDD im !important;
 	}
-    .nav-border {
-        font-size: 12px;
-        color: #000;
-        text-align: center;
-		line-height: 45px;
-        border-top: 2px solid #7E8076;
-        border-left: 2px solid #6A6B64;
-        border-right: 2px solid #FBFBFA;
-        border-bottom: 2px solid #FBFBFA;
-    }
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
-        background: linear-gradient(#FDFDFE, #DEE3F3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-    }
+	&:disabled {
+		color: #8f8f8f !important;
+		background: #DDD im !important;
+	}
+}
 
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
+.fake-button-active{
+	height: 20px;
+	line-height: 20px;
+	padding: 0px;
+	width: 80px;
+	border: 1px solid #1F313F;
+	font-size: 12px;
+	&.el-button {
+		border-radius: 1px !important;
+		background: #ECF5FF !important;
+		color: #70B6FF !important;
+	}
+	margin: 5px auto;
+}
 
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 1px;
-    }
+.loginClass{
+	width: 100px;
+	height: 20px;
+	text-align: center;
+	border: 1px solid rgb(204, 204, 204);
+	line-height: 20px;
+	margin: 5px auto;
+	border-radius: 1px;
+	background: #DDD;
+	cursor: not-allowed;
+}
+.div-simulate-button{
+	height: 20px;
+	line-height: 20px;
+	display: inline-block;
+	font-size: 14px;
+	color: #303030;
+	border: 1px solid #44556D;
+	background: #DDD;
+	text-align: center;
+	border-radius: 1px;
+	width: 80px;
+}
+.tip-content-box{
+	height: 30px;
+	width: 100%;
+	line-height: 30px;
+	background: #001528;
+	color: #C20F29;
+	font-size: 14px;
+	display: flex;
+	justify-content: space-around;
+}
+.button-row{
+	height: 20px;
+	line-height: 20px;
+	display: flex;
+	justify-content:space-between;
+}
+@keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.4;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
 
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
+@-webkit-keyframes fade {
+	from {
+		opacity: 1.0;
+	}
+	50% {
+		opacity: 0.4;
+	}
+	to {
+		opacity: 1.0;
+	}
+}
 
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray !important;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-    }
+.headerBox {
+	background: #f00;
+	animation: fade 600ms infinite;
+	-webkit-animation: fade 600ms infinite;
+}
 
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        display: flex;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: block;
-		float: left;
-        border-right: 1px inset #CACACA;
-        width: $width;
-    }
-
-    .menu-li-text .label {
-        display: block;
-		float: left;
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-    .fake-button{
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-        border-radius: 1px !important;
-        color: #000;
-        background: #DDD;
-        margin: 5px auto;
-    }
-
-	.fake-button-disabled {
-		height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F !important;
-        font-size: 12px;
-        border-radius: 1px !important;
-        color: #8f8f8f !important;
-        background: #DDD im !important;
-        margin: 5px auto;
+.nav-border .el-button {
+	background: #DDDDDD;
+	border: 1px solid #000 !important;
+	cursor: pointer;
+	&.disabled {
 		cursor: not-allowed;
-		&:hover {
-			color: #8f8f8f !important;
-			background: #DDD im !important;
-		}
-		&:disabled {
-			color: #8f8f8f !important;
-			background: #DDD im !important;
-		}
+		border: 1px solid #D0CEC5 !important;
+		/*background: #DDDDDD !important;*/
+		color: #a0a0a0!important;
 	}
-
-    .fake-button-active{
-        height: 20px;
-        line-height: 20px;
-        padding: 0px;
-        width: 80px;
-        border: 1px solid #1F313F;
-        font-size: 12px;
-		&.el-button {
-			border-radius: 1px !important;
-			background: #ECF5FF !important;
-			color: #70B6FF !important;
-		}
-        margin: 5px auto;
-    }
-
-    .loginClass{
-        width: 100px;
-        height: 20px;
-        text-align: center;
-        border: 1px solid rgb(204, 204, 204);
-        line-height: 20px;
-        margin: 5px auto;
-        border-radius: 1px;
-        background: #DDD;
-        cursor: not-allowed;
-    }
-	.div-simulate-button{
-		height: 20px;
-		line-height: 20px;
-		display: inline-block;
-		font-size: 14px;
-		color: #303030;
-		border: 1px solid #44556D;
-		background: #DDD;
-		text-align: center;
-		border-radius: 1px;
-		width: 80px;
-	}
-	.tip-content-box{
-		height: 30px;
-		width: 100%;
-		line-height: 30px;
-		background: #001528;
-		color: #C20F29;
-		font-size: 14px;
-		display: flex;
-		justify-content: space-around;
-	}
-	.button-row{
-		height: 20px;
-		line-height: 20px;
-		display: flex;
-		justify-content:space-between;
-	}
-	@keyframes fade {
-		from {
-			opacity: 1.0;
-		}
-		50% {
-			opacity: 0.4;
-		}
-		to {
-			opacity: 1.0;
-		}
-	}
-
-	@-webkit-keyframes fade {
-		from {
-			opacity: 1.0;
-		}
-		50% {
-			opacity: 0.4;
-		}
-		to {
-			opacity: 1.0;
-		}
-	}
-
-	.headerBox {
-		background: #f00;
-		animation: fade 600ms infinite;
-		-webkit-animation: fade 600ms infinite;
-	}
-
-	.nav-border .el-button {
-		background: #DDDDDD;
-		border: 1px solid #000 !important;
-		cursor: pointer;
-		&.disabled {
-			cursor: not-allowed;
-			border: 1px solid #D0CEC5 !important;
-			/*background: #DDDDDD !important;*/
-			color: #a0a0a0!important;
-		}
-		&:hover, &.active{
-			background: #eeeeee;
-		}
+	&:hover, &.active{
+		background: #eeeeee;
 	}
+}
 </style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
similarity index 69%
rename from src/jmapNew/theme/nanjing_02/menus/menuButton.vue
rename to src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
index ad5c45d87..a2e6cd6b6 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuButton.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="haerbin-01__systerm">
-    <div v-if="isLocal" id="menuButton">
+    <div id="menuButton">
       <div class="__menuButton">
         <el-row>
           <el-col v-if="operationType === 'cmd'" :span="11">
@@ -170,100 +170,6 @@
         </el-row>
       </div>
     </div>
-    <div v-else>
-      <el-dialog
-        v-dialogDrag
-        class="haerbin-01__systerm __menuButton"
-        style="pointer-events: none"
-        title="Dialog"
-        z-index="2008"
-        :visible.sync="dialogVisible"
-        :modal="false"
-        :close-on-click-modal="false"
-        width="30%"
-        append-to-body
-        :before-close="handleClose"
-      >
-        <div style="margin-bottom: 30px">
-          <template v-if="secondConfirm">
-            <el-row>
-              <div style="display: flex;justify-content: space-between;margin: 10px 3px">
-                <el-button :id="cr1ConfrimId" class="fl" :class="{'disabled': cr1Confrim}" style="line-height: 18px; margin-top: 4px;" :disabled="cr1Confrim" plain @click="clickCr1Confirm">CR1</el-button>
-                <el-button :id="cr2ConfirmId" class="fr" :class="{'disabled': !cr1Confrim}" style="line-height: 18px; margin-top: 4px;" :disabled="!cr1Confrim" plain @click="clickCr2Confirm">CR2</el-button>
-              </div>
-            </el-row>
-            <el-row>
-              <el-col :span="5">
-                <img :src="banIcon" class="ban-img">
-              </el-col>
-              <el-col :span="19">
-                <div style="display: flex;justify-content: flex-start;margin-top: 10px;">
-                  <div style="height: 10px;width: 70px;background-color: #F00;" />
-                  <div style="height: 10px;width: 70px;background-color: #0F0;margin-left: 40px;" />
-                  <div style="height: 10px;width: 70px;background-color: #00F;margin-left: 40px;" />
-                </div>
-                <div class="color-strip-container" style="">
-                  <div style="height: 10px;width: 70px;background-color: #F00;" />
-                  <div style="height: 10px;width: 70px;background-color: #0F0;margin-left: 40px;" />
-                  <div style="height: 10px;width: 70px;background-color: #00F;margin-left: 40px;" />
-                </div>
-              </el-col>
-            </el-row>
-          </template>
-          <template v-else>
-            <el-row style="text-align: center">
-              <template v-for="(item, index) in menuCmdList">
-                <div :key="index" class="nav-border-row row-width-box flex-row">
-                  <div v-if="item.name && (item.disabled || !item.cmdType)" :id="item.operate.domId" class="fake-button-disabled">{{ item.name }}</div>
-                  <div v-else-if="item.name && item.securityCommand" :id="item.operate.domId" :class="[isLogin ? 'fake-button-active': 'fake-button-disabled']" @click="interceptLogin(clickCommand)(item, index)">{{ item.name }}</div>
-                  <div v-else-if="item.name && !item.securityCommand" :id="item.operate.domId" :class="[isLogin ? 'fake-button': 'fake-button-disabled']" @click="interceptLogin(clickCommand)(item, index)">{{ item.name }}</div>
-                  <div v-else class="fake-button-grayk" />
-                </div>
-              </template>
-            </el-row>
-          </template>
-        </div>
-        <div class="separator">
-          <el-button :id="commandId" class="fl" :class="{'disabled': !isLogin || canCommand || secondConfirm}" style="line-height: 18px; margin-top: 4px;" plain :disabled="!isLogin || canCommand || secondConfirm" @click="interceptLogin(command)()">执行</el-button>
-          <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain :class="{'disabled': !isLogin}" :disabled="!isLogin" @click="interceptLogin(cancle)()">取消</el-button>
-          <el-button class="fr" style="line-height: 18px; margin-top: 4px;" plain @click="handleClose">关闭</el-button>
-        </div>
-      </el-dialog>
-      <el-dialog
-        v-dialogDrag
-        class="haerbin-01__systerm __menuButton"
-        style="pointer-events: none"
-        title="IBP"
-        z-index="2008"
-        :visible.sync="stationDialogVisible"
-        :modal="false"
-        append-to-body
-        :close-on-click-modal="false"
-        width="30%"
-        :before-close="handleStationClose"
-      >
-        <div class="station_buttonGroup">
-          <div class="station_buttonGroupL">
-            <div v-if="allowDetain" :id="setDetainTrainId" class="stationButton" @click="stationDetainTrain">此站扣车</div>
-            <div v-else class="stationButton disabled">此站扣车</div>
-            <div v-if="allowJump" :id="setBulkBuckleTrainId" class="stationButton station_jumpTrain" @click="stationAllJumpTrain">连续扣车</div>
-            <div v-else class="stationButton station_jumpTrain disabled">连续扣车</div>
-          </div>
-          <div class="station_buttonGroupR">
-            <div v-if="allowCancle" :id="cancelTrainId" class="stationButton" @click="stationCancleTrain">恢复原状</div>
-            <div v-else class="stationButton disabled">恢复原状</div>
-            <div v-if="allowJump" :id="setJumpStopId" class="stationButton station_jumpTrain" @click="stationJumpTrain">此站不停</div>
-            <div v-else class="stationButton station_jumpTrain disabled">此站不停</div>
-          </div>
-        </div>
-        <div class="station_line">{{ getTrackSection() }}</div>
-        <div class="station_commandGroup">
-          <el-button plain class="station_updateStatus">更新</el-button>
-          <el-button plain class="station_close" @click="handleStationClose">关闭</el-button>
-          <el-button :id="commandId" plain class="station_command" :class="{'disabled': isAllowCommand}" :disabled="isAllowCommand" @click="stationToCommand">执行</el-button>
-        </div>
-      </el-dialog>
-    </div>
     <div v-if="rightClickDialogVisible" style="position: fixed;z-index: 2;background-color: rgba(44,170,170,0.5);" :style="{top: menuPosition.y + 'px', left:menuPosition.x + 'px'}">
       <el-row style="text-align: center; width: 500px;">
         <template v-for="(item, index) in menuCmdList">
@@ -292,6 +198,7 @@ import { queryRunPlanList } from '@/api/runplan';
 import { simulationLoadRunPlan } from '@/api/simulation';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import * as _ from 'lodash';
+import {judgeStationControl} from '../../components/utils/menuJudge';
 
 export default {
     components: {
@@ -364,10 +271,8 @@ export default {
             formModelNewGroup: '',
             trainOperateType: '',
             formModelNewSection: '',
-            dialogVisible: false,
             tipList: [],
             modeMatch: false,
-            stationDialogVisible:false,
             rightClickDialogVisible: false,
             isAllowCommand:true,
             allowDetain:true,
@@ -427,13 +332,10 @@ export default {
             return OperationEvent.Command.commandHaerbin.confrimCr2.domId;
         },
         stationContorl() {
-            return this.getStationControl(this.currentSelected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {};
-        },
-        isLocal() {
-            return this.$store.state.training.prdType == '01';
+            return this.getStationControl(this.currentSelected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.training.roleDeviceCode}) || {};
         },
         isLogin() {
-            return this.isIgnoreLogin || (this.isLocal ? this.loginActive && this.checkBelongCentralizedStationByInputStr(this.inputStr) : true);
+            return this.isIgnoreLogin || (this.loginActive && this.checkBelongCentralizedStationByInputStr(this.inputStr));
         },
         menuPosition() {
             return this.$store.state.menuOperation.menuPosition;
@@ -460,10 +362,6 @@ export default {
         }
     },
     watch: {
-        '$store.state.training.prdType': function (val) {
-            this.operationType = 'cmd';
-            this.initMenus();
-        },
         '$store.state.training.started':function (val) {
             if (!val) {
                 this.doClose();
@@ -475,9 +373,9 @@ export default {
             this.selectedObj = this.actualSelected;
             this.currentSelected = val;
             this.rightClickDialogVisible = false;
-            if (this.selectedObj._type && (val._event == MouseEvent.Left || (val._event == MouseEvent.Right && this.$store.state.training.prdType === '01'))) {
-                const type = this.State2SimulationMap[this.$store.state.training.prdType];
-                this.modeMatch = this.stationContorl.controlMode == type;
+            if (this.selectedObj._type && (val._event == MouseEvent.Left || val._event == MouseEvent.Right)) {
+                const [stationCode, centralStationCode] = this.getStationCodes(this.currentSelected);
+                this.modeMatch = judgeStationControl(stationCode, centralStationCode, 'localWork');
                 // 道岔区段  是道岔操作
                 if (this.selectedObj._type == 'Section' && this.selectedObj.type == '03') {
                     this.selectedObj = this.selectedObj.switch;
@@ -488,7 +386,7 @@ export default {
                     code: this.selected.code,
                     subType:this.$store.state.menuOperation.subType
                 };
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) { this.handleDeviceMenu(); }
                 }).catch((error) => {
                     console.error(error);
@@ -498,21 +396,17 @@ export default {
                         EventBus.$emit('sendMsg', {message: '命令执行失败！'});
                     }
                 });
-                if (val._type !== 'Psd' && val._type !== 'StationStand' && val._type !== 'Train') {
-                    this.dialogVisible = !this.isLocal;
-                }
                 this.handleIbpShow();
             } else {
                 const step = {
                     operation: 'click',
-                    code: '',
+                    code: this.$store.state.training.roleDeviceCode,
                     subType:this.$store.state.menuOperation.subType
                 };
 
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) {
                         this.handleBasicMenu();
-                        this.dialogVisible = false;
                     }
                 }).catch((error) => {
                     console.error(error);
@@ -525,7 +419,7 @@ export default {
 
             }
         },
-        '$store.state.map.showCentralizedStationCode': function(val) {
+        '$store.state.training.roleDeviceCode': function(val) {
             this.cancle();
             if (!this.oldSelected) {
                 this.handleBasicMenu();
@@ -533,10 +427,6 @@ export default {
         },
         '$store.state.map.mapStationStateUpdateCount': function() {
             this.initCentralizedStationList([...this.menuCmdList]);
-        },
-        '$store.state.training.steps': function(steps) {
-            this.initTrainingStation(steps);
-            this.handleBasicMenu();
         }
     },
     mounted() {
@@ -557,14 +447,35 @@ export default {
         });
     },
     methods: {
-        initTrainingStation(steps) {
-            if (steps && steps.length) {
-                const code = steps[0].code;
-                this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
-                if (this.stationObj) {
-                    this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
+        getStationCodes(selected) {
+            let stationCode = '';
+            let centralStationCode = '';
+            if (selected._type === 'StationStand') {
+                stationCode = selected.stationCode;
+                centralStationCode = selected.deviceStationCode;
+            } else if (selected._type === 'Station') {
+                stationCode = selected.code;
+                centralStationCode = selected.stationCode;
+            } else if (selected._type === 'Train') { // 车次窗单独处理
+                if (selected.sectionCode) {
+                    const section = this.$store.getters['map/getDeviceByCode'](selected.sectionCode);
+                    stationCode = section.belongStation;
+                    centralStationCode = section.stationCode;
                 }
+            } else if (selected._type === 'TrainWindow') {
+                const section = this.sectionList.find(elem => elem.trainWindowSectionCode === selected.code);
+                if (section) {
+                    stationCode = section.belongStation;
+                    centralStationCode = section.stationCode;
+                }
+            } else if (selected._type === 'Section') {
+                stationCode = selected.belongStation;
+                centralStationCode = selected.stationCode;
+            } else if (selected._type === 'Switch' || selected._type === 'Signal') {
+                stationCode = selected.belongStationCode;
+                centralStationCode = selected.stationCode;
             }
+            return [stationCode, centralStationCode];
         },
         handleTrainOperate(type) {
             this.trainOperateType = type;
@@ -683,7 +594,6 @@ export default {
                         this.allowJump = false;
                     }
                 }
-                this.stationDialogVisible = true;
             }
         },
         getStationControl(selected = {}) {
@@ -789,7 +699,7 @@ export default {
             EventBus.$emit('sendMsg', {message: this.selectedObj.name});
         },
         handleBasicMenu() {
-            this.stationObj = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            this.stationObj = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode);
             this.deviceHighLight(this.oldDevice, false);
             if (this.oldClickObj) {
                 this.deviceHighLight(this.oldClickObj, false);
@@ -799,8 +709,8 @@ export default {
             this.initCentralizedStationList(this.basicParamList, this.stationObj);
 
             this.param = {
-                stationCode: this.$store.state.map.showCentralizedStationCode,
-                stationCodes: [this.$store.state.map.showCentralizedStationCode]
+                stationCode: this.$store.state.training.roleDeviceCode,
+                stationCodes: [this.$store.state.training.roleDeviceCode]
             };
 
             EventBus.$emit('sendMsg', { message: this.stationObj ? this.stationObj.name : '' });
@@ -812,12 +722,6 @@ export default {
             EventBus.$emit('sendMsg', {message: this.selectedObj.name});
         },
         handleStandMenu() {
-            if (this.$store.state.training.prdType === '02') {
-                this.deviceHighLight(this.oldDevice, false);
-                this.deviceHighLight(this.selectedObj, true);
-                this.oldDevice = this.selectedObj;
-            }
-
             this.initCentralizedStationList(this.standParamList);
             const data = Object.assign(this.selectedObj);
             const station = this.$store.getters['map/getDeviceByCode'](this.selectedObj.stationCode);
@@ -909,7 +813,7 @@ export default {
 
             if (this.cmdType == CMD.Section.CMD_SECTION_SET_LIMIT_SPEED || this.cmdType == CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED) {
                 if (this.operate == OperationEvent.Section.setSpeed.menuButton.operation ||
-                    this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) {
+					this.operate == OperationEvent.Switch.setSpeed.menuButton.operation) {
                     this.canCommand = true;
                 }
                 let tip = '';
@@ -970,17 +874,17 @@ export default {
                     step.val = row.name;
                 }
 
-                if (row.fillStationCode) {
-                    const station = this.stationObj || {};
-                    step.code = station.code;
-                }
+                // if (row.fillStationCode) {
+                //     const station = this.stationObj || {};
+                //     step.code = station.code;
+                // }
 
                 if (row.param) {
                     this.param = row.param;
                 }
 
                 step.param = this.param;
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) {
                         this.checkConfirmParam(row);
                         this.securityCommand = row.securityCommand || row.next;
@@ -1008,7 +912,7 @@ export default {
             }
 
             EventBus.$emit('sendMsg', {});
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid && this.securityCommand) {
                     this.secondConfirm = true;
                     const that = this;
@@ -1025,10 +929,8 @@ export default {
                 this.handleClose();
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`);
                 }
             });
         },
@@ -1038,7 +940,7 @@ export default {
                 operation: OperationEvent.Command.commandHaerbin.confrimCr1.operation
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.cr1Confrim = true;
                     const that = this;
@@ -1049,10 +951,8 @@ export default {
             }).catch((error) => {
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: '命令执行失败！'});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow('命令执行失败！');
                 }
                 this.doClose();
             });
@@ -1065,7 +965,7 @@ export default {
                 operation: OperationEvent.Command.commandHaerbin.confrimCr2.operation
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                     this.handleDeviceMenu();
@@ -1078,10 +978,8 @@ export default {
                 this.handleClose();
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(`${this.commandInfo.name}失败`);
                 }
             });
         },
@@ -1091,8 +989,16 @@ export default {
         cancle() {
             EventBus.$emit('sendMsg', {});
             if (this.$store.state.training.mode != TrainingMode.TEACH) {
-                clearTimeout(this.timer);
-                this.doClose();
+                const operate = {
+                    cancel: true,
+                    operation: ''
+                };
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        clearTimeout(this.timer);
+                        this.doClose();
+                    }
+                });
             }
         },
         doClose() {
@@ -1103,7 +1009,6 @@ export default {
             this.securityCommand = '';
             this.speedLimitValue = '';
             this.secondConfirm = false;
-            this.dialogVisible = false;
             this.overlap = null;
             this.cr1Confrim = false;
             if (this.oldClickObj) {
@@ -1113,18 +1018,13 @@ export default {
             this.canCommand = true; // 执行变为禁用
             this.oldClickObj = null; // 清空上次点击信号机
         },
-        handleOpen() {
-            this.dialogVisible = true;
-        },
         handleClose() {
             this.secondConfirm = false;
-            this.dialogVisible = false;
         },
         handleStationClose() {
             this.cmdType = '';
             this.operate = ''; // 清空指令
             this.isAllowCommand = true;
-            this.stationDialogVisible = false;
             this.allowJump = true;
             this.allowCancle = true;
             this.allowDetain = true;
@@ -1153,16 +1053,14 @@ export default {
             });
         },
         changeShowMode(type) {
-            if (this.$store.state.training.prdType === '01') {
-                this.trainModel = {};
-                this.formModelTripNum = '';
-                this.formModelSectionName = '';
-                this.formModelNewTrip = '';
-                this.formModelNewGroup = '';
-                this.trainOperateType = '';
-                this.operationType = type;
-                this.formModelNewSection = '';
-            }
+            this.trainModel = {};
+            this.formModelTripNum = '';
+            this.formModelSectionName = '';
+            this.formModelNewTrip = '';
+            this.formModelNewGroup = '';
+            this.trainOperateType = '';
+            this.operationType = type;
+            this.formModelNewSection = '';
         },
         trainCommit() {
             const params = {};
@@ -1197,7 +1095,7 @@ export default {
                 step.operation = OperationEvent.Train.moveTrainId.menu.operation;
                 step.param = params;
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.changeShowMode('train');
@@ -1205,10 +1103,8 @@ export default {
             }).catch((error) => {
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: '命令执行失败！'});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow('命令执行失败！');
                 }
             });
         },
@@ -1218,7 +1114,7 @@ export default {
                 over:true,
                 cmdType:this.cmdType
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.handleStationClose();
                 }
@@ -1227,10 +1123,8 @@ export default {
                 this.handleStationClose();
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: '命令执行失败！'});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow('命令执行失败！');
                 }
             });
         },
@@ -1241,7 +1135,7 @@ export default {
             step.start = true;
             step.param = row.param || {'standCode':this.selectedObj.code};
             this.cmdType = row.cmdType;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.isAllowCommand = false;
                 } else if (valid) {
@@ -1250,10 +1144,8 @@ export default {
             }).catch((error) => {
                 if (error && error.code == '10017') {
                     EventBus.$emit('sendMsg', {message: error.message});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow(error.message);
                 } else {
                     EventBus.$emit('sendMsg', {message: '命令执行失败！'});
-                    this.$store.state.training.prdType === '02' && this.$refs.noticeInfo.doShow('命令执行失败！');
                 }
             });
         },
@@ -1305,7 +1197,7 @@ export default {
             return device && device.interlockMachineStarting;
         },
         initMenus() {
-            this.basicParamList = this.$store.state.training.prdType === '01' ? [
+            this.basicParamList = [
                 { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
                 { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
                 { name: '释放指令', commandTip: '释放指令', cmdType: CMD.Station.CMD_STATION_RELEASE, operate: OperationEvent.Station.stationRelease.menuButton, securityCommand: true, fillStationCode: true, disabledCb: (stationControl, device) => ['Center', 'None'].includes(stationControl.controlMode) },
@@ -1321,59 +1213,33 @@ export default {
                 { name: '' },
                 { name: '' },
                 { name: '关闭索引', cmdType: '', operate: OperationEvent.StationControl.requestCentralControl.menuButton, fillStationCode: true, disabledCb: (stationControl) => ['None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) }
-            ] : [
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' },
-                { name: '' }
             ];
             this.sectionParamList = this.selected && this.selected.type == '05' ? [
-                { name: '岔心设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '岔心消限', commandTip: '取消对岔心的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '强行消限', commandTip: '强行取消对岔心的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '预复位', commandTip: '预重置岔心', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '岔心设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '岔心消限', commandTip: '取消对岔心的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '强行消限', commandTip: '强行取消对岔心的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '预复位', commandTip: '预重置岔心', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
                 { name: '封锁岔心', commandTip: '封锁岔心', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '解封岔心', commandTip: '解封岔心', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '强解岔心', commandTip: '强解岔心', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' }
+                { name: '解封岔心', commandTip: '解封岔心', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '强解岔心', commandTip: '强解岔心', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true }
             ] : [
-                { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '轨区消限', commandTip: '取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
-                { name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '轨区设限', cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED, operate: OperationEvent.Section.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '轨区消限', commandTip: '取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, operate: OperationEvent.Section.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '强解区段', commandTip: '解锁进路中的轨道区段', cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK, operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
+                { name: '预复位', commandTip: '预重置计轴区段', cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET, operate: OperationEvent.Section.axlePreReset.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
                 { name: '封锁区段', commandTip: '禁止通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_BLOCK, operate: OperationEvent.Section.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => this.$store.state.training.prdType == '01' },
+                { name: '解封区段', commandTip: '允许通过该轨道区段排列进路', cmdType: CMD.Section.CMD_SECTION_UNBLOCK, operate: OperationEvent.Section.unlock.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: () => true },
 
-                { name: '上行不折返', commandTip: '上行不折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp01, params: {val: 'NONE'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '下行不折返', commandTip: '下行不折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown01, params: {val: 'NONE'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '上行缺省折返', commandTip: '上行缺省折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp02, params: {val: 'DEFAULT'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '下行缺省折返', commandTip: '下行缺省折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown02, params: {val: 'DEFAULT'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '上行换端', commandTip: '上行换端', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp03, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '下行换端', commandTip: '下行换端', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown03, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '上行自动折返', commandTip: '上行自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnUp04, params: {val: 'UNMANNED'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '下行自动折返', commandTip: '下行自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.setBackStrategy.menuBtnDown04, params: {val: 'UNMANNED'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '02' },
-                { name: '车站发车', commandTip: '车站发车', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.earlyDeparture.menuBtn, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '02' },
-
-                { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.turnBackDTO.menuButton, params: {val: 'UNMANNED'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' },
-                { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.CancelTurnBack.menuButton, params: {val: 'NONE'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' },
-                { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack && this.$store.state.training.prdType == '01' },
-                { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
-                { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
-                { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutStop.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' },
-                { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutStop.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack && this.$store.state.training.prdType == '01' }
+                { name: '折返 DTO', commandTip: '折返 DTO', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.turnBackDTO.menuButton, params: {val: 'UNMANNED'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack },
+                { name: '取消折返', commandTip: '取消折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.CancelTurnBack.menuButton, params: {val: 'NONE'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack },
+                { name: '自动折返', commandTip: '自动折返', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.AutoTurnBack.menuButton, params: {val: 'DEFAULT'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && section.standTrack },
+                { name: '换上至下', commandTip: '换上至下', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutUpTheDown.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '换下至上', commandTip: '换下至上', cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY, operate: OperationEvent.Section.PutDownTheUp.menuButton, params: {val: 'AUTO'}, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '终止站停-上', commandTip: '上行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutStop.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'RIGHT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'LEFT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack },
+                { name: '终止站停-下', commandTip: '下行终止站停', cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART, operate: OperationEvent.Section.PutStop.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code), isShow: (section) => section && ((section.roadType === 'LEFT' && this.$store.state.map.mapConfig.upRight) || (section.roadType === 'RIGHT' && !this.$store.state.map.mapConfig.upRight)) && section.standTrack }
             ];
-            this.switchParamList = this.$store.state.training.prdType === '01' ? [
+            this.switchParamList = [
                 { name: '岔区设限', cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED, operate: OperationEvent.Switch.setSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch},
                 { name: '岔区消限', commandTip: '取消对道岔区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
                 { name: '转换道岔', commandTip: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.turnout.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
@@ -1386,13 +1252,9 @@ export default {
                 { name: '封锁道岔', commandTip: '禁止通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
                 { name: '解封道岔', commandTip: '允许通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
                 { name: '强行消限', commandTip: '强行取消对轨道区段的限速', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.forceCancelSpeed.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
-            ] : [
-                { name: '单独锁定', commandTip: '锁定道岔，阻止转换', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '转换道岔', commandTip: '转换道岔', cmdType: CMD.Switch.CMD_SWITCH_TURN, operate: OperationEvent.Switch.turnout.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '封锁道岔', commandTip: '禁止通过道岔区段排列进路', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
             ];
 
-            this.signalParamList = this.$store.state.training.prdType === '01' ? [
+            this.signalParamList = [
                 { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
                 { name: '封锁信号', commandTip: '封锁信号机，禁止开放', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
                 { name: '开放信号', commandTip: '设置信号机为开放状态', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
@@ -1409,36 +1271,9 @@ export default {
 
                 { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
                 { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
-            ] : [
-                { name: '关闭信号', commandTip: '设置信号机为关闭状态', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '封锁信号', commandTip: '封锁信号机，禁止开放', cmdType: CMD.Signal.CMD_SIGNAL_BLOCK, operate: OperationEvent.Signal.lock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '开放信号', commandTip: '设置信号机为开放状态', cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL, operate: OperationEvent.Signal.reopenSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                // { name: '解封信号', commandTip: '解封信号机，允许开放', cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK, operate: OperationEvent.Signal.unlock.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
-
-                { name: '自排单开', commandTip: '设置单架信号机处于ATS自动排列进路模式', cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING, operate: OperationEvent.Signal.atsAutoControl.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },	// || stationControl.atsControl
-                { name: '自排单关', commandTip: '取消单架信号机处于ATS自动排列进路模式', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, operate: OperationEvent.Signal.humanControl.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }, //  || !stationControl.atsControl
-                { name: '追踪单开', commandTip: '设置单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.setAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }, //  || stationControl.ciControl
-                { name: '追踪单关', commandTip: '取消单架信号机处于联锁自动排列进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Signal.cancelAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }, // || !stationControl.ciControl
-                { name: '设置保护', commandTip: '设置保护', cmdType: CMD.Signal.CMD_SIGNAL_SET_OVERLAP, operate: OperationEvent.Signal.setOverlap.menuButton, disabledCb: (stationControl, device) => !this.modeMatch },
-
-                // { name: '开放引导', commandTip: '开放引导信号', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch },
-                { name: '开启车队', commandTip: '对单架信号机开启车队模式，主要是信号机不关闭的情况下排列所有进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO, operate: OperationEvent.Signal.setAutoInterlock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) },
-                { name: '取消车队', commandTip: '对单架信号机关闭车队模式', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO, operate: OperationEvent.Signal.cancelAutoInterlock.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || this.getStationControlForbidden(stationControl.code) }
-                // { name: '未评限区', cmdType: '', operate: OperationEvent.Signal.reopenSignal.menuButton, securityCommand: true, disabledCb: (stationControl) => !this.modeMatch }
             ];
-            this.stationParamList = this.$store.state.training.prdType === '01' ? [
+            this.stationParamList = [
                 { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Local'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) }
-            ] : [
-                { name: '关站信号', commandTip: '封锁车站所有信号机', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
-
-                { name: '自排全开', commandTip: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode || this.getStationControlForbidden(stationControl.code)), isShow: (ciStation) => !ciStation },
-                { name: '自排全关', commandTip: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
-                { name: '追踪全开', commandTip: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
-                { name: '追踪全关', commandTip: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
-                { name: '关区信号', commandTip: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code), isShow: (ciStation) => !ciStation },
-                { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl, device) => ['Local', 'None'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) },
-
-                { name: '接收控制', commandTip: '接收控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, disabledCb: (stationControl, device) => ['Center'].includes(stationControl.controlMode) || this.getStationControlForbidden(stationControl.code) }
             ];
             this.routeParamList = [
                 { name: '排列进路', commandTip: '进路排列', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl, device) => !this.modeMatch || !this.route || this.getStationControlForbidden(stationControl.code) },
@@ -1449,318 +1284,317 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-	/deep/ {
-		.el-input--mini
-		.el-input__inner{
-			height: 20px;
-			line-height: 20px;
-		}
+/deep/ {
+	.el-input--mini
+	.el-input__inner{
+		height: 20px;
+		line-height: 20px;
 	}
+}
 
-	.speed-value-box{
-		height: 18px;
-		padding-left: 20px;
-		cursor: pointer;
-		width: 100%;
-		line-height: 18px;
-	}
+.speed-value-box{
+	height: 18px;
+	padding-left: 20px;
+	cursor: pointer;
+	width: 100%;
+	line-height: 18px;
+}
 
-	.separator {
-		display: flex;
-		justify-content: flex-end;
-		margin: 15px;
-		border-top: 1px solid #000;
-	}
-	.selected-row {
-		margin-left:10px;
-		text-align: left;
-		line-height: 22px
-	}
-	.active{
-		background-color: #2e46f6 !important;
-		border: 1px solid #DADADA !important;
-	}
+.separator {
+	display: flex;
+	justify-content: flex-end;
+	margin: 15px;
+	border-top: 1px solid #000;
+}
+.selected-row {
+	margin-left:10px;
+	text-align: left;
+	line-height: 22px
+}
+.active{
+	background-color: #2e46f6 !important;
+	border: 1px solid #DADADA !important;
+}
 </style>
 <style lang="scss">
-	.__menuButton {
-		.el-dialog,
-		.el-dialog__wrapper {
-			pointer-events: none !important;
+.__menuButton {
+	.el-dialog,
+	.el-dialog__wrapper {
+		pointer-events: none !important;
 	}
 
-		.el-dialog__header,
-		.el-dialog__body {
-			pointer-events: all !important;
-	}
+	.el-dialog__header,
+	.el-dialog__body {
+		pointer-events: all !important;
 	}
+}
 </style>
 <style lang="scss" scoped>
-    #menuButton{
-        position: absolute;
-        bottom: 0;
-        height: 90px;
-        width: 1200px;
-		left: 0;
-        background: #FFFFFF;
-        z-index: 2;
-    }
+#menuButton{
+	position: absolute;
+	bottom: 0;
+	height: 90px;
+	width: 1200px;
+	left: 0;
+	background: #FFFFFF;
+	z-index: 2;
+}
 
-    .nav-border {
-        color: #000;
-        height: 90px;
-        text-align: center;
-        border-top: 2px solid #7E8076;
-        border-left: 2px solid #6A6B64;
-        border-right: 2px solid #FBFBFA;
-        border-bottom: 2px solid #FBFBFA;
-    }
-    .nav-border-top{
-        height: 30px;
-        padding: 0 20px;
-        width: 100%;
-        font-size: 12px;
-        color: #000;
-        border-bottom: 2px solid #FBFBFA;
-        .fl {
-          float: left;
-          width: 100px;
-        }
-        .fr{
-          float: right;
-          width: 100px;
-        }
-    }
+.nav-border {
+	color: #000;
+	height: 90px;
+	text-align: center;
+	border-top: 2px solid #7E8076;
+	border-left: 2px solid #6A6B64;
+	border-right: 2px solid #FBFBFA;
+	border-bottom: 2px solid #FBFBFA;
+}
+.nav-border-top{
+	height: 30px;
+	padding: 0 20px;
+	width: 100%;
+	font-size: 12px;
+	color: #000;
+	border-bottom: 2px solid #FBFBFA;
+	.fl {
+		float: left;
+		width: 100px;
+	}
+	.fr{
+		float: right;
+		width: 100px;
+	}
+}
 
-    .nav-border-bottom{
-        height: 56px;
-        width: 100%;
-        font-size: 12px;
-    }
-    .flex-box{
-        display: flex;
-        flex-direction: column;
-        justify-content: space-around;
-        align-items: center;
-    }
-    .nav-border-row{
-        height: 29px;
-        &.row-width-box{
-            width: 20%;
-            float: left;
-        }
-    }
-    .flex-row{
-        display: flex;
-        justify-content: center;
-        align-items: center;
-    }
-    .fake-button{
-		font-size: 12px;
-        width: 80px;
-        height: 20px;
-        border-radius: 1px !important;
-        border: 1px solid #426688;
-		background: #DDDDDD;
-		color: #000;
-		line-height: 18px;
-		cursor: pointer;
-		&:hover, &.active{
-			background: #CFE8FC;
-		}
-    }
+.nav-border-bottom{
+	height: 56px;
+	width: 100%;
+	font-size: 12px;
+}
+.flex-box{
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	align-items: center;
+}
+.nav-border-row{
+	height: 29px;
+	&.row-width-box{
+		width: 20%;
+		float: left;
+	}
+}
+.flex-row{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.fake-button{
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	border: 1px solid #426688;
+	background: #DDDDDD;
+	color: #000;
+	line-height: 18px;
+	cursor: pointer;
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+}
 
-	.fake-button-grayk {
-		font-size: 12px;
-		width: 80px;
-		height: 20px;
-		border-radius: 1px !important;
-		border: 1px solid #426688;
-		background: #DDDDDD;
-		color: #DDDDDD;
-		line-height: 18px;
+.fake-button-grayk {
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	border: 1px solid #426688;
+	background: #DDDDDD;
+	color: #DDDDDD;
+	line-height: 18px;
+	cursor: not-allowed;
+}
+
+.fake-button-active{
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	line-height: 18px;
+	border: 1px solid #426688;
+	background: #77DBF0;
+	color: #000;
+	cursor: pointer;
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+}
+
+.fake-button-disabled{
+	font-size: 12px;
+	width: 80px;
+	height: 20px;
+	border-radius: 1px !important;
+	line-height: 18px;
+	border: 1px solid #9B9B9B;
+	background: #DDDDDD;
+	color: #a0a0a0;
+	cursor: not-allowed;
+}
+
+.__menuButton .el-button {
+	background: #DDDDDD;
+	border: 1px solid #000 !important;
+	cursor: pointer;
+	&.disabled {
+		cursor: not-allowed;
+		border: 1px solid #D0CEC5 !important;
+		color: #a0a0a0!important;
+	}
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+}
+
+.__menuButton .el-print {
+	font-size: 12px;
+	height: 52px;
+	margin: 0px 20px;
+	border: 1px solid #d1d1d1;
+	width: auto;
+	overflow: auto;
+}
+
+.__menuButton {
+	.el-dialog,
+	.el-dialog__wrapper {
+		pointer-events: none !important;
+	}
+
+	.el-dialog__header,
+	.el-dialog__body {
+		pointer-events: all !important;
+	}
+}
+
+.color-strip-container{
+	display: flex;
+	justify-content: flex-start;
+	margin-top: 10px;
+	animation: colorStrip 2s ease-in-out infinite;
+	-moz-animation: colorStrip 2s ease-in-out infinite;
+	-webkit-animation: colorStrip 2s ease-in-out infinite;
+	-o-animation: colorStrip 2s ease-in-out infinite;
+}
+@keyframes colorStrip
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+@-moz-keyframes colorStrip /* Firefox */
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+@-webkit-keyframes colorStrip /* Safari 和 Chrome */
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+@-o-keyframes colorStrip /* Opera */
+{
+	from {opacity: 1;}
+	to {opacity: 0;}
+}
+.ban-img{
+	height: 48px;
+	width: 48px;
+	animation: imageRotation 2s linear infinite;
+	-moz-animation: imageRotation 2s linear infinite;
+	-webkit-animation: imageRotation 2s linear infinite;
+	-o-animation: imageRotation 2s linear infinite;
+}
+@keyframes imageRotation
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+@-moz-keyframes imageRotation /* Firefox */
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+@-webkit-keyframes imageRotation /* Safari 和 Chrome */
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+@-o-keyframes imageRotation /* Opera */
+{
+	from {transform: rotate(0);}
+	to {transform: rotate(360deg);}
+}
+
+.station_buttonGroup{
+	display: inline-block;
+	margin-top: 5px;
+	width: 100%;
+}
+.station_buttonGroupL{
+	margin-left: 10px;
+	float: left;
+}
+.station_buttonGroupR{
+	float: right;
+	margin-right: 10px;
+}
+.station_jumpTrain{
+	margin-top: 15px;
+}
+.station_line{
+	padding: 0 10px;
+	width: 100%;
+	height: 20px;
+	text-align: center;
+	margin-top: 10px;
+	border:1px #ccc solid;
+}
+.station_commandGroup{
+	margin-top: 10px;
+	padding: 10px;
+}
+.station_command{
+	float: right;
+}
+.station_close{
+	float: right;
+}
+.moni_input{
+	border-top: 2px solid #585858;
+	border-left: 2px solid #585858;
+	border-right: 2px solid #F9F9F9;
+	border-bottom: 2px solid #F9F9F9;
+	background: #D4D0C8;
+}
+.stationButton{
+	font-size: 12px;
+	width: 100px;
+	border-radius: 1px !important;
+	border: 1px solid #426688;
+	background: #DDDDDD;
+	color: #000;
+	cursor: pointer;
+	text-align: center;
+	padding: 4px 0;
+	&:hover, &.active{
+		background: #CFE8FC;
+	}
+	&.disabled{
+		background: #f0f0f0;
+		color:#a0a0a0;
+		border: 1px solid #D0CEC5;
 		cursor: not-allowed;
 	}
-
-    .fake-button-active{
-		font-size: 12px;
-		width: 80px;
-        height: 20px;
-        border-radius: 1px !important;
-        line-height: 18px;
-        border: 1px solid #426688;
-		background: #77DBF0;
-		color: #000;
-		cursor: pointer;
-		&:hover, &.active{
-			background: #CFE8FC;
-		}
-    }
-
-	.fake-button-disabled{
-		font-size: 12px;
-		width: 80px;
-        height: 20px;
-        border-radius: 1px !important;
-        line-height: 18px;
-        border: 1px solid #9B9B9B;
-		background: #DDDDDD;
-		color: #a0a0a0;
-		cursor: not-allowed;
-	}
-
-	.__menuButton .el-button {
-		background: #DDDDDD;
-		border: 1px solid #000 !important;
-		cursor: pointer;
-		&.disabled {
-			cursor: not-allowed;
-			border: 1px solid #D0CEC5 !important;
-			color: #a0a0a0!important;
-		}
-		&:hover, &.active{
-			background: #CFE8FC;
-		}
-	}
-
-	.__menuButton .el-print {
-		font-size: 12px;
-		height: 52px;
-		margin: 0px 20px;
-		border: 1px solid #d1d1d1;
-		width: auto;
-		overflow: auto;
-	}
-
-	.__menuButton {
-		.el-dialog,
-		.el-dialog__wrapper {
-			pointer-events: none !important;
-		}
-
-		.el-dialog__header,
-		.el-dialog__body {
-			pointer-events: all !important;
-		}
-	}
-
-	.color-strip-container{
-		display: flex;
-		justify-content: flex-start;
-		margin-top: 10px;
-		animation: colorStrip 2s ease-in-out infinite;
-		-moz-animation: colorStrip 2s ease-in-out infinite;
-		-webkit-animation: colorStrip 2s ease-in-out infinite;
-		-o-animation: colorStrip 2s ease-in-out infinite;
-	}
-	@keyframes colorStrip
-	{
-		from {opacity: 1;}
-		to {opacity: 0;}
-	}
-	@-moz-keyframes colorStrip /* Firefox */
-	{
-		from {opacity: 1;}
-		to {opacity: 0;}
-	}
-	@-webkit-keyframes colorStrip /* Safari 和 Chrome */
-	{
-		from {opacity: 1;}
-		to {opacity: 0;}
-	}
-	@-o-keyframes colorStrip /* Opera */
-	{
-		from {opacity: 1;}
-		to {opacity: 0;}
-	}
-	.ban-img{
-		height: 48px;
-		width: 48px;
-		animation: imageRotation 2s linear infinite;
-		-moz-animation: imageRotation 2s linear infinite;
-		-webkit-animation: imageRotation 2s linear infinite;
-		-o-animation: imageRotation 2s linear infinite;
-	}
-	@keyframes imageRotation
-	{
-		from {transform: rotate(0);}
-		to {transform: rotate(360deg);}
-	}
-	@-moz-keyframes imageRotation /* Firefox */
-	{
-		from {transform: rotate(0);}
-		to {transform: rotate(360deg);}
-	}
-	@-webkit-keyframes imageRotation /* Safari 和 Chrome */
-	{
-		from {transform: rotate(0);}
-		to {transform: rotate(360deg);}
-	}
-	@-o-keyframes imageRotation /* Opera */
-	{
-		from {transform: rotate(0);}
-		to {transform: rotate(360deg);}
-	}
-
-    .station_buttonGroup{
-        display: inline-block;
-        margin-top: 5px;
-        width: 100%;
-    }
-    .station_buttonGroupL{
-        margin-left: 10px;
-        float: left;
-    }
-    .station_buttonGroupR{
-        float: right;
-        margin-right: 10px;
-    }
-    .station_jumpTrain{
-        margin-top: 15px;
-    }
-    .station_line{
-        padding: 0px 10px;
-        width: 100%;
-        height: 20px;
-		text-align: center;
-        margin-top: 10px;
-		border:1px #ccc solid;
-    }
-    .station_commandGroup{
-        margin-top: 10px;
-        padding: 10px;
-    }
-    .station_command{
-        float: right;
-    }
-    .station_close{
-        float: right;
-    }
-	.moni_input{
-		border-top: 2px solid #585858;
-		border-left: 2px solid #585858;
-		border-right: 2px solid #F9F9F9;
-		border-bottom: 2px solid #F9F9F9;
-		background: #D4D0C8;
-	}
-    .stationButton{
-        font-size: 12px;
-        width: 100px;
-        border-radius: 1px !important;
-        border: 1px solid #426688;
-        background: #DDDDDD;
-        color: #000;
-        cursor: pointer;
-        text-align: center;
-        padding: 4px 0px;
-		cursor: pointer;
-		&:hover, &.active{
-			background: #CFE8FC;
-		}
-        &.disabled{
-            background: #f0f0f0;
-            color:#a0a0a0;
-            border: 1px solid #D0CEC5;
-            cursor: not-allowed;
-        }
-    }
+}
 </style>
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuSection.vue b/src/jmapNew/theme/nanjing_02/menus/menuSection.vue
index 50b5b9064..01cb72cdb 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuSection.vue
@@ -13,7 +13,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 
 export default {
@@ -34,12 +33,6 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置故障',
@@ -101,11 +94,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
-            } else {
-                this.menu = [];
-            }
+            this.menu = [];
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT && this.selected.type != '04') {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue b/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue
index 159559f83..cb75601cb 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuSignal.vue
@@ -31,12 +31,6 @@ export default {
         return {
             menu: [],
             systemName:'xian-01__systerm',
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置故障',
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuStation.vue b/src/jmapNew/theme/nanjing_02/menus/menuStation.vue
index 701e53386..65a915235 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuStation.vue
@@ -12,7 +12,6 @@ import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
@@ -32,12 +31,6 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -99,8 +92,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            this.menu = [];
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = [...this.menuForce];
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue b/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue
index 1ac1bb8fd..0065d4570 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuStationStand.vue
@@ -2,7 +2,6 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" pop-menu-class="haerbin-01__systerm" />
     <set-fault ref="setFault" pop-class="nanjing-02__systerm" />
-    <psl ref="psl" pop-class="xian-01__systerm" />
   </div>
 </template>
 
@@ -10,18 +9,15 @@
 import PopMenu from '@/components/PopMenu';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
 
 export default {
     name: 'StationStandMenu',
     components: {
         PopMenu,
-        SetFault,
-        Psl
+        SetFault
     },
     props: {
         selected: {
@@ -34,12 +30,6 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: this.$t('menu.menuStationStand.setFault'),
@@ -86,17 +76,10 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            this.menu = [];
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = [...this.menuForce];
-                if (this.$store.state.training.prdType === '01') {
-                    this.menu.push({
-                        label: 'PSL',
-                        handler: this.openPsl
-                    });
-                }
             }
         },
         doShow(point) {
@@ -129,10 +112,6 @@ export default {
         },
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
-        },
-        // 打开PSL面板
-        openPsl() {
-            this.$refs.psl.doShow(this.selected);
         }
     }
 };
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue b/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue
index cd16c1e72..cf74f4d27 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuSwitch.vue
@@ -11,7 +11,6 @@ import PopMenu from '@/components/PopMenu';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
@@ -86,7 +85,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
diff --git a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
index 5744d6904..19b2c6053 100644
--- a/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/menuTrain.vue
@@ -2,11 +2,6 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
-    <!-- <train-control ref="trainControl" /> -->
-    <!-- <train-delete ref="trainDelete" /> -->
-    <!-- <train-move ref="trainMove" /> -->
-    <!-- <train-switch ref="trainSwitch" /> -->
-    <!-- <train-edit-number ref="trainEditNumber" /> -->
     <speed-limit ref="speedLimit" pop-class="haerbin-01__systerm" />
     <set-fault ref="setFault" pop-class="nanjing-02__systerm" />
   </div>
@@ -20,12 +15,6 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-// import TrainControl from './dialog/trainControl';
-// import TrainDelete from './dialog/trainDelete';
-// import TrainMove from './dialog/trainMove';
-// import TrainSwitch from './dialog/trainSwitch';
-// import TrainEditNumber from './dialog/trainEditNumber';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -35,11 +24,6 @@ export default {
         PopMenu,
         NoticeInfo,
         SpeedLimit,
-        // TrainControl,
-        // TrainDelete,
-        // TrainMove,
-        // TrainSwitch,
-        // TrainEditNumber,
         SetFault
     },
     props: {
@@ -53,12 +37,6 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                ]
-            },
             menuForce: [
                 {
                     label: '设置故障',
@@ -170,7 +148,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce, ...this.menuSpeed];
             }
@@ -229,7 +207,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -332,108 +310,6 @@ export default {
         triggerFaultManagement() {
             this.$store.dispatch('training/setTriggerFaultCount', this.selected);
         }
-        // // 添加列车识别号
-        // addTrainId() {
-        //     const step = {
-        //         start: true,
-
-        //         operation: OperationEvent.Train.addTrainId.menu.operation,
-        //         param: {
-        //             code: this.selected.code
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.trainControl.doShow(step, this.selected);
-        //         }
-        //     });
-        // },
-        // // 删除列车识别号
-        // delTrainId() {
-        //     const step = {
-        //         start: true,
-
-        //         operation: OperationEvent.Train.delTrainId.menu.operation,
-        //         param: {
-        //             code: this.selected.code
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.trainDelete.doShow(step, this.selected);
-        //         }
-        //     });
-        // },
-        // // 修改列车识别号
-        // editTrainId() {
-        //     const step = {
-        //         start: true,
-
-        //         operation: OperationEvent.Train.editTrainId.menu.operation,
-        //         param: {
-        //             code: this.selected.code
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.trainControl.doShow(step, this.selected);
-        //         }
-        //     });
-        // },
-        // // 修改车组号
-        // editTrainNo() {
-        //     const step = {
-        //         start: true,
-
-        //         operation: OperationEvent.Train.editTrainNo.menu.operation,
-        //         param: {
-        //             code: this.selected.code
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.trainEditNumber.doShow(step, this.selected);
-        //         }
-        //     });
-        // },
-        // // 移动列车识别号
-        // moveTrainId() {
-        //     const step = {
-        //         start: true,
-
-        //         operation: OperationEvent.Train.moveTrainId.menu.operation,
-        //         param: {
-        //             code: this.selected.code
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.trainMove.doShow(step, this.selected);
-        //         }
-        //     });
-        // },
-        // // 交换列车识别号
-        // switchTrainId() {
-        //     const step = {
-        //         start: true,
-
-        //         operation: OperationEvent.Train.switchTrainId.menu.operation,
-        //         param: {
-        //             code: this.selected.code
-        //         }
-        //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.trainSwitch.doShow(step, this.selected);
-        //         }
-        // 	});
-        // }
     }
 };
 </script>
diff --git a/src/jmapNew/theme/nanjing_02/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/nanjing_02/menus/passiveDialog/alarm.vue
index 83cea6fd8..3cdffd1b7 100644
--- a/src/jmapNew/theme/nanjing_02/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/passiveDialog/alarm.vue
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -185,7 +185,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/nanjing_02/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/nanjing_02/menus/passiveDialog/timeout.vue
index a4635f698..bc81443bd 100644
--- a/src/jmapNew/theme/nanjing_02/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/nanjing_02/menus/passiveDialog/timeout.vue
@@ -79,7 +79,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -90,7 +90,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
index fd0dd50d5..9dc1d2627 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue
@@ -293,7 +293,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.type = 'password';
@@ -315,7 +315,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.chooseStation.blur();
             });
@@ -332,7 +332,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.chooseSection.blur();
             });
@@ -357,7 +357,7 @@ export default {
             if (this.model.stationCode == this.model.confirmStationCode && this.model.sectionCode == this.model.confirmSectionCode) {
                 this.stepNum = 3;
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.type = 'text';
@@ -384,7 +384,7 @@ export default {
             };
 
             this.$store
-                .dispatch('training/nextNew', operate)
+                .dispatch('trainingNew/next', operate)
                 .then(({ valid }) => {
                     if (valid) {
                         this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
index 9131a79c2..d044a21b0 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue
@@ -20,7 +20,7 @@
     </el-row>
     <el-row justify="center" class="button-group">
       <el-col :span="12">
-        <el-button @click="confirm">确定</el-button>
+        <el-button :id="confirmId" @click="confirm">确定</el-button>
       </el-col>
       <el-col :span="12">
         <el-button @click="doClose">关闭</el-button>
@@ -54,7 +54,7 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         confirmId() {
-            return this.operation.domId;
+            return this.operation === OperationEvent.Station.setPreReset.confirm.operation ? OperationEvent.Station.setPreReset.confirm.domId : OperationEvent.Station.cancelPreReset.confirm.domId;
         }
     },
     mounted() {
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 21de3a07f..4ee1f672f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 a2b5422be..d17cb9fa3 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -83,7 +83,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -102,7 +102,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/mapVisual.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
index 490cfb79c..1fb5805be 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/mapVisual.vue
@@ -30,6 +30,12 @@ export default {
             defautl() {
                 return {};
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
@@ -71,12 +77,12 @@ export default {
     },
     methods: {
         init() {
-            console.log(123)
+            console.log(123);
             document.getElementById(this.canvasId).oncontextmenu = function (e) {
                 return false;
             };
 
-            const prdType = this.$store.state.training.prdType;
+            const prdType = this.work == 'localWork' ? '01' : '02';
 
             let showMode = '';
             if (prdType == '01') {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
index 237cce621..abb942ba3 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
@@ -33,7 +33,7 @@
         </el-row>
       </el-col>
       <el-col v-show="showExpand" :span="showExpand? 18: 0">
-        <map-visual ref="map" :map-data="mapData" :width="780" :height="600" />
+        <map-visual ref="map" :map-data="mapData" :width="780" :height="600" :work="work" />
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
@@ -59,6 +59,14 @@ export default {
         ConfirmTip,
         MapVisual
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             tempData: [],
@@ -257,7 +265,7 @@ export default {
                         val: row.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -289,7 +297,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
index fdbcc9b8f..e0f520dbf 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/routerCommand.vue
@@ -136,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
index 66c0526a1..b1c077800 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
@@ -116,7 +116,7 @@ export default {
                 val: this.sectionCode
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -134,7 +134,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -150,7 +150,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
index d06e791b3..8ce340477 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/standBulkBuckleTrain.vue
@@ -207,7 +207,7 @@ export default {
             // }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -245,7 +245,7 @@ export default {
             // }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -263,7 +263,7 @@ export default {
             };
 
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
index 9f0b9115c..360512e93 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
@@ -123,7 +123,7 @@ export default {
             };
             this.strategyId = row.id;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -173,7 +173,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
index c9356d446..8b7a680c7 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
@@ -256,7 +256,7 @@ export default {
                     operation: OperationEvent.Signal.arrangementRoute.choose.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -291,7 +291,7 @@ export default {
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -308,7 +308,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
index 63ec06b5e..d66b4c11c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
@@ -122,7 +122,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -137,7 +137,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 e34e739ab..cf4201791 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
@@ -118,7 +118,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2655ad8cb..d604c7163 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
@@ -122,7 +122,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -137,7 +137,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
index 07bc7a108..1204bc8e2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetHead.vue
@@ -153,7 +153,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
index 17421e391..7eab351c5 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetPlan.vue
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
index 11d648330..4577e379b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWork.vue
@@ -116,7 +116,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 859f80d7b..9a1b420f2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
@@ -117,7 +117,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -132,7 +132,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
index 5e3bffa60..88963746c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/turnBackControl.vue
@@ -192,7 +192,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..260b320c0
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenu.vue
@@ -0,0 +1,435 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :work="work" />
+    <menu-axle-reset ref="menuAxleReset" :selected="selected" :work="work" />
+    <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" :work="work" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-station-control ref="menuStationControl" :selected="selected" :work="work" />
+    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" />
+    <menu-limit ref="menuLimit" :selected="selected" :work="work" />
+    <menu-station-light ref="menuStationLight" :selected="selected" :work="work" />
+    <menu-station-pre-reset ref="menuStationPreReset" :selected="selected" :work="work" />
+    <!--<passive-alarm ref="passiveAlarm" />-->
+    <passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" :selected="selected" />
+    <!--<passive-Timeout ref="passiveTimeout" />-->
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuAxleReset from './menuAxleReset';
+import MenuAutoTrunRoute from './menuAutoTrunRoute';
+import MenuStationStand from './menuStationStand';
+import MenuStationControl from './menuStationControl';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './dispatchWorkMenuBar';
+import MenuLimit from './menuLimit';
+import MenuStationTurnBack from './menuStationTurnBack';
+import MenuStationLight from './menuStationLight';
+import MenuStationPreReset from './menuStationPreReset';
+// import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+// import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuAxleReset,
+        MenuAutoTrunRoute,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStationControl,
+        MenuStation,
+        MenuTrain,
+        MenuStationTurnBack,
+        MenuLimit,
+        // PassiveAlarm,
+        PassiveContorl,
+        MenuStationLight,
+        MenuStationPreReset
+        // PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            work: 'dispatchWork'
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuAxleReset.doClose();
+                _that.$refs.menuAutoTrunRoute.doClose();
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuStationControl.doClose();
+                _that.$refs.menuStationTurnBack.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+                _that.$refs.menuLimit.doClose();
+                _that.$refs.menuStationLight.doClose();
+                _that.$refs.menuStationPreReset.doClose();
+            };
+        });
+
+        this.$root.$on('dialogOpen', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.__over = true;
+                this.selected.instance.mouseEvent.mouseover();
+            }
+        });
+
+        this.$root.$on('dialogClose', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.__over = false;
+                this.selected.instance.__down = false;
+                this.selected.instance.mouseEvent.mouseout();
+                this.$jlmap.clearEvent();
+            }
+        });
+    },
+    beforeDestroy() {
+        this.$root.$off('dialogOpen');
+        this.$root.$off('dialogClose');
+        window.onclick = function (e) {};
+    }
+};
+</script>
+
+<style>
+    .menus{
+        height:0px;
+    }
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .ningbo-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .ningbo-01__systerm .el-dialog {
+        background: rgba(100, 100, 100, 0.3);
+        border: 2px solid rgba(144, 144, 144, 0.8);
+        border-radius: 6px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__header {
+        padding: 10px;
+        height: 26px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__footer {
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__body {
+        padding: 10px;
+        margin: 5px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__title {
+        position: absolute;
+        top: 6px;
+        color: #000;
+        border-radius: 4px;
+        padding: 0px 2px;
+        height: 20px;
+        line-height: 20px
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__title::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        filter: blur(7px);
+        height: 20px;
+        width: -webkit-fill-available;
+        background: rgba(190, 190, 190, 0.8);
+        z-index: -1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 5px;
+        right: 5px;
+        line-height: 18px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .ningbo-01__systerm .el-dialog .expand {
+        width: 120px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+        background: #fff !important;
+        border-right: 1px solid #fff !important;
+        border-bottom: 1px solid #EBEEF5 !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+        border-right: 1px solid #e2e2e2 !important;
+    }
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+        border-right: 1px solid #e2e2e2 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: #F0F0F0;
+        padding: 0 5px;
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .ningbo-01__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .ningbo-01__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .ningbo-01__systerm .el-dialog .button-group {
+        margin-top: 10px;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..b05cb4b7e
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,580 @@
+<template>
+  <div>
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control ref="stationControl" />
+    <detain-train-contorl ref="detainTrainContorl" />
+    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
+    <!-- <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" /> -->
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+    <area-selection ref="areaSelection" />
+    <operate-confirm ref="operateConfirm" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import StationControl from './menuDialog/stationControl';
+import DetainTrainContorl from './menuDialog/detainTrainContorl';
+import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import AreaSelection from './menuDialog/areaSelection';
+import OperateConfirm from './dialog/childDialog/operateConfirm';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+export default {
+    name:'DispatchWorkMenuBar',
+    components: {
+        MenuBar,
+        StationControl,
+        DetainTrainContorl,
+        DetainTrainContorlUpDown,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout,
+        AreaSelection,
+        OperateConfirm
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl
+                        },
+                        {
+                            title: '区域选择',
+                            operate: OperationEvent.Station.areaSelection.mbar,
+                            click: this.selectedArea
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                operate: '',
+                                click: this.undeveloped
+                                // children: [{
+                                //     title: '报警123',
+                                //     operate: '',
+                                //     children: [{
+                                //         title: '报警12345',
+                                //         operate: '',
+                                //         click: this.undeveloped
+                                //     }]
+                                //     // click: this.undeveloped
+                                // }]
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '全线扣车',
+                            operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消全线扣车',
+                            operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: '',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed:{
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    created() {
+        this.menuNormal[2].children = this.initStationList();
+    },
+    methods:{
+        computedTitle(order) {
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            if (order.operate === OperationEvent.Station.stationSetCIAuto.mbar && station) {
+                return `设置${station.name}全站自动通过进路`;
+            } else if (order.operate === OperationEvent.Station.stationCancelCIAuto.mbar && station) {
+                return `取消${station.name}全站自动通过进路`;
+            } else if (order.operate === OperationEvent.Station.atsAutoControlALL.mbar && station) {
+                return `${station.name}全站进路交自动控`;
+            } else {
+                return '';
+            }
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+
+            }
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        selectedArea(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.areaSelection.doShow(operate);
+
+                }
+            });
+        },
+        // 设置全线扣车
+        setDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消全线扣车
+        cancelDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消上行扣车
+        cancelUpDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 取消下行扣车
+        cancelDownDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 添加计划车
+        addPlanTrain(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainAdd.doShow(operate);
+                }
+            });
+        },
+        // 平移计划车
+        translatPlanTrain(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainTranstalet.doShow(operate);
+                }
+            });
+        },
+        // 删除计划车
+        delPlanTrain(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDelete.doShow(operate);
+                }
+            });
+        },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        setAllCiAuto(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+                    const nextOperate = {
+                        operation: OperationEvent.Station.stationSetCIAuto.confirm.operation,
+                        message: `是否要执行批处理命令: 设置${station.name}自动通过进路`
+                    };
+                    this.$refs.operateConfirm.doShow(nextOperate);
+                }
+            });
+        },
+        setAllAutoControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+                    const nextOperate = {
+                        operation: OperationEvent.Station.atsAutoControlALL.confirm.operation,
+                        message: `是否要执行批处理命令: ${station.name}全站进路交自动控`
+                    };
+                    this.$refs.operateConfirm.doShow(nextOperate);
+                }
+            });
+        },
+        cancelAllCiAuto(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+                    const nextOperate = {
+                        operation: OperationEvent.Station.stationCancelCIAuto.confirm.operation,
+                        message: `是否要执行批处理命令: 取消${station.name}自动通过进路`
+                    };
+                    this.$refs.operateConfirm.doShow(nextOperate);
+                }
+            });
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/race_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue
similarity index 50%
rename from src/jmapNew/theme/race_01/menus/index.vue
rename to src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue
index 02c152bba..02c8bc9c3 100644
--- a/src/jmapNew/theme/race_01/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/localWorkMenu.vue
@@ -1,20 +1,21 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-    <menu-axle-reset ref="menuAxleReset" :selected="selected" />
-    <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-station-control ref="menuStationControl" />
-    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
-    <menu-limit ref="menuLimit" :selected="selected" />
-    <menu-power ref="menuPower" :selected="selected" />
+    <menu-bar ref="menuBar" :selected="selected" :work="work" />
+    <menu-axle-reset ref="menuAxleReset" :selected="selected" :work="work" />
+    <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" :work="work" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-station-control ref="menuStationControl" :selected="selected" :work="work" />
+    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" />
+    <menu-limit ref="menuLimit" :selected="selected" :work="work" />
+    <menu-station-light ref="menuStationLight" :selected="selected" :work="work" />
+    <menu-station-pre-reset ref="menuStationPreReset" :selected="selected" :work="work" />
     <!--<passive-alarm ref="passiveAlarm" />-->
-    <passive-contorl ref="passiveControl" pop-class="race-01__systerm" />
+    <passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" :selected="selected" />
     <!--<passive-Timeout ref="passiveTimeout" />-->
   </div>
 </template>
@@ -30,16 +31,17 @@ import MenuSwitch from './menuSwitch';
 import MenuSection from './menuSection';
 import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
-import MenuBar from './menuBar';
+import MenuBar from './localWorkMenuBar';
 import MenuLimit from './menuLimit';
 import MenuStationTurnBack from './menuStationTurnBack';
-import MenuPower from './menuPower';
+import MenuStationLight from './menuStationLight';
+import MenuStationPreReset from './menuStationPreReset';
 // import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 // import PassiveTimeout from './passiveDialog/timeout';
 
 export default {
-    name: 'Menus',
+    name: 'LocalWorkMenu',
     components: {
         MenuBar,
         MenuAxleReset,
@@ -53,9 +55,10 @@ export default {
         MenuTrain,
         MenuStationTurnBack,
         MenuLimit,
-        MenuPower,
         // PassiveAlarm,
-        PassiveContorl
+        PassiveContorl,
+        MenuStationLight,
+        MenuStationPreReset
         // PassiveTimeout
     },
     props: {
@@ -66,23 +69,68 @@ export default {
             }
         }
     },
+    data() {
+        return {
+            work: 'localWork'
+        };
+    },
     computed: {
         ...mapGetters('config', [
             'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
+        ])
     },
     watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        }
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuAxleReset.doClose();
+                _that.$refs.menuAutoTrunRoute.doClose();
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuStationControl.doClose();
+                _that.$refs.menuStationTurnBack.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+                _that.$refs.menuLimit.doClose();
+                _that.$refs.menuStationLight.doClose();
+                _that.$refs.menuStationPreReset.doClose();
+            };
         });
+
+        this.$root.$on('dialogOpen', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.__over = true;
+                this.selected.instance.mouseEvent.mouseover();
+            }
+        });
+
+        this.$root.$on('dialogClose', e => {
+            if (this.selected == e &&
+				this.selected &&
+				this.selected.instance &&
+				this.selected.instance.mouseEvent) {
+                this.selected.instance.__over = false;
+                this.selected.instance.__down = false;
+                this.selected.instance.mouseEvent.mouseout();
+                this.$jlmap.clearEvent();
+            }
+        });
+    },
+    beforeDestroy() {
+        this.$root.$off('dialogOpen');
+        this.$root.$off('dialogClose');
+        window.onclick = function (e) {};
     }
 };
 </script>
@@ -103,11 +151,11 @@ export default {
         color: #B4B3B8;
     }
 
-    .race-01__systerm {
+    .ningbo-01__systerm {
         overflow: hidden !important;
     }
 
-    .race-01__systerm .el-dialog {
+    .ningbo-01__systerm .el-dialog {
         background: rgba(100, 100, 100, 0.3);
         border: 2px solid rgba(144, 144, 144, 0.8);
         border-radius: 6px;
@@ -115,17 +163,17 @@ export default {
         font-size: 14px;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__header {
+    .ningbo-01__systerm .el-dialog .el-dialog__header {
         padding: 10px;
         height: 26px;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__footer {
+    .ningbo-01__systerm .el-dialog .el-dialog__footer {
         background: #F0F0F0;
         opacity: 1;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__body {
+    .ningbo-01__systerm .el-dialog .el-dialog__body {
         padding: 10px;
         margin: 5px;
         border: 2px solid rgba(120, 121, 123, 0.5);
@@ -134,7 +182,7 @@ export default {
         opacity: 1;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__title {
+    .ningbo-01__systerm .el-dialog .el-dialog__title {
         position: absolute;
         top: 6px;
         color: #000;
@@ -144,7 +192,7 @@ export default {
         line-height: 20px
     }
 
-    .race-01__systerm .el-dialog .el-dialog__title::before {
+    .ningbo-01__systerm .el-dialog .el-dialog__title::before {
         content: '';
         position: absolute;
         top: 0;
@@ -156,7 +204,7 @@ export default {
         z-index: -1;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__headerbtn {
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn {
         background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
         border: 1px solid #fff;
         border-radius: 4px;
@@ -165,15 +213,15 @@ export default {
         line-height: 18px;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
         font-size: 16px;
     }
 
-    .race-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
         color: #fff;
     }
 
-    .race-01__systerm .el-dialog .el-button {
+    .ningbo-01__systerm .el-dialog .el-button {
         height: 32px;
         line-height: 32px;
         padding: 0px;
@@ -184,31 +232,31 @@ export default {
         background: #F0F0F0;
     }
 
-    .race-01__systerm .el-dialog .expand {
+    .ningbo-01__systerm .el-dialog .expand {
         width: 120px;
     }
 
-    .race-01__systerm .el-dialog .el-button:focus span {
+    .ningbo-01__systerm .el-dialog .el-button:focus span {
         border: 1px dashed gray;
     }
 
-    .race-01__systerm .el-dialog .el-button:active {
+    .ningbo-01__systerm .el-dialog .el-button:active {
         border: 2px inset #E2E2E2;
     }
 
-    .race-01__systerm .el-dialog .el-button:disabled {
+    .ningbo-01__systerm .el-dialog .el-button:disabled {
         border: 2px inset #E2E2E2;
     }
 
-    .race-01__systerm .el-dialog .el-button:disabled span {
+    .ningbo-01__systerm .el-dialog .el-button:disabled span {
         border: 0px;
     }
 
-    .race-01__systerm .el-dialog .el-input {
+    .ningbo-01__systerm .el-dialog .el-input {
         border: 2px inset #E9E9E9;
     }
 
-    .race-01__systerm .el-dialog .el-input .el-input__inner {
+    .ningbo-01__systerm .el-dialog .el-input .el-input__inner {
         color: #000;
         background: #fff !important;
         border: 0px;
@@ -216,16 +264,16 @@ export default {
         box-sizing: border-box;
     }
 
-    .race-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+    .ningbo-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
         background: #F0F0F0 !important;
     }
 
-    .race-01__systerm .el-dialog .el-textarea {
+    .ningbo-01__systerm .el-dialog .el-textarea {
         border: 2px inset #E9E9E9;
         border-radius: 0px;
     }
 
-    .race-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+    .ningbo-01__systerm .el-dialog .el-textarea .el-textarea__inner {
         color: #000;
         background: #fff !important;
         border: 0px;
@@ -233,24 +281,24 @@ export default {
         box-sizing: border-box;
     }
 
-    .race-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+    .ningbo-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
         background: #F0F0F0 !important;
     }
 
-    .race-01__systerm .el-dialog .el-table--border th.gutter {
+    .ningbo-01__systerm .el-dialog .el-table--border th.gutter {
         background: #EBEADB !important;
     }
 
-    .race-01__systerm .el-dialog .el-table {
+    .ningbo-01__systerm .el-dialog .el-table {
         border: 2px inset #E9E9E9;
         color: #000 !important;
     }
 
-    .race-01__systerm .el-dialog .el-table .cell {
+    .ningbo-01__systerm .el-dialog .el-table .cell {
         line-height: unset !important;
     }
 
-    .race-01__systerm .el-dialog .el-table th.is-leaf {
+    .ningbo-01__systerm .el-dialog .el-table th.is-leaf {
         background: #F0F0F0 !important;
         border-right: 1px solid #BDBDBD !important;
         border-bottom: 1px solid #BDBDBD !important;
@@ -259,7 +307,7 @@ export default {
         padding: 0px;
     }
 
-    .race-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
         background: #fff !important;
         border-right: 1px solid #fff !important;
         border-bottom: 1px solid #EBEEF5 !important;
@@ -267,49 +315,49 @@ export default {
         height: 20px !important;
         padding: 0px;
     }
-    .race-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
         border-right: 1px solid #e2e2e2 !important;
     }
-    .race-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
         border-right: 1px solid #e2e2e2 !important;
     }
 
-    .race-01__systerm .el-dialog .el-table tr td {
+    .ningbo-01__systerm .el-dialog .el-table tr td {
         height: 20px !important;
         padding: 0px;
     }
 
-    .race-01__systerm .el-dialog .el-table .el-table__empty-text {
+    .ningbo-01__systerm .el-dialog .el-table .el-table__empty-text {
         top: 15px !important;
     }
 
-    .race-01__systerm .el-dialog .current-row>td {
+    .ningbo-01__systerm .el-dialog .current-row>td {
         background: #3399FF !important;
         color: #fff !important;
     }
 
-    .race-01__systerm .el-dialog .el-checkbox__inner {
+    .ningbo-01__systerm .el-dialog .el-checkbox__inner {
         border: 1px inset #dcdfe6 !important;
     }
 
-    .race-01__systerm .el-dialog .el-checkbox__label {
+    .ningbo-01__systerm .el-dialog .el-checkbox__label {
         color: #000 !important;
     }
 
-    .race-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
         background: #E6E6E6 !important;
     }
 
-    .race-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
         color: #C5C9CC !important;
     }
 
-    .race-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
         background: #fff !important;
         border: 1px inset #dcdfe6 !important;
     }
 
-    .race-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
         position: absolute;
         -webkit-box-sizing: content-box;
         box-sizing: content-box;
@@ -322,20 +370,20 @@ export default {
         top: 1px;
     }
 
-    .race-01__systerm .el-dialog .el-radio__inner {
+    .ningbo-01__systerm .el-dialog .el-radio__inner {
         border: 1px inset #dcdfe6 !important;
     }
 
-    .race-01__systerm .el-dialog .el-radio__label {
+    .ningbo-01__systerm .el-dialog .el-radio__label {
         color: #000 !important;
     }
 
-    .race-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
         background: #fff !important;
         border: 1px inset #dcdfe6 !important;
     }
 
-    .race-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
         width: 4px;
         height: 4px;
         border-radius: 100%;
@@ -345,15 +393,15 @@ export default {
         top: 50%;
     }
 
-    .race-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
         background: #E6E6E6 !important;
     }
 
-    .race-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
         color: #C5C9CC !important;
     }
 
-    .race-01__systerm .el-dialog .base-label {
+    .ningbo-01__systerm .el-dialog .base-label {
         background: #F0F0F0;
         padding: 0 5px;
         position: relative;
@@ -361,27 +409,27 @@ export default {
         top: -18px;
     }
 
-    .race-01__systerm .el-dialog .el-form-item label {
+    .ningbo-01__systerm .el-dialog .el-form-item label {
         font-weight: normal !important;
         color: #000 !important;
     }
 
-    .race-01__systerm .el-dialog .context {
+    .ningbo-01__systerm .el-dialog .context {
         height: 100px;
         border: 2px inset #E2E2E2;
         overflow-y: scroll;
     }
 
-    .race-01__systerm .el-dialog .table {
+    .ningbo-01__systerm .el-dialog .table {
         margin-top: 10px;
     }
 
-    .race-01__systerm .el-dialog .notice {
+    .ningbo-01__systerm .el-dialog .notice {
         margin-left: 62px;
         line-height: 30px;
     }
 
-    .race-01__systerm .el-dialog .button-group {
+    .ningbo-01__systerm .el-dialog .button-group {
         margin-top: 10px;
     }
 </style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..ba5e6caaa
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/localWorkMenuBar.vue
@@ -0,0 +1,529 @@
+<template>
+  <div>
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control ref="stationControl" />
+    <detain-train-contorl ref="detainTrainContorl" />
+    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
+    <!-- <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" /> -->
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+    <area-selection ref="areaSelection" :work="work" />
+    <operate-confirm ref="operateConfirm" />
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import StationControl from './menuDialog/stationControl';
+import DetainTrainContorl from './menuDialog/detainTrainContorl';
+import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import AreaSelection from './menuDialog/areaSelection';
+import OperateConfirm from './dialog/childDialog/operateConfirm';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+export default {
+    name:'LocalWorkMenuBar',
+    components: {
+        MenuBar,
+        StationControl,
+        DetainTrainContorl,
+        DetainTrainContorlUpDown,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout,
+        AreaSelection,
+        OperateConfirm
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl
+                        },
+                        {
+                            title: '区域选择',
+                            operate: OperationEvent.Station.areaSelection.mbar,
+                            click: this.selectedArea
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: OperationEvent.Command.mBar.batchProcessing,
+                    children: [
+                        {
+                            title: '设置全站自动通过进路',
+                            operate: OperationEvent.Station.stationSetCIAuto.mbar,
+                            click: this.setAllCiAuto,
+                            computedTitle: this.computedTitle
+                        },
+                        {
+                            title: '取消全站自动通过进路',
+                            operate: OperationEvent.Station.stationCancelCIAuto.mbar,
+                            click: this.cancelAllCiAuto,
+                            computedTitle:  this.computedTitle
+                        },
+                        {
+                            title: '全站自动交自动控',
+                            operate: OperationEvent.Station.atsAutoControlALL.mbar,
+                            click: this.setAllAutoControl,
+                            computedTitle:  this.computedTitle
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: '',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed:{
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    created() {
+    },
+    methods:{
+        computedTitle(order) {
+            const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+            if (order.operate === OperationEvent.Station.stationSetCIAuto.mbar && station) {
+                return `设置${station.name}全站自动通过进路`;
+            } else if (order.operate === OperationEvent.Station.stationCancelCIAuto.mbar && station) {
+                return `取消${station.name}全站自动通过进路`;
+            } else if (order.operate === OperationEvent.Station.atsAutoControlALL.mbar && station) {
+                return `${station.name}全站进路交自动控`;
+            } else {
+                return '';
+            }
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+
+            }
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        selectedArea(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.areaSelection.doShow(operate);
+
+                }
+            });
+        },
+        // 设置全线扣车
+        setDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消全线扣车
+        cancelDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消上行扣车
+        cancelUpDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 取消下行扣车
+        cancelDownDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 添加计划车
+        addPlanTrain(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainAdd.doShow(operate);
+                }
+            });
+        },
+        // 平移计划车
+        translatPlanTrain(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainTranstalet.doShow(operate);
+                }
+            });
+        },
+        // 删除计划车
+        delPlanTrain(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDelete.doShow(operate);
+                }
+            });
+        },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        setAllCiAuto(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+                    const nextOperate = {
+                        operation: OperationEvent.Station.stationSetCIAuto.confirm.operation,
+                        message: `是否要执行批处理命令: 设置${station.name}自动通过进路`
+                    };
+                    this.$refs.operateConfirm.doShow(nextOperate);
+                }
+            });
+        },
+        setAllAutoControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+                    const nextOperate = {
+                        operation: OperationEvent.Station.atsAutoControlALL.confirm.operation,
+                        message: `是否要执行批处理命令: ${station.name}全站进路交自动控`
+                    };
+                    this.$refs.operateConfirm.doShow(nextOperate);
+                }
+            });
+        },
+        cancelAllCiAuto(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
+                    const nextOperate = {
+                        operation: OperationEvent.Station.stationCancelCIAuto.confirm.operation,
+                        message: `是否要执行批处理命令: 取消${station.name}自动通过进路`
+                    };
+                    this.$refs.operateConfirm.doShow(nextOperate);
+                }
+            });
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
index 6d5af5c37..ea3e602ea 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuAutoTrunRoute.vue
@@ -12,7 +12,8 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'MenuLimit',
@@ -26,37 +27,35 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
+            menuNormal: [
+                {
+                    label: '设置自动折返',
+                    handler: this.handlerTurnBack,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK,
+                    isDisabled: (selected, work) => {
+                        return selected.setUp === 1;
                     }
-                ],
-                Center: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
+                },
+                {
+                    label: '取消自动折返',
+                    handler: this.cancelTurnBack,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK,
+                    isDisabled: (selected, work) => {
+                        return selected.setUp === 0;
                     }
-                ]
-            }
+                }
+            ]
         };
     },
     computed: {
@@ -80,7 +79,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
index 8953ae76c..0cd208a99 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
@@ -13,7 +13,7 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
@@ -27,23 +27,26 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             menuForce:[],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '计轴复位',
-                        handler: this.handleAxleReset,
-                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-                    }
-                ],
-                Center: [
-                ]
-            }
+            menuNormal: [
+                {
+                    label: '计轴复位',
+                    handler: this.handleAxleReset,
+                    cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET,
+                    isShow: (selected, work) => work == 'localWork'
+                }
+            ]
         };
     },
     computed: {
@@ -67,7 +70,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
index e2c9d940e..7b0f2ea87 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
@@ -565,7 +565,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationControl.doShow(operate);
@@ -578,7 +578,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.areaSelection.doShow(operate);
@@ -592,7 +592,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.detainTrainContorl.doShow(operate);
@@ -606,7 +606,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.detainTrainContorl.doShow(operate);
@@ -620,7 +620,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.detainTrainContorlUpDown.doShow(operate);
@@ -634,7 +634,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.detainTrainContorlUpDown.doShow(operate);
@@ -647,7 +647,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainAdd.doShow(operate);
@@ -660,7 +660,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainTranstalet.doShow(operate);
@@ -673,7 +673,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate);
@@ -686,7 +686,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.manageUser.doShow(operate);
@@ -699,7 +699,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.helpAbout.doShow(operate);
@@ -711,7 +711,7 @@ export default {
                 type: 'bar',
                 operation: order.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
@@ -729,7 +729,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
@@ -747,7 +747,7 @@ export default {
                 operation: order.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
index 4afd52b95..8dc294630 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/areaSelection.vue
@@ -5,7 +5,7 @@
     :title="title"
     :visible.sync="show"
     width="650px"
-    :before-close="doClose"
+    :before-close="() => show=false"
     :show-close="true"
     :z-index="2000"
     :modal="false"
@@ -43,14 +43,14 @@
         </el-table>
       </el-col>
       <el-col :span="6">
-        <el-button style="width: 125px;margin-left: 10px;" @click="applyAll">全部申请</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" @click="cancelApplyAll">取消全部申请</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" @click="releaseAll">全部释放</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" @click="cancelReleaseAll">取消全部释放</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" :disabled="true" @click="distributionAll">全部强制分配</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" :disabled="true" @click="cancelDistributionAll">取消全部强制分配</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" @click="commit">应用</el-button>
-        <el-button style="width: 125px;margin-top: 10px;" @click="doClose">退出</el-button>
+        <el-button :id="getDomId('applyAll')" style="width: 125px;margin-left: 10px;" @click="applyAll">全部申请</el-button>
+        <el-button :id="getDomId('cancelApplyAll')" style="width: 125px;margin-top: 10px;" @click="cancelApplyAll">取消全部申请</el-button>
+        <el-button :id="getDomId('releaseAll')" style="width: 125px;margin-top: 10px;" @click="releaseAll">全部释放</el-button>
+        <el-button :id="getDomId('cancelReleaseAll')" style="width: 125px;margin-top: 10px;" @click="cancelReleaseAll">取消全部释放</el-button>
+        <el-button :id="getDomId('distributionAll')" style="width: 125px;margin-top: 10px;" :disabled="true" @click="distributionAll">全部强制分配</el-button>
+        <el-button :id="getDomId('cancelDistributionAll')" style="width: 125px;margin-top: 10px;" :disabled="true" @click="cancelDistributionAll">取消全部强制分配</el-button>
+        <el-button :id="commitDomId" style="width: 125px;margin-top: 10px;" @click="commit">应用</el-button>
+        <el-button :id="getDomId('doClose')" style="width: 125px;margin-top: 10px;" @click="doClose">退出</el-button>
       </el-col>
     </el-row>
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
@@ -67,6 +67,14 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             show: false,
@@ -79,7 +87,10 @@ export default {
     computed: {
         ...mapGetters('map', [
             'stationList'
-        ])
+        ]),
+        commitDomId() {
+            return this.show ? OperationEvent.Station.areaSelection.confirm.domId : '';
+        }
     },
     watch: {
         '$store.state.map.mapStateLoadedCount': function () {
@@ -99,38 +110,49 @@ export default {
         });
     },
     methods: {
+        getDomId(key) {
+            return this.show ? OperationEvent.Command.commandNingBo1[key].domId : '';
+        },
+        getOperation(key) {
+            return OperationEvent.Command.commandNingBo1[key] ? OperationEvent.Command.commandNingBo1[key].operation : '';
+        },
         doShow() {
             this.tableData = [];
-            this.$store.state.training.simulationUserList.forEach(item => {
-                if (item.type === 'STATION_SUPERVISOR' && item.userId == this.$store.state.user.id) {
-                    this.memberId = item.memberId;
-                    const centralizedStationCode = this.stationCentralizedMap[item.deviceCode];
-                    const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-                    this.$set(centralizedStation, 'apply', false);
-                    this.$set(centralizedStation, 'release', false);
-                    this.$set(centralizedStation, 'distribution', false);
-                    this.tableData.push(centralizedStation);
-                    centralizedStation.chargeStationCodeList.forEach(elem => {
-                        const station = this.$store.getters['map/getDeviceByCode'](elem);
-                        this.$set(station, 'apply', false);
-                        this.$set(station, 'release', false);
-                        this.$set(station, 'distribution', false);
-                        this.tableData.push(station);
-                    });
-                } else if (item.type === 'DISPATCHER' && item.userId == this.$store.state.user.id) {
-                    this.memberId = item.memberId;
-                    this.stationList.forEach(item => {
-                        this.$set(item, 'apply', false);
-                        this.$set(item, 'release', false);
-                        this.$set(item, 'distribution', false);
-                        this.tableData.push(item);
-                    });
-                }
-            });
+            if (this.$store.state.training.roles === 'STATION_SUPERVISOR') {
+                this.memberId = this.$store.state.training.myMemberId;
+                const centralizedStationCode = this.stationCentralizedMap[this.$store.state.training.roleDeviceCode];
+                const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
+                this.$set(centralizedStation, 'apply', false);
+                this.$set(centralizedStation, 'release', false);
+                this.$set(centralizedStation, 'distribution', false);
+                this.tableData.push(centralizedStation);
+                centralizedStation.chargeStationCodeList.forEach(elem => {
+                    const station = this.$store.getters['map/getDeviceByCode'](elem);
+                    this.$set(station, 'apply', false);
+                    this.$set(station, 'release', false);
+                    this.$set(station, 'distribution', false);
+                    this.tableData.push(station);
+                });
+            } else if (this.$store.state.training.roles === 'DISPATCHER') {
+                this.memberId = this.$store.state.training.myMemberId;
+                this.stationList.forEach(item => {
+                    this.$set(item, 'apply', false);
+                    this.$set(item, 'release', false);
+                    this.$set(item, 'distribution', false);
+                    this.tableData.push(item);
+                });
+            }
             this.show = true;
         },
         doClose() {
-            this.show = false;
+            const operate = {
+                operation: this.getOperation('doClose')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.show = false;
+                }
+            });
         },
         getControlStatus(code) {
             const newStation = this.$store.getters['map/getDeviceByCode'](code);
@@ -140,7 +162,7 @@ export default {
             const newStation = this.$store.getters['map/getDeviceByCode'](code);
             const centralizedStationCode = this.stationCentralizedMap[code];
             const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-            if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') {
+            if (this.work === 'localWork' && centralizedStation.controlMode === 'Center') {
                 return true;
             }
             if (type === 'apply') {
@@ -159,49 +181,91 @@ export default {
             }
         },
         applyAll() {
-            this.tableData.forEach(item => {
-                const centralizedStationCode = this.stationCentralizedMap[item.code];
-                const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-                const station = this.$store.getters['map/getDeviceByCode'](item.code);
-                if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') {
-                    item.apply = false;
-                } else if (station.controller !== this.memberId) {
-                    item.apply = true;
+            const operate = {
+                operation: this.getOperation('applyAll')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.tableData.forEach(item => {
+                        const centralizedStationCode = this.stationCentralizedMap[item.code];
+                        const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
+                        const station = this.$store.getters['map/getDeviceByCode'](item.code);
+                        if (this.work === 'localWork' && centralizedStation.controlMode === 'Center') {
+                            item.apply = false;
+                        } else if (station.controller !== this.memberId) {
+                            item.apply = true;
+                        }
+                    });
                 }
             });
         },
         cancelApplyAll() {
-            this.tableData.forEach(item => {
-                item.apply = false;
+            const operate = {
+                operation: this.getOperation('cancelApplyAll')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.tableData.forEach(item => {
+                        item.apply = false;
+                    });
+                }
             });
         },
         releaseAll() {
-            this.tableData.forEach(item => {
-                const centralizedStationCode = this.stationCentralizedMap[item.code];
-                const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
-                const station = this.$store.getters['map/getDeviceByCode'](item.code);
-                if (this.$store.state.training.prdType === '01' && centralizedStation.controlMode === 'Center') {
-                    item.apply = false;
-                } else if (station.controller === this.memberId) {
-                    item.release = true;
+            const operate = {
+                operation: this.getOperation('releaseAll')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.tableData.forEach(item => {
+                        const centralizedStationCode = this.stationCentralizedMap[item.code];
+                        const centralizedStation = this.$store.getters['map/getDeviceByCode'](centralizedStationCode);
+                        const station = this.$store.getters['map/getDeviceByCode'](item.code);
+                        if (this.work === 'localWork' && centralizedStation.controlMode === 'Center') {
+                            item.apply = false;
+                        } else if (station.controller === this.memberId) {
+                            item.release = true;
+                        }
+                    });
                 }
             });
         },
         cancelReleaseAll() {
-            this.tableData.forEach(item => {
-                item.release = false;
+            const operate = {
+                operation: this.getOperation('cancelReleaseAll')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.tableData.forEach(item => {
+                        item.release = false;
+                    });
+                }
             });
         },
         distributionAll() {
-            this.tableData.forEach(item => {
-                if (item.controller !== this.memberId) {
-                    item.distribution = true;
+            const operate = {
+                operation: this.getOperation('distributionAll')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.tableData.forEach(item => {
+                        if (item.controller !== this.memberId) {
+                            item.distribution = true;
+                        }
+                    });
                 }
             });
         },
         cancelDistributionAll() {
-            this.tableData.forEach(item => {
-                item.distribution = false;
+            const operate = {
+                operation: this.getOperation('cancelDistributionAll')
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.tableData.forEach(item => {
+                        item.distribution = false;
+                    });
+                }
             });
         },
         commit() {
@@ -231,7 +295,7 @@ export default {
                         stationCodes: paramsApplyStation
                     }
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {});
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {});
             } else if (paramsReleaseStation.length) {
                 const operate = {
                     over: true,
@@ -241,7 +305,7 @@ export default {
                         stationCodes: paramsReleaseStation
                     }
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {});
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {});
             } else if (paramsDistributionStation.length) {
                 const operate = {
                     over: true,
@@ -251,7 +315,7 @@ export default {
                         stationCodes: paramsDistributionStation
                     }
                 };
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {});
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {});
             }
         }
     }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
index e122f93f4..fd7b71d78 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -124,7 +124,7 @@ export default {
                 operate.operation = OperationEvent.StationControl.emergencyStationControl.confirm.operation;
             }
             this.doClose();
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
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 f03579a10..6921b8766 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 d73e4e9b8..9a6daaa74 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 137b4b562..d7db879ef 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue
index a06b3c3d4..aba7bc941 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -159,7 +159,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -183,7 +183,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     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 9af69080a..d9e8e0129 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -127,7 +127,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -155,7 +155,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -179,7 +179,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 a7c6cd128..8ccd0ebcd 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
@@ -99,7 +99,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
index 26d331934..b9e6fc52e 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
index baf35e28a..82c76f30f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
@@ -124,6 +124,12 @@ export default {
             controlTransferList.forEach(controlTransfer=>{
                 this.updateTableValue(controlTransfer);
             });
+        },
+        show(val) {
+            if (!val) {
+                this.stationType = '01';
+                this.station = {};
+            }
         }
     },
     methods: {
@@ -164,7 +170,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -176,7 +182,9 @@ export default {
             this.message = '';
             const operate = {
                 operation: OperationEvent.Command.order.choose1.operation,
-                val: this.stationCode
+                param: {
+                    stationCode: this.stationCode
+                }
             };
 
             // if (this.stationType == '01') {
@@ -187,7 +195,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose1.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.chooseStation.blur();
@@ -197,7 +205,9 @@ export default {
         handleChooseChangeControl() {
             const operate = {
                 operation: OperationEvent.Command.order.choose.operation,
-                val: this.stationCode
+                param: {
+                    stationType: this.stationType
+                }
             };
 
             // if (this.stationType == '01') {
@@ -208,7 +218,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -235,23 +245,29 @@ export default {
         },
         // 请求遥控
         conterCommit() {
-            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
-                this.doClose();
-                this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由站控转为遥控:\n' + this.stationName);
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 1).then((data) => {
+                if (data.valid) {
+                    this.doClose();
+                    this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由站控转为遥控:\n' + this.stationName);
+                }
             });
         },
         // 请求站控
         requestCommit() {
             commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
-                this.doClose();
-                this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
+                if (data.valid) {
+                    this.doClose();
+                    this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
+                }
             });
         },
         // 紧急站控
         emergencyCommit() {
             commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
-                this.doClose();
-                this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
+                if (data.valid) {
+                    this.doClose();
+                    this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
+                }
             });
         }
     }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
index b9972904c..358800c6c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 f67e2b02c..26e080c3f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
@@ -109,7 +109,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 d51571411..dacd96a96 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue b/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
index 1ccaf4623..f8f234ab4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuLimit.vue
@@ -11,7 +11,6 @@ import CancelAllLimit from '@/jmapNew/theme/components/menus/dialog/cancelAllLim
 import { mapGetters } from 'vuex';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -26,28 +25,25 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             systemName:'ningbo-01__systerm',
-            menuNormal: {
-                Local: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ]
-            }
+            menuNormal: [
+                {
+                    label: '取消全线临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
+                }
+            ]
         };
     },
     computed: {
@@ -71,7 +67,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
         },
         doShow(point) {
             this.initMenu();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
index e18266cee..a39c95cd8 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSection.vue
@@ -27,11 +27,12 @@ import ConfirmControl from '@/jmapNew/theme/components/menus/childDialog/confirm
 import OperateConfirm from './dialog/childDialog/operateConfirm';
 import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SectionMenu',
@@ -54,70 +55,82 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
+            menuNormal: [
+                {
+                    label: '封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Section.CMD_SECTION_BLOCK,
+                    isDisabled: (section, work) => {
+                        return section.blockade === 1;
                     },
-                    {
-                        label: '解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'localWork'
+                },
+                {
+                    label: '解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
+                    isDisabled: (section, work) => {
+                        return section.blockade !== 1;
                     },
-                    {
-                        type: 'separator'
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'localWork'
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '区故解',
+                    handler: this.fault,
+                    cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'localWork'
+                },
+                {
+                    label: '区段跟踪激活',
+                    handler: this.active,
+                    cmdType: CMD.Section.CMD_SECTION_ACTIVE,
+                    isDisabled: (section, work) => {
+                        return section.cutOff !== 1;
                     },
-                    {
-                        label: '区故解',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    isShow: (section, work) => ['01', '02'].includes(section.type)
+                },
+                {
+                    label: '区段跟踪切除',
+                    handler: this.split,
+                    cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
+                    isDisabled: (section, work) => {
+                        return section.cutOff === 1;
                     },
-                    {
-                        label: '区段跟踪激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '区段跟踪切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    }
-                ],
-                Center: [
-                    {
-                        label: '区段跟踪激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '区段跟踪切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: '确认计轴有效',
-                        handler: this.alxeEffective,
-                        cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    }
-                ]
-            },
+                    isShow: (section, work) => ['01', '02'].includes(section.type)
+                },
+                {
+                    label: '确认计轴有效',
+                    handler: this.alxeEffective,
+                    cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'dispatchWork'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'dispatchWork'
+                },
+                {
+                    label: '取消临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuSection.setFault'),
@@ -163,7 +176,7 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
                 cmdType: CMD.Section.CMD_Train_Init_Plan
@@ -174,7 +187,17 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                // this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                    if (menuItem.roleDisabled) {
+                        status = true;
+                    }
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
index e36ca86e6..b14e909e7 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSignal.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
-    <route-selection ref="routeSelection" />
+    <route-selection ref="routeSelection" :work="work" />
     <route-un-lock ref="routeUnLock" pop-class="ningbo-01__systerm" />
     <route-control ref="routeControl" pop-class="ningbo-01__systerm" />
     <route-hand-control ref="routeHandControl" system-name="ningbo-01__systerm" />
@@ -27,11 +27,12 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import OperateConfirm from './dialog/childDialog/operateConfirm';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import PasswordInput from './dialog/passwordInput';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SignalMenu',
@@ -54,131 +55,106 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '排列进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+            menuNormal: [
+                {
+                    label: '排列进路',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
+                },
+                {
+                    label: '取消列车进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                },
+                {
+                    label: '人解列车进路', // 信号机引导取消
+                    handler: this.humanTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+                },
+                {
+                    type: 'separator',
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '设置自动通过进路',
+                    handler: this.singalPassModel,
+                    isDisabled: (signal, work) => {
+                        return signal.fleetMode === 1;
                     },
-                    {
-                        label: '取消列车进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
+                },
+                {
+                    label: '取消自动通过进路',
+                    handler: this.singalCancelPassModel,
+                    isDisabled: (signal, work) => {
+                        return signal.fleetMode !== 1;
                     },
-                    {
-                        label: '人解列车进路', // 信号机引导取消
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
+                },
+                {
+                    type: 'separator',
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
+                },
+                {
+                    label: '封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => {
+                        return signal.blockade !== 0;
                     },
-                    {
-                        type: 'separator'
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => {
+                        return signal.blockade !== 1;
                     },
-                    {
-                        label: '设置自动通过进路',
-                        handler: this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '取消自动通过进路',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '引导',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路控制状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ],
-                Center: [
-                    {
-                        label: '排列进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消列车进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '人解列车进路', // 信号机引导取消
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '设置自动通过进路',
-                        handler: this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '取消自动通过进路',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '查询进路控制状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ]
-            },
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '引导',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    type: 'separator',
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '进路交人工控',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
+                },
+                {
+                    label: '进路交自动控',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
+                },
+                {
+                    label: '查询进路控制状态',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -224,7 +200,17 @@ export default {
     },
     methods: {
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
index 81679b079..6ff6e1741 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -18,10 +18,11 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperateMode, DeviceMenu, TrainingMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 // import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 export default {
     name: 'StationMenu',
     components: {
@@ -38,52 +39,59 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '全站设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '全站取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '上电解锁',
-                        handler: this.powerUnLock,
-                        cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK
-                    }
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '所有进路自排关',
-                        handler: this.humanControlALL,
-                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '所有进路自排开',
-                        handler: this.atsAutoControlALL,
-                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
-                    }
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '全站设置联锁自动触发',
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '全站取消联锁自动触发',
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '上电解锁',
+                    handler: this.powerUnLock,
+                    cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                // {
+                //     label: '执行关键操作测试',
+                //     handler: this.execKeyOperationTest,
+                //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
+                // }
+                {
+                    label: '所有进路自排关',
+                    handler: this.humanControlALL,
+                    cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '所有进路自排开',
+                    handler: this.atsAutoControlALL,
+                    cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                }
+                // {
+                //     label: '执行关键操作测试',
+                //     handler: this.execKeyOperationTest,
+                //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
+                // }
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -129,7 +137,17 @@ export default {
     methods: {
         initMenu() {
             if (this.selected.centralized) {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                // this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    let status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
+                    if (menuItem.roleDisabled) {
+                        status = true;
+                    }
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
                 if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                     const memberData = this.$store.state.training.memberData;
                     const userId = this.$store.state.user.id;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
index d2ff4a6c7..773f6261b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
@@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'StationControlMenu',
@@ -26,47 +26,43 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '紧急站控',
-                        handler: this.setEmergencyControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
-                    },
-                    {
-                        label: '请求站控',
-                        handler: this.setStationControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    },
-                    {
-                        label: '请求遥控',
-                        handler: this.setCenterControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
+            menuNormal: [
+                {
+                    label: '紧急站控',
+                    handler: this.setEmergencyControl,
+                    cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL,
+                    isDisabled: (selected, work) => {
+                        return selected.controlMode == 'Emergency';
                     }
-                ],
-                Center: [
-                    {
-                        label: '紧急站控',
-                        handler: this.setEmergencyControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
-                    },
-                    {
-                        label: '请求站控',
-                        handler: this.setStationControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    },
-                    {
-                        label: '请求遥控',
-                        handler: this.setCenterControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
+                },
+                {
+                    label: '请求站控',
+                    handler: this.setStationControl,
+                    cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL,
+                    isDisabled: (selected, work) => {
+                        return selected.controlMode == 'Local';
                     }
-                ]
-            },
+                },
+                {
+                    label: '请求遥控',
+                    handler: this.setCenterControl,
+                    cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
+                    isDisabled: (selected, work) => {
+                        return selected.controlMode == 'Center';
+                    }
+                }
+            ],
             menuForce: [
             ]
         };
@@ -92,7 +88,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -111,7 +113,7 @@ export default {
         },
         setCenterControl() {
             // 请求中控（遥控）
-            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'button'}).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.stationControl.doShow(operate, this.selected);
                 }
@@ -119,7 +121,7 @@ export default {
         },
         setStationControl() {
             // 请求站控
-            commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'button'}).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.stationControl.doShow(operate, this.selected);
                 }
@@ -127,7 +129,7 @@ export default {
         },
         setEmergencyControl() {
             // 紧急站控
-            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode: this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode: this.selected.code}, 0, {code: this.selected.code, subType: 'button'}).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.stationControl.doShow(operate, this.selected);
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
index 25e681b14..e14d34f52 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationLight.vue
@@ -14,10 +14,11 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperateConfirm from './dialog/childDialog/operateConfirm';
 import ButtonConfirm from './dialog/childDialog/buttonConfirm';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationStationLight',
@@ -33,27 +34,24 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置/取消强制点灯',
-                        handler: this.setOrCancelForceLight,
-                        cmdType: CMD.Station.CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置/取消强制点灯',
-                        handler: this.setOrCancelForceLight,
-                        cmdType: CMD.Station.CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置/取消强制点灯',
+                    handler: this.setOrCancelForceLight,
+                    cmdType: CMD.Station.CMD_STATION_SET_OR_CANCEL_FORCE_PHYSICAL_SIGNAL
+                }
+            ],
             menuForce: [
             ]
         };
@@ -79,7 +77,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const memberData = this.$store.state.training.memberData;
                 const userId = this.$store.state.user.id;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
index 8be512836..ffdfb9e00 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationPreReset.vue
@@ -11,9 +11,10 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ButtonDown from './dialog/buttonDown';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationControlLight',
@@ -21,43 +22,37 @@ export default {
         PopMenu,
         ButtonDown
     },
-	props: {
+    props: {
         selected: {
             type: Object,
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置',
-                        handler: this.setPreReset,
-                        cmdType: CMD.Station.CMD_STATION_PRE_RESET
-                    },
-                    {
-                        label: '取消',
-                        handler: this.cancelPreReset,
-                        cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET
-                    }
-                ],
-                Center: [
-                    // {
-                    //     label: '设置',
-                    //     handler: this.setPreReset,
-                    //     cmdType: CMD.Station.CMD_STATION_PRE_RESET
-                    // },
-                    // {
-                    //     label: '取消',
-                    //     handler: this.cancelPreReset,
-                    //     cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET
-                    // }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置',
+                    handler: this.setPreReset,
+                    cmdType: CMD.Station.CMD_STATION_PRE_RESET,
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '取消',
+                    handler: this.cancelPreReset,
+                    cmdType: CMD.Station.CMD_STATION_CANCEL_PRE_RESET,
+                    isShow: (selected, work) => work == 'localWork'
+                }
+            ],
             menuForce: [
             ]
         };
@@ -83,7 +78,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const memberData = this.$store.state.training.memberData;
                 const userId = this.$store.state.user.id;
@@ -111,7 +116,7 @@ export default {
         },
         setPreReset() {
             // 计轴复位
-            commitOperate(menuOperate.Station.setPreReset, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.Station.setPreReset, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'preReset'}).then(({valid, operate})=>{
                 if (valid) {
                     const nextOperate = {
                         operation: OperationEvent.Station.setPreReset.confirm.operation
@@ -122,7 +127,7 @@ export default {
         },
         cancelPreReset() {
             // 取消计轴复位
-            commitOperate(menuOperate.Station.cancelPreReset.operation, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'light'}).then(({valid, operate})=>{
+            commitOperate(menuOperate.Station.cancelPreReset.operation, {stationCode:this.selected.code}, 0, {code: this.selected.code, subType: 'preReset'}).then(({valid, operate})=>{
                 if (valid) {
                     const nextOperate = {
                         operation: OperationEvent.Station.cancelPreReset.confirm.operation
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
index cb60dd8b7..c9b43fea2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationStand.vue
@@ -26,7 +26,8 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationStandMenu',
@@ -47,97 +48,124 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+            menuNormal: [
+                {
+                    label: '扣车',
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => {
+                        const centralStation = this.$store.getters['map/getDeviceByCode'](stand.deviceStationCode);
+                        if (centralStation.controlMode === 'Center') {
+                            return stand.centerHoldTrain !== 0;
+                        } else {
+                            return stand.stationHoldTrain !== 0;
+                        }
                     },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    roleDisabled: this.work === 'dispatchWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => {
+                        const centralStation = this.$store.getters['map/getDeviceByCode'](stand.deviceStationCode);
+                        if (centralStation.controlMode === 'Center') {
+                            return stand.centerHoldTrain !== 1;
+                        } else {
+                            return stand.stationHoldTrain !== 1;
+                        }
                     },
-                    {
-                        label: '提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '站台详细信息',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
+                    roleDisabled: this.work === 'dispatchWork'
+                },
+                {
+                    label: '批量扣车',
+                    handler: this.setBulkBuckleTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '批量取消扣车',
+                    handler: this.cancelBulkBuckleTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '提前发车',
+                    handler: this.earlyDeparture,
+                    cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: (stand, work) => {
+                        return stand.trainParking !== 1;
                     }
-                ],
-                Center: [
-                    {
-                        label: '扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+                },
+                {
+                    label: '设置跳停',
+                    handler: this.setJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return stand.allSkip !== 0;
+                        }
                     },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '取消跳停',
+                    handler: this.cancelJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return stand.allSkip !== 1 && stand.assignSkip !== 1;
+                        }
                     },
-                    {
-                        label: '批量扣车',
-                        handler: this.setBulkBuckleTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL
-                    },
-                    {
-                        label: '批量取消扣车',
-                        handler: this.cancelBulkBuckleTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
-                    },
-                    {
-                        label: '提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: '设置停站时间',
-                        handler: this.setStopTime,
-                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '设置运行等级',
-                        handler: this.setRunLevel,
-                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: '区间列车数量限制',
-                        handler: this.setDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO
-                    },
-                    {
-                        label: '取消区间列车数量限制',
-                        handler: this.cancelDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
-                    },
-                    {
-                        label: '站台详细信息',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '设置停站时间',
+                    handler: this.setStopTime,
+                    cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '设置运行等级',
+                    handler: this.setRunLevel,
+                    cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '区间列车数量限制',
+                    handler: this.setDetainTrainAll,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '取消区间列车数量限制',
+                    handler: this.cancelDetainTrainAll,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '站台详细信息',
+                    handler: this.detail,
+                    cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -178,7 +206,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
index 9ccd09c1d..41d14abbf 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
@@ -12,8 +12,9 @@ import { mapGetters } from 'vuex';
 
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'MenuStationTurnBack',
@@ -27,27 +28,24 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置折返策略',
+                    handler: this.setBackStrategy,
+                    cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
+                }
+            ],
             menuForce: [
             ]
         };
@@ -73,7 +71,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
@@ -108,7 +116,7 @@ export default {
                 param: {stationCode: this.selected.stationCode}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$refs.stationBackStrategy.doShow(operate, this.selected);
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
index 591a663fe..154c82c76 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue
@@ -27,8 +27,9 @@ import { mapGetters } from 'vuex';
 
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode, TrainingMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SwitchMenu',
@@ -49,96 +50,111 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '定操',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '反操',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔封锁',
-                        handler: this.block,
-                        cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-                    },
-                    {
-                        label: '道岔解封',
-                        handler: this.unblock,
-                        cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
+            menuNormal: [
+                {
+                    label: '定操',
+                    handler: this.locate,
+                    cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: (station, work) => {
+                        return station.normalPosition === 1;
                     }
-                ],
-                Center: [
-                    {
-                        label: '定操',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '反操',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    // {
-                    //     label: '道岔单锁',
-                    //     handler: this.lock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    // },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '确认计轴有效',
-                        handler: this.alxeEffective,
-                        cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+                },
+                {
+                    label: '反操',
+                    handler: this.reverse,
+                    cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: (station, work) => {
+                        return station.reversePosition === 1;
                     }
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '查看公里标',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    // }
-                ]
-            },
+                },
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (station, work) => {
+                        return station.singleLock === 1;
+                    },
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (station, work) => {
+                        return station.singleLock !== 1;
+                    },
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '道岔封锁',
+                    handler: this.block,
+                    cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
+                    isDisabled: (station, work) => {
+                        return station.blockade === 1;
+                    },
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    label: '道岔解封',
+                    handler: this.unblock,
+                    cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
+                    isDisabled: (station, work) => {
+                        return station.blockade !== 1;
+                    },
+                    isShow: (selected, work) => work == 'localWork'
+                },
+                {
+                    type: 'separator',
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '区段激活',
+                    handler: this.active,
+                    cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '区段切除',
+                    handler: this.split,
+                    cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    type: 'separator',
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '确认计轴有效',
+                    handler: this.alxeEffective,
+                    cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isShow: (selected, work) => work == 'dispatchWork'
+                }
+                // {
+                //     type: 'separator'
+                // },
+                // {
+                //     label: '查看公里标',
+                //     handler: this.undeveloped,
+                //     cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
+                // }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -179,7 +195,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.$store.state.training.mode === TrainingMode.NORMAL) {
                 const station = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
                 const memberData = this.$store.state.training.memberData;
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
index 1251a633d..0848b0dad 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuTrain.vue
@@ -30,7 +30,7 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -55,150 +55,83 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '设置车组号',
-                        handler: this.addTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '删除车组号',
-                        handler: this.delTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '移动车组号',
-                        handler: this.moveTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '设置计划车',
-                        handler: this.setPlanTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-                    },
-                    {
-                        label: '设置头码车',
-                        handler: this.setHeadTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
-                    },
-                    {
-                        label: '设置人工车',
-                        handler: this.setWorkTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
-                    },
-                    {
-                        label: '设乘务组号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '标记ATP切除',
-                        handler: this.setTrainATPdel,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '标记ATP恢复',
-                        handler: this.setTrainATPRec,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '旅行冲突列车',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '列车信息',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置车组号',
+                    handler: this.addTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '删除车组号',
+                    handler: this.delTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '移动车组号',
+                    handler: this.moveTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '设置计划车',
+                    handler: this.setPlanTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+                },
+                {
+                    label: '设置头码车',
+                    handler: this.setHeadTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
+                },
+                {
+                    label: '设置人工车',
+                    handler: this.setWorkTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
+                },
+                {
+                    label: '设乘务组号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '标记ATP切除',
+                    handler: this.setTrainATPdel,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '标记ATP恢复',
+                    handler: this.setTrainATPRec,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '旅行冲突列车',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '列车信息',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -302,7 +235,12 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -449,7 +387,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -478,7 +416,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDefine.doShow(operate, this.selected);
@@ -495,7 +433,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate, this.selected);
@@ -512,7 +450,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(operate, this.selected);
@@ -527,7 +465,7 @@ export default {
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -542,7 +480,7 @@ export default {
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetHead.doShow(operate, this.selected);
@@ -559,7 +497,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWork.doShow(operate, this.selected);
@@ -576,7 +514,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
@@ -593,7 +531,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
index ef7b53afb..d63f77d70 100644
--- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -186,7 +186,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6f206a533..fcf1b6d5c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue
index aa774370c..550eb8e20 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue
@@ -291,7 +291,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.type = 'password';
@@ -313,7 +313,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.chooseStation.blur();
             });
@@ -330,7 +330,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.chooseSection.blur();
             });
@@ -355,7 +355,7 @@ export default {
             if (this.model.stationCode == this.model.confirmStationCode && this.model.sectionCode == this.model.confirmSectionCode) {
                 this.stepNum = 3;
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.type = 'text';
@@ -382,7 +382,7 @@ export default {
             };
 
             this.$store
-                .dispatch('training/nextNew', operate)
+                .dispatch('trainingNew/next', operate)
                 .then(({ valid }) => {
                     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 21de3a07f..4ee1f672f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 a2b5422be..d17cb9fa3 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -83,7 +83,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -102,7 +102,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/routerCommand.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/routerCommand.vue
index 558d0e4af..87ffe0b4f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/routerCommand.vue
@@ -126,7 +126,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/standBulkBuckleTrain.vue
index 2ec74594b..e16455353 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/standBulkBuckleTrain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/standBulkBuckleTrain.vue
@@ -204,7 +204,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -241,7 +241,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -259,7 +259,7 @@ export default {
             };
 
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
index cc506848f..321e6887a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
@@ -120,7 +120,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -152,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 5a073f00c..118a08a7c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue
@@ -116,7 +116,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -133,7 +133,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 5d6039626..a7e4c3e6d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue
@@ -120,7 +120,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -152,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetHead.vue
index 97b22964b..b7dad3a0a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetHead.vue
@@ -151,7 +151,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetPlan.vue
index 4c7dd7a09..7ce0cc2a5 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetPlan.vue
@@ -154,7 +154,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWork.vue
index 27933cb06..1b206cbfa 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWork.vue
@@ -114,7 +114,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 451bf2818..81f28d014 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue
@@ -115,7 +115,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -130,7 +130,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..e75c86aba
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenu.vue
@@ -0,0 +1,438 @@
+<template>
+  <div class="menus __socpe" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-limit ref="menuLimit" :selected="selected" :work="work" />
+    <!--<passive-alarm ref="passiveAlarm" />-->
+    <passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" :selected="selected" :work="work" />
+    <!--<passive-Timeout ref="passiveTimeout" />-->
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './dispatchWorkMenuBar';
+import MenuLimit from './menuLimit';
+// import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+// import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        MenuLimit,
+        // PassiveAlarm,
+        PassiveContorl
+        // PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            initCacheMap: {},
+            initInfo: {},
+            updateDone: 0,
+            work: 'dispatchWork'
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        isShowBar(val) {
+            val && this.$store.dispatch('config/updateMenuBar');
+        },
+        '$store.state.map.mapStateLoadedCount': function () {
+            this.$store.dispatch('map/flushMapRef');
+        }
+    },
+    mounted() {
+        this.$root.$on('iniCacheMap', (cmd, cacheMap) => {
+            this.initCacheMap[cmd] = cacheMap;
+        });
+        this.$root.$on('appendCache', (cmd, code, cache) => {
+            if (!this.initCacheMap[cmd]) {
+                this.initCacheMap[cmd] = {};
+            }
+            this.initCacheMap[cmd][code] = cache;
+        });
+        this.$root.$on('removeCache', (cmd, code) => {
+            if (this.initCacheMap[cmd]) {
+                delete this.initCacheMap[cmd][code];
+            }
+        });
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+                _that.$refs.menuLimit.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        this.$root.$off('iniCacheMap');
+        this.$root.$off('appendCache');
+        this.$root.$off('removeCache');
+        window.onclick = function (e) {};
+    },
+    methods: {
+        onUpdateDone() {
+            this.updateDone++;
+        },
+        onChangeInitInfo(initSelect, initParams) {
+            this.initInfo = {
+                initSelect,
+                initParams
+            };
+            this.updateDone++;
+        }
+    }
+};
+</script>
+
+<style>
+    .menus{
+        height:0px;
+    }
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .ningbo-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .ningbo-01__systerm .el-dialog {
+        background: rgba(100, 100, 100, 0.3);
+        border: 2px solid rgba(144, 144, 144, 0.8);
+        border-radius: 6px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__header {
+        padding: 10px;
+        height: 26px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__footer {
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__body {
+        padding: 10px;
+        margin: 5px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__title {
+        position: absolute;
+        top: 6px;
+        color: #000;
+        border-radius: 4px;
+        padding: 0px 2px;
+        height: 20px;
+        line-height: 20px
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__title::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        filter: blur(7px);
+        height: 20px;
+        width: -webkit-fill-available;
+        background: rgba(190, 190, 190, 0.8);
+        z-index: -1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 5px;
+        right: 5px;
+        line-height: 18px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .ningbo-01__systerm .el-dialog .expand {
+        width: 120px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+        background: #fff !important;
+        border-right: 1px solid #fff !important;
+        border-bottom: 1px solid #EBEEF5 !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+        border-right: 1px solid #e2e2e2 !important;
+    }
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+        border-right: 1px solid #e2e2e2 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: #F0F0F0;
+        padding: 0 5px;
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .ningbo-01__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .ningbo-01__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .ningbo-01__systerm .el-dialog .button-group {
+        margin-top: 10px;
+    }
+</style>
+<style lang="scss">
+	.__socpe {
+		.el-dialog,
+		.el-dialog__wrapper {
+			// pointer-events: none !important;
+		}
+
+		.el-dialog__header,
+		.el-dialog__body {
+			pointer-events: all !important;
+		}
+	}
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..ace7351c6
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,1872 @@
+<template>
+  <div>
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" :is-next-btn="true" />
+    <!-- <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" /> -->
+    <arrange-route ref="arrangeRoute" />
+    <train-distribution ref="trainDistribution" />
+    <stand-control ref="standControl" />
+    <stand-detain ref="standDetain" />
+    <stand-detail ref="standDetail" />
+    <interval-stop-number ref="intervalStopNumber" />
+    <allocate-time ref="allocateTime" />
+    <station-transfer ref="stationTransfer" :work="work" />
+    <station-request ref="stationRequest" :work="work" />
+    <station-devolution ref="stationDevolution" :work="work" />
+    <station-reclaim ref="stationReclaim" :work="work" />
+    <switch-command ref="switchCommand" />
+    <switch-active ref="switchActive" />
+    <switch-detail ref="switchDetail" />
+    <signal-model ref="signalModel" />
+    <signal-detail ref="signalDetail" />
+    <section-show ref="sectionShow" />
+    <section-lock ref="sectionLock" />
+
+    <running-interval ref="runningInterval" />
+    <adjust-strategy ref="adjustStrategy" />
+    <train-depart ref="trainDepart" />
+    <train-jump-stop ref="trainJumpStop" />
+    <train-cancel-deviation ref="trainCancelDeviation" />
+    <train-update-deviation ref="trainUpdateDeviation" />
+    <train-id-associated ref="trainIdAssociated" />
+    <occupancy-train-correlation ref="occupancyTrainCorrelation" />
+    <modify-train-number ref="modifyTrainNumber" />
+    <train-run-type ref="trainRunType" />
+    <train-detail ref="trainDetail" />
+    <all-train-detail ref="allTrainDetail" />
+    <cancel-route ref="cancelRoute" />
+    <route-detail ref="routeDetail" />
+    <route-command ref="routeCommand" />
+
+    <switch-block-init ref="switchBlockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <switch-block-sure ref="switchBlockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <signal-guide-init ref="signalGuideInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-guide-sure ref="signalGuideSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+    <cancle-signal-guide ref="cancleSignalGuide" />
+
+    <signal-can-block-init ref="signalCanBlockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-can-block-sure ref="signalCanBlockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <signal-block-init ref="signalBlockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-block-sure ref="signalBlockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <section-open-init ref="sectionOpenInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <section-open-sure ref="sectionOpenSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <signal-mode-init ref="signalModeInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-mode-sure ref="signalModeSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <section-limit-speed-init ref="sectionLimitSpeedInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <section-limit-speed-sure ref="sectionLimitSpeedSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <cancel-transfer-lock-init ref="cancelTransferLockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <cancel-transfer-lock-sure ref="cancelTransferLockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <cancel-switch-lock-init ref="cancelSwitchLockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <cancel-switch-lock-sure ref="cancelSwitchLockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <remote-reset-func-sure ref="remoteResetFuncInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <remote-reset-func-sure ref="remoteResetFuncSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import ArrangeRoute from './menuDialog/arrangeRoute';
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import TrainDistribution from './menuDialog/trainDistribution';
+import StandControl from './menuDialog/standControl';
+import StandDetain from './menuDialog/standDetain';
+import StandDetail from './menuDialog/standDetail';
+import IntervalStopNumber from './menuDialog/intervalStopNumber';
+import AllocateTime from './menuDialog/allocateTime';
+import StationTransfer from './menuDialog/stationTransfer';
+import StationRequest from './menuDialog/stationRequest';
+import StationDevolution from './menuDialog/stationDevolution';
+import StationReclaim from './menuDialog/stationReclaim';
+import SwitchCommand from './menuDialog/switchCommand';
+import RouteCommand from './menuDialog/routeCommand';
+import SwitchActive from './menuDialog/switchActive';
+import SwitchDetail from './menuDialog/switchDetail';
+import SectionShow from './menuDialog/sectionShow';
+import SectionLock from './menuDialog/sectionLock';
+import SignalModel from './menuDialog/signalModel';
+import SignalDetail from './menuDialog/signalDetail';
+import RunningInterval from './menuDialog/runningInterval';
+import AdjustStrategy from './menuDialog/adjustStrategy';
+import TrainDepart from './menuDialog/trainDepart';
+import TrainJumpStop from './menuDialog/trainJumpStop';
+import TrainCancelDeviation from './menuDialog/trainCancelDeviation';
+import TrainUpdateDeviation from './menuDialog/trainUpdateDeviation';
+import CancelRoute from './menuDialog/cancelRoute';
+import TrainIdAssociated from './menuDialog/trainIdAssociated';
+import OccupancyTrainCorrelation from './menuDialog/occupancyTrainCorrelation';
+import ModifyTrainNumber from './menuDialog/modifyTrainNumber';
+import TrainRunType from './menuDialog/trainRunType';
+import TrainDetail from './menuDialog/trainDetail';
+import AllTrainDetail from './menuDialog/allTrainDetail';
+import RouteDetail from './menuDialog/routeDetail';
+import SwitchBlockInit from './menuDialog/switchBlock';
+import SwitchBlockSure from './menuDialog/switchBlock';
+import SignalGuideInit from './menuDialog/signalGuide';
+import SignalGuideSure from './menuDialog/signalGuide';
+import CancleSignalGuide from './menuDialog/cancleSignalGuide';
+import SignalCanBlockInit from './menuDialog/signalCanBlock';
+import SignalCanBlockSure from './menuDialog/signalCanBlock';
+import SectionOpenInit from './menuDialog/sectionOpen';
+import SectionOpenSure from './menuDialog/sectionOpen';
+import SectionLimitSpeedInit from './menuDialog/sectionLimitSpeed';
+import SectionLimitSpeedSure from './menuDialog/sectionLimitSpeed';
+import SignalBlockInit from './menuDialog/signalBlock';
+import SignalBlockSure from './menuDialog/signalBlock';
+import SignalModeInit from './menuDialog/signalMode';
+import SignalModeSure from './menuDialog/signalMode';
+import CancelTransferLockInit from './menuDialog/cancelTransferLock';
+import CancelTransferLockSure from './menuDialog/cancelTransferLock';
+import CancelSwitchLockInit from './menuDialog/cancelSwitchLock';
+import CancelSwitchLockSure from './menuDialog/cancelSwitchLock';
+import RemoteResetFuncInit from './menuDialog/remoteResetFunc';
+import RemoteResetFuncSure from './menuDialog/remoteResetFunc';
+
+export default {
+    name: 'DispatchWorkMenuBar',
+    components: {
+        MenuBar,
+        ArrangeRoute,
+        TrainDistribution,
+        StandControl,
+        StandDetain,
+        IntervalStopNumber,
+        AllocateTime,
+        StationTransfer,
+        StationRequest,
+        StationDevolution,
+        StationReclaim,
+        StandDetail,
+        SwitchCommand,
+        SwitchBlockInit,
+        SwitchBlockSure,
+        SwitchActive,
+        SwitchDetail,
+        SignalGuideInit,
+        SignalGuideSure,
+        SignalCanBlockInit,
+        SignalCanBlockSure,
+        RouteCommand,
+        SignalModel,
+        SignalBlockInit,
+        SignalBlockSure,
+        SignalDetail,
+        SectionOpenInit,
+        SectionOpenSure,
+        SectionLimitSpeedInit,
+        SectionLimitSpeedSure,
+        SectionShow,
+        SectionLock,
+        SignalModeInit,
+        CancelTransferLockInit,
+        CancelTransferLockSure,
+        CancelSwitchLockInit,
+        CancelSwitchLockSure,
+        RemoteResetFuncInit,
+        RemoteResetFuncSure,
+        SignalModeSure,
+        RunningInterval,
+        AdjustStrategy,
+        TrainDepart,
+        TrainJumpStop,
+        TrainCancelDeviation,
+        TrainUpdateDeviation,
+        CancelRoute,
+        TrainIdAssociated,
+        OccupancyTrainCorrelation,
+        ModifyTrainNumber,
+        TrainRunType,
+        TrainDetail,
+        AllTrainDetail,
+        RouteDetail,
+        CancleSignalGuide
+    },
+    props: {
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default() {
+                return 0;
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            beCentralizedStation:{},
+            menuNormal: [
+                // {
+                //     title: '窗口(W)',
+                //     operate: '',
+                //     children: [
+                //         {
+                //             title: '报警',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '时刻表信息',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '性能工具',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '用户权限',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '系统状态',
+                //             click: this.undeveloped
+                //         }
+                //     ]
+                // },
+                {
+                    title: '列车(T)',
+                    // operate: OperationEvent.Command.mBar.train,
+                    operate: OperationEvent.Command.commandNingBo3.train,
+                    children: [
+                        {
+                            title: '排列进路到',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '站台',
+                                    operate: OperationEvent.Signal.arrangementRoute.toStand,
+                                    click: this.handleArrangeRoute
+                                },
+                                {
+                                    title: '信号机',
+                                    operate: OperationEvent.Signal.arrangementRoute.toSignal,
+                                    click: this.handleArrangeRoute
+                                }
+                            ]
+                        },
+                        {
+                            title: '分配',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '运行线',
+                                    operate: OperationEvent.Train.destinationTrainId.menu,
+                                    click: this.handleTrainDistributionRunLine
+                                },
+                                {
+                                    title: '班次',
+                                    operate: OperationEvent.Train.trainDistribute.menu,
+                                    click: this.handleTrainDistributionClass
+                                },
+                                {
+                                    title: '往返',
+                                    operate:'',
+                                    click: this.handleTrainDistributionBack
+                                }
+                            ]
+                        },
+                        {
+                            title: '操作',
+                            operate: OperationEvent.Command.commandNingBo3.train_operate,
+                            children: [
+                                {
+                                    title: '发车',
+                                    operate:OperationEvent.Train.setTrainDeparture.menu,
+                                    click: this.setTrainDepart
+                                },
+                                {
+                                    title: '脱离班次',
+                                    operate:'',
+                                    click: this.breakAway
+                                },
+                                {
+                                    title: '复位',
+                                    operate:'',
+                                    click: this.setTrainReset
+                                },
+                                {
+                                    title: '跳停',
+                                    operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
+                                    click: this.setJumpStop
+                                },
+                                {
+                                    title: '设置/取消偏离',
+                                    operate:'',
+                                    click: this.cancelDeviation
+                                },
+                                {
+                                    title: '更新偏差',
+                                    operate:'',
+                                    click: this.updateDeviation
+                                },
+                                {
+                                    title: '取消CBTC列车进路',
+                                    operate:'',
+                                    click: this.cancelCbtcRoute
+                                }
+                                // {
+                                //     title: 'VOBC切换',
+                                //     click: this.undeveloped
+                                // },
+                                // {
+                                //     title: '远程VOBC复位',
+                                //     click: this.undeveloped
+                                // }
+                            ]
+                        },
+                        {
+                            title: '定义',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '列车ID号关联',
+                                    operate:'',
+                                    click: this.setIdAssociated
+                                },
+                                {
+                                    title: '列车占用关联',
+                                    operate:'',
+                                    click: this.setOccupancyCorrelation
+                                },
+                                {
+                                    title: '修改列车描述号',
+                                    operate:'',
+                                    click: this.modifyTrainNumber
+                                }
+                            ]
+                        },
+                        {
+                            title: '设置',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '运行类型',
+                                    operate:'',
+                                    click: this.setRunType
+                                },
+                                {
+                                    title: '记事薄',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '显示',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '详细列车信息',
+                                    operate:'',
+                                    click: this.showTrainDetail
+                                },
+                                {
+                                    title: '所有列车',
+                                    operate:'',
+                                    click: this.showAllTrainDetail
+                                },
+                                {
+                                    title: 'CBTC进路信息',
+                                    operate:'',
+                                    click: this.showRouteDetail
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    title: '线路(G)',
+                    operate: OperationEvent.Command.commandNingBo3.line,
+                    children: [
+                        {
+                            title: '站台',
+                            operate: OperationEvent.Command.commandNingBo3.line_stand,
+                            children: [
+                                {
+                                    title: '开放/关闭',
+                                    click: this.standOpenOrClose,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose
+                                },
+                                {
+                                    title: '设置/取消扣车',
+                                    click: this.setStandDetain,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot
+                                },
+                                {
+                                    title: '设置站间列车数量',
+                                    click: this.undeveloped,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum
+                                },
+                                {
+                                    title: '分配停站时间',
+                                    click: this.setAllocateTime,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime
+                                },
+                                {
+                                    title: '授权转移',
+                                    click: this.authorizeTransfer,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_transfer
+                                },
+                                {
+                                    title: '显示',
+                                    click: this.showStandDetail,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_detail
+                                }
+                            ]
+                        },
+                        {
+                            title: '道岔',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch,
+                            children: [
+                                {
+                                    title: '命令',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
+                                    click: this.setSwitchCommand
+                                },
+                                {
+                                    title: '封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_block,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_init,
+                                            click: e => this.setBlockSwitch(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_sure,
+                                            click: e => this.setBlockSwitch(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '解除封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_unblock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_init,
+                                            click: e => this.setUnblockSwitch(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_sure,
+                                            click: e => this.setUnblockSwitch(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '请求动岔',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_empower,
+                                    children: [
+                                        {
+                                            title: '请求或授权/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_init,
+                                            click: this.setSwitchActive
+                                        },
+                                        {
+                                            title: '显示',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_sure
+
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '显示',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
+                                    click: this.showSwitchDetail
+                                }
+                            ]
+                        },
+                        {
+                            title: '信号机',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal,
+                            children: [
+
+                                {
+                                    title: '引导',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_guide,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_guide_init,
+                                            click: e => this.setSignalGuide(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_guide_sure,
+                                            click: e => this.setSignalGuide(e, true)
+                                        },
+                                        {
+                                            title: '清除',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_guide_clear,
+                                            click: this.cancleSignalGuide
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '取消允许锁闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot_init,
+                                            click: e => this.setSignalCanBlock(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot_sure,
+                                            click: e => this.setSignalCanBlock(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '进路',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_route,
+                                    children: [
+                                        {
+                                            title: '命令',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_route_cmd,
+                                            click: this.setRouteCommand
+                                        },
+                                        {
+                                            title: '显示',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_route_show,
+                                            children: [
+                                                {
+                                                    title: 'CBTC进路信息',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_signal_route_cbtc
+                                                },
+                                                {
+                                                    title: '后备进路信息',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_signal_route_reserve
+                                                }
+                                            ]
+
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '信号指示模式',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_indicator,
+                                    click: this.setSignalModel
+                                },
+                                {
+                                    title: '封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_block,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
+                                            click: e => this.setSignalBlock(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
+                                            click: e => this.setSignalBlock(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '解除封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_unblock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
+                                            click: e => this.setSignalCancelBlock(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
+                                            click: e => this.setSignalCancelBlock(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '显示',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
+                                    click: this.showSignalDetail
+                                }
+                            ]
+                        },
+                        {
+                            title: '轨道',
+                            operate: OperationEvent.Command.commandNingBo3.line_section,
+                            children: [
+                                {
+                                    title: '开放',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_open,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_open_init,
+                                            click: e => this.setOpenSection(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_open_sure,
+                                            click: e => this.setOpenSection(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '关闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_close,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_close_init,
+                                            click: e => this.setCloseSection(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_close_sure,
+                                            click: e => this.setCloseSection(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '临时限速',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed,
+                                    children: [
+                                        {
+                                            title: '设置',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed,
+                                            children: [
+                                                {
+                                                    title: '初始化',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_init,
+                                                    click: e => this.setLimitSpeed(e, false)
+                                                },
+                                                {
+                                                    title: '确定/取消',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure,
+                                                    click: e => this.setLimitSpeed(e, true)
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            title: '清除',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed,
+                                            children: [
+                                                {
+                                                    title: '初始化',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init,
+                                                    click: e => this.setLimitSpeed(e, false)
+                                                },
+                                                {
+                                                    title: '确定/取消',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure,
+                                                    click: e => this.setLimitSpeed(e, true)
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '显示',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_detail,
+                                    click: this.handleSectionShow
+                                }
+                            ]
+                        },
+                        {
+                            title: '闭塞区段',
+                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock,
+                            children: [
+                                {
+                                    title: '取消转换锁闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelTransferLock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelTransferLock_init,
+                                            click: e => { this.setCancelTransferLock(e, false); }
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelTransferLock_sure,
+                                            click: e => { this.setCancelTransferLock(e, true); }
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '取消过岔锁闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelSwitchLock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelSwitchLock_init,
+                                            click: e => { this.setCancelSwitchLock(e, false); }
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelSwitchLock_sure,
+                                            click: e => { this.setCancelSwitchLock(e, true); }
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '远程预复位使能',
+                                    operate: OperationEvent.Command.commandNingBo3.line_sectionLock_remoteResetFunc,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_remoteResetFunc_init,
+                                            click: e => { this.setRemoteResetFunc(e, false); }
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_remoteResetFunc_sure,
+                                            click: e => { this.setRemoteResetFunc(e, true); }
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '复位',
+                                    operate:'',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '进入点',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '自动进路',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '运行线',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '设置/取消偏离',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: 'UPS',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '运行超时',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '设置容忍度',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '信号模式',
+                            operate: '',
+                            children: [
+                                {
+                                    title: 'CBTC',
+                                    operate:'',
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '后备',
+                                    operate:'',
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            title: 'PMI',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        // {
+                        //     title: '试车线',
+                        //     operate: '',
+                        //     children: [
+                        //         {
+                        //             title: '开始测试',
+                        //             click: this.undeveloped
+                        //         },
+                        //         {
+                        //             title: '结束测试',
+                        //             click: this.undeveloped
+                        //         },
+                        //         {
+                        //             title: '显示',
+                        //             click: this.undeveloped
+                        //         }
+                        //     ]
+                        // },
+                        {
+                            title: '系统扣车',
+                            operate:'',
+                            click: this.setSystemDetain
+                        },
+                        {
+                            title: '修改自动分配',
+                            operate:'',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '防淹门',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '坡道',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '弯道',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    title: '调整(R)',
+                    operate: '',
+                    children: [
+                        {
+                            title: '固定列车间隔',
+                            operate:'',
+                            click: this.setRunningInterval
+                        },
+                        {
+                            title: '调整策略',
+                            operate:'',
+                            click: this.adjustStrategy
+                        }
+                    ]
+                },
+                {
+                    title: '视图(R)',
+                    operate: '',
+                    children: [
+                        {
+                            title: '缩放',
+                            operate:'',
+                            click: this.undeveloped,
+                            children:[]
+                        },
+                        {
+                            title: '修改可见性',
+                            operate:'',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '允许显示',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '停站倒计时',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    title: '用户权限(U)',
+                    operate: OperationEvent.Command.mBar.userManage,
+                    children: [
+                        {
+                            title: '转移控制',
+                            operate: OperationEvent.Command.commandNingBo3.line_user,
+                            children: [
+                                {
+                                    title: '请求区域控制权',
+                                    click: this.authorizeRequest,
+                                    operate: OperationEvent.Command.commandNingBo3.line_user_request
+                                },
+                                {
+                                    title: '授权转移',
+                                    click: this.authorizeTransfer,
+                                    operate: OperationEvent.Command.commandNingBo3.line_user_transfer
+                                }
+                                // {
+                                //     title: '下放站控',
+                                //     click: this.authorizeDevolution,
+                                //     operate: OperationEvent.Command.commandNingBo3.line_user_devolution
+                                // },
+                                // {
+                                //     title: '收回站控',
+                                //     click: this.authorizeReclaim,
+                                //     operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
+                                // }
+                            ]
+                        }
+                    ]
+                }
+                // {
+                //     title: '视图(V)',
+                //     operate: '',
+                //     children: [
+                //         {
+                //             title: '缩放',
+                //             operate: '',
+                //             children: [
+                //                 {
+                //                     title: '全部',
+                //                     click: this.undeveloped
+                //                 }
+                //             ]
+                //         },
+                //         {
+                //             title: '修改可见性',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '允许显示',
+                //             operate: '',
+                //             children: [
+                //                 {
+                //                     title: '停站到计时',
+                //                     click: this.undeveloped
+                //                 }
+                //             ]
+                //         }
+                //     ]
+                // }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
+    },
+    watch: {
+        '$store.state.training.changeRoleInfo':function(newval, oldval) {
+            this.checkRoleChange(oldval, newval);
+        },
+        '$store.state.menuOperation.leftClickCount': function (val) {
+            this.selectedChange();
+        }
+
+    },
+    mounted() {
+        // 被控制的车站数据
+        this.stationList.forEach(data=>{
+            if (data.centralized) {
+                data.chargeStationCodeList.forEach(charge=>{
+                    this.beCentralizedStation[charge] = data.code;
+                });
+            }
+        });
+        // this.$root.$on('iniCacheMap', (cmd, cacheMap) => {
+        //     this.initCacheMap[cmd] = cacheMap;
+        // });
+        // this.$root.$on('appendCache', (cmd, code, cache) => {
+        //     if (!this.initCacheMap[cmd]) {
+        //         this.initCacheMap[cmd] = {};
+        //     }
+        //     this.initCacheMap[cmd][code] = cache;
+        // });
+        // this.$root.$on('removeCache', (cmd, code) => {
+        //     if (this.initCacheMap[cmd]) {
+        //         delete this.initCacheMap[cmd][code];
+        //     }
+        // });
+    },
+    beforeDestroy() {
+        // this.$root.$off('iniCacheMap');
+        // this.$root.$off('appendCache');
+        // this.$root.$off('removeCache');
+    },
+    methods: {
+        onUpdateDone() {
+            this.$emit('onUpdateDone');
+        },
+        onChangeInitInfo(initSelect, initParams) {
+            this.$emit('onChangeInitInfo', initSelect, initParams);
+        },
+        selectedChange() {
+            const model = this.$store.state.menuOperation.selected;
+            const memberData = this.$store.state.training.memberData;
+            if (model && model._type && model._type == 'Station' && model.controlApplicant &&
+            model.controller && memberData[model.controller].userId == this.$store.state.user.id) {
+                const item = {operate: OperationEvent.Command.commandNingBo3.line_stand_transfer};
+                this.authorizeTransfer(item);
+            }
+        },
+        checkRoleChange(oldval, newval) {
+            this.$nextTick(()=>{
+                const memberData = this.$store.state.training.memberData;
+                if (oldval && newval) {
+                    const oldMemberId = oldval.split(':')[0];
+                    const newMemberId = newval.split(':')[1];
+                    if (oldMemberId && oldMemberId != newMemberId) {
+                        const oldMember = memberData[oldMemberId];
+                        const newMember = memberData[newMemberId];
+                        if (oldMember.type == 'STATION_SUPERVISOR' && newMember.type == 'STATION_SUPERVISOR') {
+                            const oldStation = this.$store.getters['map/getDeviceByCode'](oldMember.deviceCode);
+                            const newStation = this.$store.getters['map/getDeviceByCode'](newMember.deviceCode);
+                            if (oldStation.controller || newStation.controller) {
+                                if (newStation.controller) {
+                                    let centerStation;
+                                    if (newStation.centralized) {
+                                        centerStation = newStation;
+                                    } else {
+                                        const newCenter = this.$store.getters['map/getDeviceByCode'](this.beCentralizedStation[newMember.deviceCode]);
+                                        centerStation = newCenter;
+                                    }
+                                    if (centerStation && centerStation.instance) {
+                                        centerStation.instance.handleComplexControl(newStation.controller);
+                                        centerStation.instance.handleEmergencyChange(newStation.emergencyController);
+                                    }
+                                    centerStation.chargeStationCodeList.forEach(item => {
+                                        const device = this.$store.getters['map/getDeviceByCode'](item);
+                                        if (device && device.instance) {
+                                            device.instance.handleComplexControl(newStation.controller);
+                                            device.instance.handleEmergencyChange(newStation.emergencyController);
+                                        }
+                                    });
+                                }
+                            }
+                        }
+                        // if (oldMember.type == 'DISPATCHER' && newMember.type == 'DISPATCHER') {
+                        // }else if(oldMember.type == 'DISPATCHER' && newMember.type == 'DISPATCHER'){
+                        // }
+                    }
+                }
+                // else if (oldval) {
+
+                // } else {
+
+                // }
+            });
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        handleArrangeRoute(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.arrangeRoute.doShow(operate);
+                }
+            });
+        },
+        handleTrainDistributionRunLine(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDistribution.doShow(operate, 'first');
+                }
+            });
+        },
+        handleTrainDistributionClass(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDistribution.doShow(operate, 'third');
+                }
+            });
+        },
+        handleTrainDistributionBack(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDistribution.doShow(operate, 'second');
+                }
+            });
+        },
+        // 站台开放/关闭
+        standOpenOrClose(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow();
+                }
+            });
+        },
+        // 站台扣车
+        setStandDetain(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standDetain.doShow({active:'first'});
+                }
+            });
+        },
+        setIntervalStopNumber(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.intervalStopNumber.doShow();
+                }
+            });
+        },
+        // 停站时间
+        setAllocateTime(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.allocateTime.doShow();
+                }
+            });
+        },
+        // 控制权转移
+        authorizeTransfer(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationTransfer.doShow();
+                }
+            });
+        },
+        // 请求区域控制权
+        authorizeRequest(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationRequest.doShow();
+                }
+            });
+        },
+        // 下放站控
+        authorizeDevolution(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationDevolution.doShow();
+                }
+            });
+        },
+        // 收回站控
+        authorizeReclaim(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationReclaim.doShow();
+                }
+            });
+        },
+        showStandDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standDetail.doShow();
+                }
+            });
+        },
+        setSwitchCommand(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.switchCommand.doShow();
+                }
+            });
+        },
+        // 道岔封锁
+        setBlockSwitch(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'switchBlockSure' : 'switchBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        // 道岔解除封锁
+        setUnblockSwitch(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'switchBlockSure' : 'switchBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        // 道岔授权
+        setSwitchActive(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) =>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.switchActive.doShow();
+                }
+            });
+        },
+        // 道岔显示详情
+        showSwitchDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.switchDetail.doShow();
+                }
+            });
+        },
+        // 进路指令
+        setRouteCommand(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.routeCommand.doShow();
+                }
+            });
+        },
+        // 信号引导
+        setSignalGuide(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalGuideSure' : 'signalGuideInit'].doShow(operate, sure);
+                }
+            });
+        },
+        cancleSignalGuide(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs['cancleSignalGuide'].doShow(operate);
+                    // this.$refs[sure ? 'signalGuideSure' : 'signalGuideInit'].doShow(operate, sure);
+                }
+            });
+        },
+
+        setSignalCanBlock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalCanBlockSure' : 'signalCanBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setOpenSection(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'sectionOpenSure' : 'sectionOpenInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setCancelTransferLock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'cancelTransferLockSure' : 'cancelTransferLockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setCancelSwitchLock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'cancelSwitchLockSure' : 'cancelSwitchLockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setRemoteResetFunc(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'remoteResetFuncSure' : 'remoteResetFuncInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setCloseSection(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'sectionOpenSure' : 'sectionOpenInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setLimitSpeed(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'sectionLimitSpeedSure' : 'sectionLimitSpeedInit'].doShow(operate, sure);
+                }
+            });
+        },
+        handleSectionShow(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionShow.doShow();
+                }
+            });
+        },
+        handleLock(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        handleUnLock(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        handleRestoration(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        handleSectionRestoration(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        setSignalModel(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.signalModel.doShow();
+                }
+            });
+        },
+        handleSectionStopShow(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        setSignalBlock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalBlockSure' : 'signalBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setSignalCancelBlock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalBlockSure' : 'signalBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        showSignalDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.signalDetail.doShow(operate);
+                }
+            });
+        },
+        setCbtcMode(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.initSignalMode.doShow(operate);
+                }
+            });
+        },
+        setReserveMode(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalModeSure' : 'signalModeInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setSystemDetain(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    // this.$refs.systemDetain.doShow(operate);
+                    this.$refs.standDetain.doShow({active:'second'});
+                }
+            });
+        },
+        setRunningInterval(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.runningInterval.doShow(operate);
+                }
+            });
+        },
+        adjustStrategy(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.adjustStrategy.doShow(operate);
+                }
+            });
+        },
+        setTrainDepart(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDepart.doShow(operate);
+                }
+            });
+        },
+        breakAway(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDepart.doShow(operate);
+                }
+            });
+        },
+        setTrainReset(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDepart.doShow(operate);
+                }
+            });
+        },
+        setJumpStop(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainJumpStop.doShow(operate);
+                }
+            });
+        },
+        cancelDeviation(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainCancelDeviation.doShow(operate);
+                }
+            });
+        },
+        updateDeviation(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainUpdateDeviation.doShow(operate);
+                }
+            });
+        },
+        cancelCbtcRoute(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.cancelRoute.doShow(operate);
+                }
+            });
+        },
+        setIdAssociated(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainIdAssociated.doShow(operate);
+                }
+            });
+        },
+        setOccupancyCorrelation(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.occupancyTrainCorrelation.doShow(operate);
+                }
+            });
+        },
+        modifyTrainNumber(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.modifyTrainNumber.doShow(operate);
+                }
+            });
+        },
+        setRunType(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainRunType.doShow(operate);
+                }
+            });
+        },
+        showTrainDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
+                    this.$refs.trainDetail.doShow(operate);
+                }
+            });
+        },
+        showAllTrainDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.allTrainDetail.doShow(operate);
+                }
+            });
+        },
+        showRouteDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
+                    this.$refs.routeDetail.doShow(operate);
+                }
+            });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 30px;
+    $height: 30px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 200px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .menu-ul {
+        display: none;
+		position: relative;
+		left: 196px;
+		transform: translateY(-30px);
+        list-style: none;
+		padding-left: 0 !important;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth + 20;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/index.vue b/src/jmapNew/theme/ningbo_03/menus/index.vue
index 932152f00..66ce8f88f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="menus __socpe" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-bar ref="menuBar" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
     <menu-signal ref="menuSignal" :selected="selected" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
@@ -61,15 +61,9 @@ export default {
     computed: {
         ...mapGetters('config', [
             'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
+        ])
     },
     watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        },
         '$store.state.map.mapStateLoadedCount': function () {
             this.$store.dispatch('map/flushMapRef');
         }
diff --git a/src/jmapNew/theme/ningbo_03/menus/localWorkMenu.vue b/src/jmapNew/theme/ningbo_03/menus/localWorkMenu.vue
new file mode 100644
index 000000000..e170bb972
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_03/menus/localWorkMenu.vue
@@ -0,0 +1,435 @@
+<template>
+  <div class="menus __socpe" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @onUpdateDone="onUpdateDone" @onChangeInitInfo="onChangeInitInfo" />
+    <menu-limit ref="menuLimit" :selected="selected" :work="work" />
+    <!--<passive-alarm ref="passiveAlarm" />-->
+    <passive-contorl ref="passiveControl" pop-class="ningbo-01__systerm" :selected="selected" :work="work" />
+    <!--<passive-Timeout ref="passiveTimeout" />-->
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './localWorkMenuBar';
+import MenuLimit from './menuLimit';
+// import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+// import PassiveTimeout from './passiveDialog/timeout';
+
+export default {
+    name: 'LocalWorkMenu',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        MenuLimit,
+        // PassiveAlarm,
+        PassiveContorl
+        // PassiveTimeout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            initCacheMap: {},
+            initInfo: {},
+            updateDone: 0,
+            work: 'localWork'
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        '$store.state.map.mapStateLoadedCount': function () {
+            this.$store.dispatch('map/flushMapRef');
+        }
+    },
+    mounted() {
+        this.$root.$on('iniCacheMap', (cmd, cacheMap) => {
+            this.initCacheMap[cmd] = cacheMap;
+        });
+        this.$root.$on('appendCache', (cmd, code, cache) => {
+            if (!this.initCacheMap[cmd]) {
+                this.initCacheMap[cmd] = {};
+            }
+            this.initCacheMap[cmd][code] = cache;
+        });
+        this.$root.$on('removeCache', (cmd, code) => {
+            if (this.initCacheMap[cmd]) {
+                delete this.initCacheMap[cmd][code];
+            }
+        });
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+                _that.$refs.menuLimit.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        this.$root.$off('iniCacheMap');
+        this.$root.$off('appendCache');
+        this.$root.$off('removeCache');
+        window.onclick = function (e) {};
+    },
+    methods: {
+        onUpdateDone() {
+            this.updateDone++;
+        },
+        onChangeInitInfo(initSelect, initParams) {
+            this.initInfo = {
+                initSelect,
+                initParams
+            };
+            this.updateDone++;
+        }
+    }
+};
+</script>
+
+<style>
+    .menus{
+        height:0px;
+    }
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .ningbo-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .ningbo-01__systerm .el-dialog {
+        background: rgba(100, 100, 100, 0.3);
+        border: 2px solid rgba(144, 144, 144, 0.8);
+        border-radius: 6px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__header {
+        padding: 10px;
+        height: 26px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__footer {
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__body {
+        padding: 10px;
+        margin: 5px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__title {
+        position: absolute;
+        top: 6px;
+        color: #000;
+        border-radius: 4px;
+        padding: 0px 2px;
+        height: 20px;
+        line-height: 20px
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__title::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        filter: blur(7px);
+        height: 20px;
+        width: -webkit-fill-available;
+        background: rgba(190, 190, 190, 0.8);
+        z-index: -1;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 5px;
+        right: 5px;
+        line-height: 18px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .ningbo-01__systerm .el-dialog .expand {
+        width: 120px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+        background: #fff !important;
+        border-right: 1px solid #fff !important;
+        border-bottom: 1px solid #EBEEF5 !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+        border-right: 1px solid #e2e2e2 !important;
+    }
+    .ningbo-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+        border-right: 1px solid #e2e2e2 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .base-label {
+        background: #F0F0F0;
+        padding: 0 5px;
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .ningbo-01__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .ningbo-01__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .ningbo-01__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .ningbo-01__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .ningbo-01__systerm .el-dialog .button-group {
+        margin-top: 10px;
+    }
+</style>
+<style lang="scss">
+	.__socpe {
+		.el-dialog,
+		.el-dialog__wrapper {
+			// pointer-events: none !important;
+		}
+
+		.el-dialog__header,
+		.el-dialog__body {
+			pointer-events: all !important;
+		}
+	}
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/localWorkMenuBar.vue b/src/jmapNew/theme/ningbo_03/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..0432a4b8c
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_03/menus/localWorkMenuBar.vue
@@ -0,0 +1,1854 @@
+<template>
+  <div>
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" :is-next-btn="true" />
+    <!-- <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" /> -->
+    <arrange-route ref="arrangeRoute" />
+    <train-distribution ref="trainDistribution" />
+    <stand-control ref="standControl" />
+    <stand-detain ref="standDetain" />
+    <stand-detail ref="standDetail" />
+    <interval-stop-number ref="intervalStopNumber" />
+    <allocate-time ref="allocateTime" />
+    <station-transfer ref="stationTransfer" :work="work" />
+    <station-request ref="stationRequest" :work="work" />
+    <station-devolution ref="stationDevolution" :work="work" />
+    <station-reclaim ref="stationReclaim" :work="work" />
+    <switch-command ref="switchCommand" />
+    <switch-active ref="switchActive" />
+    <switch-detail ref="switchDetail" />
+    <signal-model ref="signalModel" />
+    <signal-detail ref="signalDetail" />
+    <section-show ref="sectionShow" />
+    <section-lock ref="sectionLock" />
+
+    <running-interval ref="runningInterval" />
+    <adjust-strategy ref="adjustStrategy" />
+    <train-depart ref="trainDepart" />
+    <train-jump-stop ref="trainJumpStop" />
+    <train-cancel-deviation ref="trainCancelDeviation" />
+    <train-update-deviation ref="trainUpdateDeviation" />
+    <train-id-associated ref="trainIdAssociated" />
+    <occupancy-train-correlation ref="occupancyTrainCorrelation" />
+    <modify-train-number ref="modifyTrainNumber" />
+    <train-run-type ref="trainRunType" />
+    <train-detail ref="trainDetail" />
+    <all-train-detail ref="allTrainDetail" />
+    <cancel-route ref="cancelRoute" />
+    <route-detail ref="routeDetail" />
+    <route-command ref="routeCommand" />
+
+    <switch-block-init ref="switchBlockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <switch-block-sure ref="switchBlockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <signal-guide-init ref="signalGuideInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-guide-sure ref="signalGuideSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+    <cancle-signal-guide ref="cancleSignalGuide" />
+
+    <signal-can-block-init ref="signalCanBlockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-can-block-sure ref="signalCanBlockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <signal-block-init ref="signalBlockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-block-sure ref="signalBlockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <section-open-init ref="sectionOpenInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <section-open-sure ref="sectionOpenSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <signal-mode-init ref="signalModeInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <signal-mode-sure ref="signalModeSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <section-limit-speed-init ref="sectionLimitSpeedInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <section-limit-speed-sure ref="sectionLimitSpeedSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <cancel-transfer-lock-init ref="cancelTransferLockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <cancel-transfer-lock-sure ref="cancelTransferLockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <cancel-switch-lock-init ref="cancelSwitchLockInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <cancel-switch-lock-sure ref="cancelSwitchLockSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+    <remote-reset-func-sure ref="remoteResetFuncInit" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" @initSelect="onChangeInitInfo" />
+    <remote-reset-func-sure ref="remoteResetFuncSure" :init-cache-map="initCacheMap" :init-info="initInfo" :update-done="updateDone" @updateDone="onUpdateDone" />
+
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import ArrangeRoute from './menuDialog/arrangeRoute';
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import TrainDistribution from './menuDialog/trainDistribution';
+import StandControl from './menuDialog/standControl';
+import StandDetain from './menuDialog/standDetain';
+import StandDetail from './menuDialog/standDetail';
+import IntervalStopNumber from './menuDialog/intervalStopNumber';
+import AllocateTime from './menuDialog/allocateTime';
+import StationTransfer from './menuDialog/stationTransfer';
+import StationRequest from './menuDialog/stationRequest';
+import StationDevolution from './menuDialog/stationDevolution';
+import StationReclaim from './menuDialog/stationReclaim';
+import SwitchCommand from './menuDialog/switchCommand';
+import RouteCommand from './menuDialog/routeCommand';
+import SwitchActive from './menuDialog/switchActive';
+import SwitchDetail from './menuDialog/switchDetail';
+import SectionShow from './menuDialog/sectionShow';
+import SectionLock from './menuDialog/sectionLock';
+import SignalModel from './menuDialog/signalModel';
+import SignalDetail from './menuDialog/signalDetail';
+import RunningInterval from './menuDialog/runningInterval';
+import AdjustStrategy from './menuDialog/adjustStrategy';
+import TrainDepart from './menuDialog/trainDepart';
+import TrainJumpStop from './menuDialog/trainJumpStop';
+import TrainCancelDeviation from './menuDialog/trainCancelDeviation';
+import TrainUpdateDeviation from './menuDialog/trainUpdateDeviation';
+import CancelRoute from './menuDialog/cancelRoute';
+import TrainIdAssociated from './menuDialog/trainIdAssociated';
+import OccupancyTrainCorrelation from './menuDialog/occupancyTrainCorrelation';
+import ModifyTrainNumber from './menuDialog/modifyTrainNumber';
+import TrainRunType from './menuDialog/trainRunType';
+import TrainDetail from './menuDialog/trainDetail';
+import AllTrainDetail from './menuDialog/allTrainDetail';
+import RouteDetail from './menuDialog/routeDetail';
+import SwitchBlockInit from './menuDialog/switchBlock';
+import SwitchBlockSure from './menuDialog/switchBlock';
+import SignalGuideInit from './menuDialog/signalGuide';
+import SignalGuideSure from './menuDialog/signalGuide';
+import CancleSignalGuide from './menuDialog/cancleSignalGuide';
+import SignalCanBlockInit from './menuDialog/signalCanBlock';
+import SignalCanBlockSure from './menuDialog/signalCanBlock';
+import SectionOpenInit from './menuDialog/sectionOpen';
+import SectionOpenSure from './menuDialog/sectionOpen';
+import SectionLimitSpeedInit from './menuDialog/sectionLimitSpeed';
+import SectionLimitSpeedSure from './menuDialog/sectionLimitSpeed';
+import SignalBlockInit from './menuDialog/signalBlock';
+import SignalBlockSure from './menuDialog/signalBlock';
+import SignalModeInit from './menuDialog/signalMode';
+import SignalModeSure from './menuDialog/signalMode';
+import CancelTransferLockInit from './menuDialog/cancelTransferLock';
+import CancelTransferLockSure from './menuDialog/cancelTransferLock';
+import CancelSwitchLockInit from './menuDialog/cancelSwitchLock';
+import CancelSwitchLockSure from './menuDialog/cancelSwitchLock';
+import RemoteResetFuncInit from './menuDialog/remoteResetFunc';
+import RemoteResetFuncSure from './menuDialog/remoteResetFunc';
+
+export default {
+    name: 'LocalWorkMenuBar',
+    components: {
+        MenuBar,
+        ArrangeRoute,
+        TrainDistribution,
+        StandControl,
+        StandDetain,
+        IntervalStopNumber,
+        AllocateTime,
+        StationTransfer,
+        StationRequest,
+        StationDevolution,
+        StationReclaim,
+        StandDetail,
+        SwitchCommand,
+        SwitchBlockInit,
+        SwitchBlockSure,
+        SwitchActive,
+        SwitchDetail,
+        SignalGuideInit,
+        SignalGuideSure,
+        SignalCanBlockInit,
+        SignalCanBlockSure,
+        RouteCommand,
+        SignalModel,
+        SignalBlockInit,
+        SignalBlockSure,
+        SignalDetail,
+        SectionOpenInit,
+        SectionOpenSure,
+        SectionLimitSpeedInit,
+        SectionLimitSpeedSure,
+        SectionShow,
+        SectionLock,
+        SignalModeInit,
+        CancelTransferLockInit,
+        CancelTransferLockSure,
+        CancelSwitchLockInit,
+        CancelSwitchLockSure,
+        RemoteResetFuncInit,
+        RemoteResetFuncSure,
+        SignalModeSure,
+        RunningInterval,
+        AdjustStrategy,
+        TrainDepart,
+        TrainJumpStop,
+        TrainCancelDeviation,
+        TrainUpdateDeviation,
+        CancelRoute,
+        TrainIdAssociated,
+        OccupancyTrainCorrelation,
+        ModifyTrainNumber,
+        TrainRunType,
+        TrainDetail,
+        AllTrainDetail,
+        RouteDetail,
+        CancleSignalGuide
+    },
+    props: {
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default() {
+                return 0;
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            beCentralizedStation:{},
+            menuNormal: [
+                // {
+                //     title: '窗口(W)',
+                //     operate: '',
+                //     children: [
+                //         {
+                //             title: '报警',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '时刻表信息',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '性能工具',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '用户权限',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '系统状态',
+                //             click: this.undeveloped
+                //         }
+                //     ]
+                // },
+                {
+                    title: '列车(T)',
+                    // operate: OperationEvent.Command.mBar.train,
+                    operate: OperationEvent.Command.commandNingBo3.train,
+                    children: [
+                        {
+                            title: '排列进路到',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '站台',
+                                    operate: OperationEvent.Signal.arrangementRoute.toStand,
+                                    click: this.handleArrangeRoute
+                                },
+                                {
+                                    title: '信号机',
+                                    operate: OperationEvent.Signal.arrangementRoute.toSignal,
+                                    click: this.handleArrangeRoute
+                                }
+                            ]
+                        },
+                        {
+                            title: '分配',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '运行线',
+                                    operate: OperationEvent.Train.destinationTrainId.menu,
+                                    click: this.handleTrainDistributionRunLine
+                                },
+                                {
+                                    title: '班次',
+                                    operate: OperationEvent.Train.trainDistribute.menu,
+                                    click: this.handleTrainDistributionClass
+                                },
+                                {
+                                    title: '往返',
+                                    operate:'',
+                                    click: this.handleTrainDistributionBack
+                                }
+                            ]
+                        },
+                        {
+                            title: '操作',
+                            operate: OperationEvent.Command.commandNingBo3.train_operate,
+                            children: [
+                                {
+                                    title: '发车',
+                                    operate: OperationEvent.Train.setTrainDeparture.menu,
+                                    click: this.setTrainDepart
+                                },
+                                {
+                                    title: '脱离班次',
+                                    operate:'',
+                                    click: this.breakAway
+                                },
+                                {
+                                    title: '复位',
+                                    operate:'',
+                                    click: this.setTrainReset
+                                },
+                                {
+                                    title: '跳停',
+                                    operate: OperationEvent.Command.commandNingBo3.train_operate_jump,
+                                    click: this.setJumpStop
+                                },
+                                {
+                                    title: '设置/取消偏离',
+                                    operate:'',
+                                    click: this.cancelDeviation
+                                },
+                                {
+                                    title: '更新偏差',
+                                    operate:'',
+                                    click: this.updateDeviation
+                                },
+                                {
+                                    title: '取消CBTC列车进路',
+                                    operate:'',
+                                    click: this.cancelCbtcRoute
+                                }
+                                // {
+                                //     title: 'VOBC切换',
+                                //     click: this.undeveloped
+                                // },
+                                // {
+                                //     title: '远程VOBC复位',
+                                //     click: this.undeveloped
+                                // }
+                            ]
+                        },
+                        {
+                            title: '定义',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '列车ID号关联',
+                                    operate:'',
+                                    click: this.setIdAssociated
+                                },
+                                {
+                                    title: '列车占用关联',
+                                    operate:'',
+                                    click: this.setOccupancyCorrelation
+                                },
+                                {
+                                    title: '修改列车描述号',
+                                    operate:'',
+                                    click: this.modifyTrainNumber
+                                }
+                            ]
+                        },
+                        {
+                            title: '设置',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '运行类型',
+                                    operate:'',
+                                    click: this.setRunType
+                                },
+                                {
+                                    title: '记事薄',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '显示',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '详细列车信息',
+                                    operate:'',
+                                    click: this.showTrainDetail
+                                },
+                                {
+                                    title: '所有列车',
+                                    operate:'',
+                                    click: this.showAllTrainDetail
+                                },
+                                {
+                                    title: 'CBTC进路信息',
+                                    operate:'',
+                                    click: this.showRouteDetail
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    title: '线路(G)',
+                    operate: OperationEvent.Command.commandNingBo3.line,
+                    children: [
+                        {
+                            title: '站台',
+                            operate: OperationEvent.Command.commandNingBo3.line_stand,
+                            children: [
+                                {
+                                    title: '开放/关闭',
+                                    click: this.standOpenOrClose,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose
+                                },
+                                {
+                                    title: '设置/取消扣车',
+                                    click: this.setStandDetain,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot
+                                },
+                                {
+                                    title: '设置站间列车数量',
+                                    click: this.undeveloped,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum
+                                },
+                                {
+                                    title: '分配停站时间',
+                                    click: this.setAllocateTime,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime
+                                },
+                                {
+                                    title: '授权转移',
+                                    click: this.authorizeTransfer,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_transfer
+                                },
+                                {
+                                    title: '显示',
+                                    click: this.showStandDetail,
+                                    operate: OperationEvent.Command.commandNingBo3.line_stand_detail
+                                }
+                            ]
+                        },
+                        {
+                            title: '道岔',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch,
+                            children: [
+                                {
+                                    title: '命令',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
+                                    click: this.setSwitchCommand
+                                },
+                                {
+                                    title: '封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_block,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_init,
+                                            click: e =>this.setBlockSwitch(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_sure,
+                                            click: e => this.setBlockSwitch(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '解除封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_unblock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_init,
+                                            click: e => this.setUnblockSwitch(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_sure,
+                                            click: e => this.setUnblockSwitch(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '请求动岔',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_empower,
+                                    children: [
+                                        {
+                                            title: '请求或授权/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_init,
+                                            click: this.setSwitchActive
+                                        },
+                                        {
+                                            title: '显示',
+                                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_sure
+
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '显示',
+                                    operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
+                                    click: this.showSwitchDetail
+                                }
+                            ]
+                        },
+                        {
+                            title: '信号机',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal,
+                            children: [
+
+                                {
+                                    title: '引导',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_guide,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_guide_init,
+                                            click: e => this.setSignalGuide(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_guide_sure,
+                                            click: e => this.setSignalGuide(e, true)
+                                        },
+                                        {
+                                            title: '清除',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_guide_clear,
+                                            click: this.cancleSignalGuide
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '取消允许锁闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot_init,
+                                            click: e => this.setSignalCanBlock(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot_sure,
+                                            click: e => this.setSignalCanBlock(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '进路',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_route,
+                                    children: [
+                                        {
+                                            title: '命令',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_route_cmd,
+                                            click: this.setRouteCommand
+                                        },
+                                        {
+                                            title: '显示',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_route_show,
+                                            children: [
+                                                {
+                                                    title: 'CBTC进路信息',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_signal_route_cbtc
+                                                },
+                                                {
+                                                    title: '后备进路信息',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_signal_route_reserve
+                                                }
+                                            ]
+
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '信号指示模式',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_indicator,
+                                    click: this.setSignalModel
+                                },
+                                {
+                                    title: '封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_block,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
+                                            click: e => this.setSignalBlock(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
+                                            click: e => this.setSignalBlock(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '解除封锁',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_unblock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
+                                            click: e => this.setSignalCancelBlock(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
+                                            click: e => this.setSignalCancelBlock(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '显示',
+                                    operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
+                                    click: this.showSignalDetail
+                                }
+                            ]
+                        },
+                        {
+                            title: '轨道',
+                            operate: OperationEvent.Command.commandNingBo3.line_section,
+                            children: [
+                                {
+                                    title: '开放',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_open,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_open_init,
+                                            click: e => this.setOpenSection(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_open_sure,
+                                            click: e => this.setOpenSection(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '关闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_close,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_close_init,
+                                            click: e => this.setCloseSection(e, false)
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_close_sure,
+                                            click: e => this.setCloseSection(e, true)
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '临时限速',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed,
+                                    children: [
+                                        {
+                                            title: '设置',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed,
+                                            children: [
+                                                {
+                                                    title: '初始化',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_init,
+                                                    click: e => this.setLimitSpeed(e, false)
+                                                },
+                                                {
+                                                    title: '确定/取消',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure,
+                                                    click: e => this.setLimitSpeed(e, true)
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            title: '清除',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed,
+                                            children: [
+                                                {
+                                                    title: '初始化',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init,
+                                                    click: e => this.setLimitSpeed(e, false)
+                                                },
+                                                {
+                                                    title: '确定/取消',
+                                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure,
+                                                    click: e => this.setLimitSpeed(e, true)
+                                                }
+                                            ]
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '显示',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_detail,
+                                    click: this.handleSectionShow
+                                }
+                            ]
+                        },
+                        {
+                            title: '闭塞区段',
+                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock,
+                            children: [
+                                {
+                                    title: '取消转换锁闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelTransferLock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelTransferLock_init,
+                                            click: e => { this.setCancelTransferLock(e, false); }
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelTransferLock_sure,
+                                            click: e => { this.setCancelTransferLock(e, true); }
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '取消过岔锁闭',
+                                    operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelSwitchLock,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelSwitchLock_init,
+                                            click: e => { this.setCancelSwitchLock(e, false); }
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_cancelSwitchLock_sure,
+                                            click: e => { this.setCancelSwitchLock(e, true); }
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '远程预复位使能',
+                                    operate: OperationEvent.Command.commandNingBo3.line_sectionLock_remoteResetFunc,
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_remoteResetFunc_init,
+                                            click: e => { this.setRemoteResetFunc(e, false); }
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_sectionLock_remoteResetFunc_sure,
+                                            click: e => { this.setRemoteResetFunc(e, true); }
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '复位',
+                                    operate:'',
+                                    click: this.undeveloped
+                                },
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '进入点',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '自动进路',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '运行线',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '设置/取消偏离',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: 'UPS',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '运行超时',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '设置容忍度',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '信号模式',
+                            operate: '',
+                            children: [
+                                {
+                                    title: 'CBTC',
+                                    operate:'',
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        }
+                                    ]
+                                },
+                                {
+                                    title: '后备',
+                                    operate:'',
+                                    children: [
+                                        {
+                                            title: '初始化',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        },
+                                        {
+                                            title: '确定/取消',
+                                            operate: OperationEvent.Command.commandNingBo3.line_section_limitSpeed
+                                        }
+                                    ]
+                                }
+                            ]
+                        },
+                        {
+                            title: 'PMI',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '系统扣车',
+                            operate:'',
+                            click: this.setSystemDetain
+                        },
+                        {
+                            title: '修改自动分配',
+                            operate:'',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '防淹门',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '坡道',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        },
+                        {
+                            title: '弯道',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '显示',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    title: '调整(R)',
+                    operate: '',
+                    children: [
+                        {
+                            title: '固定列车间隔',
+                            operate:'',
+                            click: this.setRunningInterval
+                        },
+                        {
+                            title: '调整策略',
+                            operate:'',
+                            click: this.adjustStrategy
+                        }
+                    ]
+                },
+                {
+                    title: '视图(R)',
+                    operate: '',
+                    children: [
+                        {
+                            title: '缩放',
+                            operate:'',
+                            click: this.undeveloped,
+                            children:[]
+                        },
+                        {
+                            title: '修改可见性',
+                            operate:'',
+                            click: this.undeveloped
+                        },
+                        {
+                            title: '允许显示',
+                            operate: '',
+                            children: [
+                                {
+                                    title: '停站倒计时',
+                                    operate:'',
+                                    click: this.undeveloped
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    title: '用户权限(U)',
+                    operate: OperationEvent.Command.mBar.userManage,
+                    children: [
+                        {
+                            title: '转移控制',
+                            operate: OperationEvent.Command.commandNingBo3.line_user,
+                            children: [
+                                {
+                                    title: '请求区域控制权',
+                                    click: this.authorizeRequest,
+                                    operate: OperationEvent.Command.commandNingBo3.line_user_request
+                                },
+                                {
+                                    title: '授权转移',
+                                    click: this.authorizeTransfer,
+                                    operate: OperationEvent.Command.commandNingBo3.line_user_transfer
+                                }
+                                // {
+                                //     title: '下放站控',
+                                //     click: this.authorizeDevolution,
+                                //     operate: OperationEvent.Command.commandNingBo3.line_user_devolution
+                                // },
+                                // {
+                                //     title: '收回站控',
+                                //     click: this.authorizeReclaim,
+                                //     operate: OperationEvent.Command.commandNingBo3.line_user_reclaim
+                                // }
+                            ]
+                        }
+                    ]
+                }
+                // {
+                //     title: '视图(V)',
+                //     operate: '',
+                //     children: [
+                //         {
+                //             title: '缩放',
+                //             operate: '',
+                //             children: [
+                //                 {
+                //                     title: '全部',
+                //                     click: this.undeveloped
+                //                 }
+                //             ]
+                //         },
+                //         {
+                //             title: '修改可见性',
+                //             click: this.undeveloped
+                //         },
+                //         {
+                //             title: '允许显示',
+                //             operate: '',
+                //             children: [
+                //                 {
+                //                     title: '停站到计时',
+                //                     click: this.undeveloped
+                //                 }
+                //             ]
+                //         }
+                //     ]
+                // }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
+    },
+    watch: {
+        '$store.state.training.changeRoleInfo':function(newval, oldval) {
+            this.checkRoleChange(oldval, newval);
+        },
+        '$store.state.menuOperation.leftClickCount': function (val) {
+            this.selectedChange();
+        }
+
+    },
+    mounted() {
+        // 被控制的车站数据
+        this.stationList.forEach(data=>{
+            if (data.centralized) {
+                data.chargeStationCodeList.forEach(charge=>{
+                    this.beCentralizedStation[charge] = data.code;
+                });
+            }
+        });
+        // this.$root.$on('iniCacheMap', (cmd, cacheMap) => {
+        //     this.initCacheMap[cmd] = cacheMap;
+        // });
+        // this.$root.$on('appendCache', (cmd, code, cache) => {
+        //     if (!this.initCacheMap[cmd]) {
+        //         this.initCacheMap[cmd] = {};
+        //     }
+        //     this.initCacheMap[cmd][code] = cache;
+        // });
+        // this.$root.$on('removeCache', (cmd, code) => {
+        //     if (this.initCacheMap[cmd]) {
+        //         delete this.initCacheMap[cmd][code];
+        //     }
+        // });
+    },
+    beforeDestroy() {
+        // this.$root.$off('iniCacheMap');
+        // this.$root.$off('appendCache');
+        // this.$root.$off('removeCache');
+    },
+    methods: {
+        onUpdateDone() {
+            this.$emit('onUpdateDone');
+        },
+        onChangeInitInfo(initSelect, initParams) {
+            this.$emit('onChangeInitInfo', initSelect, initParams);
+        },
+        selectedChange() {
+            const model = this.$store.state.menuOperation.selected;
+            const memberData = this.$store.state.training.memberData;
+            if (model && model._type && model._type == 'Station' && model.controlApplicant &&
+            model.controller && memberData[model.controller].userId == this.$store.state.user.id) {
+                const item = {operate: OperationEvent.Command.commandNingBo3.line_stand_transfer};
+                this.authorizeTransfer(item);
+            }
+        },
+        checkRoleChange(oldval, newval) {
+            this.$nextTick(()=>{
+                const memberData = this.$store.state.training.memberData;
+                if (oldval && newval) {
+                    const oldMemberId = oldval.split(':')[0];
+                    const newMemberId = newval.split(':')[1];
+                    if (oldMemberId && oldMemberId != newMemberId) {
+                        const oldMember = memberData[oldMemberId];
+                        const newMember = memberData[newMemberId];
+                        if (oldMember.type == 'STATION_SUPERVISOR' && newMember.type == 'STATION_SUPERVISOR') {
+                            const oldStation = this.$store.getters['map/getDeviceByCode'](oldMember.deviceCode);
+                            const newStation = this.$store.getters['map/getDeviceByCode'](newMember.deviceCode);
+                            if (oldStation.controller || newStation.controller) {
+                                if (newStation.controller) {
+                                    let centerStation;
+                                    if (newStation.centralized) {
+                                        centerStation = newStation;
+                                    } else {
+                                        const newCenter = this.$store.getters['map/getDeviceByCode'](this.beCentralizedStation[newMember.deviceCode]);
+                                        centerStation = newCenter;
+                                    }
+                                    if (centerStation && centerStation.instance) {
+                                        centerStation.instance.handleComplexControl(newStation.controller);
+                                        centerStation.instance.handleEmergencyChange(newStation.emergencyController);
+                                    }
+                                    centerStation.chargeStationCodeList.forEach(item => {
+                                        const device = this.$store.getters['map/getDeviceByCode'](item);
+                                        if (device && device.instance) {
+                                            device.instance.handleComplexControl(newStation.controller);
+                                            device.instance.handleEmergencyChange(newStation.emergencyController);
+                                        }
+                                    });
+                                }
+                            }
+                        }
+                        // if (oldMember.type == 'DISPATCHER' && newMember.type == 'DISPATCHER') {
+                        // }else if(oldMember.type == 'DISPATCHER' && newMember.type == 'DISPATCHER'){
+                        // }
+                    }
+                }
+                // else if (oldval) {
+
+                // } else {
+
+                // }
+            });
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        handleArrangeRoute(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.arrangeRoute.doShow(operate);
+                }
+            });
+        },
+        handleTrainDistributionRunLine(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDistribution.doShow(operate, 'first');
+                }
+            });
+        },
+        handleTrainDistributionClass(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDistribution.doShow(operate, 'third');
+                }
+            });
+        },
+        handleTrainDistributionBack(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDistribution.doShow(operate, 'second');
+                }
+            });
+        },
+        // 站台开放/关闭
+        standOpenOrClose(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standControl.doShow();
+                }
+            });
+        },
+        // 站台扣车
+        setStandDetain(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standDetain.doShow({active:'first'});
+                }
+            });
+        },
+        setIntervalStopNumber(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.intervalStopNumber.doShow();
+                }
+            });
+        },
+        // 停站时间
+        setAllocateTime(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.allocateTime.doShow();
+                }
+            });
+        },
+        // 控制权转移
+        authorizeTransfer(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationTransfer.doShow();
+                }
+            });
+        },
+        // 请求区域控制权
+        authorizeRequest(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationRequest.doShow();
+                }
+            });
+        },
+        // 下放站控
+        authorizeDevolution(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationDevolution.doShow();
+                }
+            });
+        },
+        // 收回站控
+        authorizeReclaim(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationReclaim.doShow();
+                }
+            });
+        },
+        showStandDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.standDetail.doShow();
+                }
+            });
+        },
+        setSwitchCommand(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.switchCommand.doShow();
+                }
+            });
+        },
+        // 道岔封锁
+        setBlockSwitch(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'switchBlockSure' : 'switchBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        // 道岔解除封锁
+        setUnblockSwitch(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'switchBlockSure' : 'switchBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        // 道岔授权
+        setSwitchActive(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) =>{
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.switchActive.doShow();
+                }
+            });
+        },
+        // 道岔显示详情
+        showSwitchDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.switchDetail.doShow();
+                }
+            });
+        },
+        // 进路指令
+        setRouteCommand(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.routeCommand.doShow();
+                }
+            });
+        },
+        // 信号引导
+        setSignalGuide(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalGuideSure' : 'signalGuideInit'].doShow(operate, sure);
+                }
+            });
+        },
+        cancleSignalGuide(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs['cancleSignalGuide'].doShow(operate);
+                    // this.$refs[sure ? 'signalGuideSure' : 'signalGuideInit'].doShow(operate, sure);
+                }
+            });
+        },
+
+        setSignalCanBlock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalCanBlockSure' : 'signalCanBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setOpenSection(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'sectionOpenSure' : 'sectionOpenInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setCancelTransferLock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'cancelTransferLockSure' : 'cancelTransferLockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setCancelSwitchLock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'cancelSwitchLockSure' : 'cancelSwitchLockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setRemoteResetFunc(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'remoteResetFuncSure' : 'remoteResetFuncInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setCloseSection(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'sectionOpenSure' : 'sectionOpenInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setLimitSpeed(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'sectionLimitSpeedSure' : 'sectionLimitSpeedInit'].doShow(operate, sure);
+                }
+            });
+        },
+        handleSectionShow(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionShow.doShow();
+                }
+            });
+        },
+        handleLock(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        handleUnLock(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        handleRestoration(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        handleSectionRestoration(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        setSignalModel(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.signalModel.doShow();
+                }
+            });
+        },
+        handleSectionStopShow(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.sectionLock.doShow();
+                }
+            });
+        },
+        setSignalBlock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalBlockSure' : 'signalBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setSignalCancelBlock(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalBlockSure' : 'signalBlockInit'].doShow(operate, sure);
+                }
+            });
+        },
+        showSignalDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.signalDetail.doShow(operate);
+                }
+            });
+        },
+        setCbtcMode(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.initSignalMode.doShow(operate);
+                }
+            });
+        },
+        setReserveMode(item, sure = false) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs[sure ? 'signalModeSure' : 'signalModeInit'].doShow(operate, sure);
+                }
+            });
+        },
+        setSystemDetain(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    // this.$refs.systemDetain.doShow(operate);
+                    this.$refs.standDetain.doShow({active:'second'});
+                }
+            });
+        },
+        setRunningInterval(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.runningInterval.doShow(operate);
+                }
+            });
+        },
+        adjustStrategy(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.adjustStrategy.doShow(operate);
+                }
+            });
+        },
+        setTrainDepart(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDepart.doShow(operate);
+                }
+            });
+        },
+        breakAway(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDepart.doShow(operate);
+                }
+            });
+        },
+        setTrainReset(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainDepart.doShow(operate);
+                }
+            });
+        },
+        setJumpStop(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainJumpStop.doShow(operate);
+                }
+            });
+        },
+        cancelDeviation(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainCancelDeviation.doShow(operate);
+                }
+            });
+        },
+        updateDeviation(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainUpdateDeviation.doShow(operate);
+                }
+            });
+        },
+        cancelCbtcRoute(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.cancelRoute.doShow(operate);
+                }
+            });
+        },
+        setIdAssociated(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainIdAssociated.doShow(operate);
+                }
+            });
+        },
+        setOccupancyCorrelation(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.occupancyTrainCorrelation.doShow(operate);
+                }
+            });
+        },
+        modifyTrainNumber(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.modifyTrainNumber.doShow(operate);
+                }
+            });
+        },
+        setRunType(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.trainRunType.doShow(operate);
+                }
+            });
+        },
+        showTrainDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
+                    this.$refs.trainDetail.doShow(operate);
+                }
+            });
+        },
+        showAllTrainDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
+                    this.$refs.allTrainDetail.doShow(operate);
+                }
+            });
+        },
+        showRouteDetail(item) {
+            const operate = {
+                type: 'bar',
+                operation: item.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
+                    this.$refs.routeDetail.doShow(operate);
+                }
+            });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 30px;
+    $height: 30px;
+    $menuPadding: 10px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 200px;
+    $menuItemPadding: 5px;
+
+    #menuBar {
+        position: absolute;
+        width: inherit;
+        height: $height;
+        line-height: $height;
+    }
+
+    .menu-ul {
+        display: none;
+		position: relative;
+		left: 196px;
+		transform: translateY(-30px);
+        list-style: none;
+		padding-left: 0 !important;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth + 20;
+    }
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
index 9480f1fe8..b6b0780a9 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuBar.vue
@@ -1915,7 +1915,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.arrangeRoute.doShow(operate);
@@ -1927,7 +1927,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDistribution.doShow(operate, 'first');
@@ -1939,7 +1939,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDistribution.doShow(operate, 'third');
@@ -1951,7 +1951,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDistribution.doShow(operate, 'second');
@@ -1964,7 +1964,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.standControl.doShow();
@@ -1977,7 +1977,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.standDetain.doShow({active:'first'});
@@ -1989,7 +1989,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.intervalStopNumber.doShow();
@@ -2002,7 +2002,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.allocateTime.doShow();
@@ -2015,7 +2015,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationTransfer.doShow();
@@ -2028,7 +2028,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationRequest.doShow();
@@ -2041,7 +2041,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationDevolution.doShow();
@@ -2054,7 +2054,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationReclaim.doShow();
@@ -2066,7 +2066,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.standDetail.doShow();
@@ -2078,7 +2078,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.switchCommand.doShow();
@@ -2091,7 +2091,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'switchBlockSure' : 'switchBlockInit'].doShow(operate, sure);
@@ -2105,7 +2105,7 @@ export default {
                 operation: item.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'switchBlockSure' : 'switchBlockInit'].doShow(operate, sure);
@@ -2118,7 +2118,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) =>{
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) =>{
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.switchActive.doShow();
@@ -2131,7 +2131,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.switchDetail.doShow();
@@ -2144,7 +2144,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.routeCommand.doShow();
@@ -2157,7 +2157,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'signalGuideSure' : 'signalGuideInit'].doShow(operate, sure);
@@ -2169,7 +2169,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs['cancleSignalGuide'].doShow(operate);
@@ -2183,7 +2183,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'signalCanBlockSure' : 'signalCanBlockInit'].doShow(operate, sure);
@@ -2195,7 +2195,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'sectionOpenSure' : 'sectionOpenInit'].doShow(operate, sure);
@@ -2207,7 +2207,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'cancelTransferLockSure' : 'cancelTransferLockInit'].doShow(operate, sure);
@@ -2219,7 +2219,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'cancelSwitchLockSure' : 'cancelSwitchLockInit'].doShow(operate, sure);
@@ -2231,7 +2231,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'remoteResetFuncSure' : 'remoteResetFuncInit'].doShow(operate, sure);
@@ -2243,7 +2243,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'sectionOpenSure' : 'sectionOpenInit'].doShow(operate, sure);
@@ -2255,7 +2255,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'sectionLimitSpeedSure' : 'sectionLimitSpeedInit'].doShow(operate, sure);
@@ -2267,7 +2267,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionShow.doShow();
@@ -2279,7 +2279,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionLock.doShow();
@@ -2291,7 +2291,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionLock.doShow();
@@ -2303,7 +2303,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionLock.doShow();
@@ -2315,7 +2315,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionLock.doShow();
@@ -2327,7 +2327,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.signalModel.doShow();
@@ -2339,7 +2339,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.sectionLock.doShow();
@@ -2351,7 +2351,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'signalBlockSure' : 'signalBlockInit'].doShow(operate, sure);
@@ -2363,7 +2363,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'signalBlockSure' : 'signalBlockInit'].doShow(operate, sure);
@@ -2375,7 +2375,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.signalDetail.doShow(operate);
@@ -2387,7 +2387,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.initSignalMode.doShow(operate);
@@ -2399,7 +2399,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs[sure ? 'signalModeSure' : 'signalModeInit'].doShow(operate, sure);
@@ -2411,7 +2411,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     // this.$refs.systemDetain.doShow(operate);
@@ -2424,7 +2424,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.runningInterval.doShow(operate);
@@ -2436,7 +2436,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.adjustStrategy.doShow(operate);
@@ -2448,7 +2448,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainDepart.doShow(operate);
@@ -2460,7 +2460,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainDepart.doShow(operate);
@@ -2472,7 +2472,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainDepart.doShow(operate);
@@ -2484,7 +2484,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainJumpStop.doShow(operate);
@@ -2496,7 +2496,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainCancelDeviation.doShow(operate);
@@ -2508,7 +2508,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainUpdateDeviation.doShow(operate);
@@ -2520,7 +2520,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.cancelRoute.doShow(operate);
@@ -2532,7 +2532,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainIdAssociated.doShow(operate);
@@ -2544,7 +2544,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.occupancyTrainCorrelation.doShow(operate);
@@ -2556,7 +2556,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.modifyTrainNumber.doShow(operate);
@@ -2568,7 +2568,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainRunType.doShow(operate);
@@ -2580,7 +2580,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
                     this.$refs.trainDetail.doShow(operate);
@@ -2592,7 +2592,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.allTrainDetail.doShow(operate);
@@ -2604,7 +2604,7 @@ export default {
                 type: 'bar',
                 operation: item.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break:true});
                     this.$refs.routeDetail.doShow(operate);
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/adjustStrategy.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/adjustStrategy.vue
index e42d67d31..7ebef9432 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/adjustStrategy.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/adjustStrategy.vue
@@ -136,7 +136,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allTrainDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allTrainDetail.vue
index c841abb07..88dd8deaa 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allTrainDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allTrainDetail.vue
@@ -129,7 +129,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
index 1c0c193e5..661d33324 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
@@ -120,7 +120,8 @@ export default {
             ratedValue: 0,
             maxTimeValue: '',
             currentTime: 0,
-            ratedValue11: ''
+            ratedValue11: '',
+            changeIgnore: false
         };
     },
     computed: {
@@ -165,6 +166,11 @@ export default {
                     this.currentTime = stand.parkingTime;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -181,6 +187,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const stand = this.stationStandList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!stand;
                 this.$refs.table.setCurrentRow(stand);
                 setTimeout(() => {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -191,6 +198,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -206,7 +214,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
@@ -218,16 +226,22 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -237,9 +251,11 @@ export default {
             if (!val) { return; }
             const step = {
                 operation: OperationEvent.Command.common.choose1.operation,
-                val: val
+                param: {
+                    val: val
+                }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.currentTime = val;
@@ -258,7 +274,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue
index ba5727e63..71930e720 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue
@@ -252,7 +252,7 @@ export default {
                 cmdType: CMD.Train.CMD_TRAIN_SET_ROUTE,
                 param: { routeCodes: this.routeCodeList, groupNumber: this.selectTrainCode }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -268,7 +268,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelRoute.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelRoute.vue
index 661d395ac..bb001a94a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelRoute.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelRoute.vue
@@ -144,7 +144,7 @@ export default {
                 param: { routeCodes: this.selectedRouteList }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (isClose) {
@@ -174,7 +174,7 @@ export default {
                 val: val
             };
             const _that = this;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.selectedTrainCode = val;
@@ -202,7 +202,7 @@ export default {
                 operation: OperationEvent.Signal.cancelTrainRoute.choose1.operation,
                 val: this.selectedRouteList
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -215,7 +215,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelSwitchLock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelSwitchLock.vue
index 443dc98bf..bfc3d699a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelSwitchLock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelSwitchLock.vue
@@ -4,22 +4,22 @@
       <el-col :span="sure? 18: 24">
         <el-table :id="domIdChoose" ref="table" :data="tempList" highlight-current-row height="300px" @current-change="handleChangeLine">
           <el-table-column prop="name" width="90" label="闭塞区段" />
-          <el-table-column  width="90" label="PMI">
+          <el-table-column width="90" label="PMI">
             <template slot-scope="scope">
               <span>{{ getStationPIM(scope.row) }}</span>
             </template>
           </el-table-column>
-          <el-table-column  width="90" label="信号模式">
+          <el-table-column width="90" label="信号模式">
             <template slot-scope="scope">
               <span>{{ getSectionMode(scope.row.code) }}</span>
             </template>
           </el-table-column>
-		  <el-table-column  width="120" label="过岔锁闭可取消">
+          <el-table-column width="120" label="过岔锁闭可取消">
             <template slot-scope="scope">
               <span>{{ getSectionCanStatus(scope.row.code) }}</span>
             </template>
           </el-table-column>
-  		  <el-table-column  width="120" label="过岔锁闭已取消">
+          <el-table-column width="120" label="过岔锁闭已取消">
             <template slot-scope="scope">
               <span>{{ getSectionHasStatus(scope.row.code) }}</span>
             </template>
@@ -31,7 +31,7 @@
           </el-table-column>
         </el-table>
       </el-col>
-      <el-col :span="5" :offset="1" v-if="sure">
+      <el-col v-if="sure" :span="5" :offset="1">
         <fieldset style="position: absolute;top: 40%;">
           <legend class="card_title">命令</legend>
           <el-radio-group v-model="command">
@@ -69,27 +69,27 @@ export default {
     components: {
         NoticeInfo
     },
-	props: {
-		initCacheMap: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		initInfo: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		updateDone: {
-			type: Number,
-			default: 0
-		}
-	},
+    props: {
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default: 0
+        }
+    },
     data() {
         return {
-			title: '',
+            title: '',
             status: false,
             standStatus: true,
             allChecked: false,
@@ -100,31 +100,31 @@ export default {
             radio: '1',
             operate: null,
             command: true,
-			sure: false,
-			currentSelect: null,
-			noInit: true,
-			changeIgnore: false,
+            sure: false,
+            currentSelect: null,
+            noInit: true,
+            changeIgnore: false
         };
     },
     computed: {
         ...mapGetters('map', [
             'sectionList'
         ]),
-		cmdType() {
-			return ''
-		},
-		initSelect() {
-			return this.initInfo.initSelect||{};
-		},
-		disabled() {
-			return !this.currentSelect || this.currentSelect.blockade || this.noInit;
-		},
+        cmdType() {
+            return '';
+        },
+        initSelect() {
+            return this.initInfo.initSelect || {};
+        },
+        disabled() {
+            return !this.currentSelect || this.currentSelect.blockade || this.noInit;
+        },
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-		tempList() {
-			return this.sectionList.filter(el => ['01', '04'].includes(el.type) )
-		},
+        tempList() {
+            return this.sectionList.filter(el => ['01', '04'].includes(el.type) );
+        },
         domIdChoose() {
             return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
         },
@@ -144,105 +144,105 @@ export default {
                 this.commit();
             }
         },
-		updateDone() {
-			if (this.currentSelect) {
-				this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
-			}
-		}
+        updateDone() {
+            if (this.currentSelect) {
+                this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
+            }
+        }
     },
     methods: {
-		getCacheMap() {
-			return this.initCacheMap[this.cmdType.value]||{};
-		},
+        getCacheMap() {
+            return this.initCacheMap[this.cmdType.value] || {};
+        },
         doShow(operate, sure) {
-			this.operate = operate;
-			this.sure = sure;
-			if (!sure) this.command = true;
-			this.title = `${sure? '确认/取消过岔锁闭取消': '初始化过岔锁闭取消'}`;
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
+            this.operate = operate;
+            this.sure = sure;
+            if (!sure) this.command = true;
+            this.title = `${sure ? '确认/取消过岔锁闭取消' : '初始化过岔锁闭取消'}`;
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-				this.changeIgnore = sure
-				this.$refs.table.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
+                this.changeIgnore = sure;
+                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.sure && (this.currentSelect = null);
-			this.sure && this.$refs.table.setCurrentRow();
-			this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
-				Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
-			)
+            this.sure && (this.currentSelect = null);
+            this.sure && this.$refs.table.setCurrentRow();
+            this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+                Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+            );
             this.$store.dispatch('training/emitTipFresh');
         },
         commit(isClose = true) {
-			if (this.currentSelect &&
+            if (this.currentSelect &&
 				this.currentSelect.code == this.initSelect.code) {
-				const cacheMap= this.getCacheMap();
-				const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
-				const operate = {
-					cmdType: this.sure&&isOK? this.cmdType: null,
-					operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
-					over: this.sure,
-					param: {sectionCode: this.currentSelect.code}
-				};
+                const cacheMap = this.getCacheMap();
+                const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
+                const operate = {
+                    cmdType: this.sure && isOK ? this.cmdType : null,
+                    operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
+                    over: this.sure,
+                    param: {sectionCode: this.currentSelect.code}
+                };
 
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						if (isOK) {
-							this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure? 'two': 'one'});
-						} else {
-							this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
-						}
-						this.$emit('updateDone')
-						this.$store.dispatch('map/flushMapRef');
-						isClose && this.doClose();
-					}
-				}).catch(() => {
-					isClose && this.isClose();
-					this.$refs.noticeInfo.doShow();
-				});
-			} else {
-				this.$messageBox('两次选择不一致');
-			}
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        if (isOK) {
+                            this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure ? 'two' : 'one'});
+                        } else {
+                            this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+                        }
+                        this.$emit('updateDone');
+                        this.$store.dispatch('map/flushMapRef');
+                        isClose && this.doClose();
+                    }
+                }).catch(() => {
+                    isClose && this.isClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+            } else {
+                this.$messageBox('两次选择不一致');
+            }
         },
-		handleChangeLine(val) {
-			if (!val) { return; }
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
-			this.$emit('updateDone')
+        handleChangeLine(val) {
+            if (!val) { return; }
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-			this.changeIgnore = false;
-			this.$emit('updateDone')
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.changeIgnore = false;
+            this.$emit('updateDone');
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.sure || this.$emit('initSelect', this.currentSelect);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
-		getProcess(code) {
-			const cacheMap = this.getCacheMap();
-			const cache = cacheMap[code];
-			if (cache) {
-				if (this.sure) {
-					return cache.done == 'two' ?  '确认过岔锁闭取消完成' : '等待确认/取消';
-				} else {
-					return cache.done == 'one' ? '已初始化' : ''
-				}
-			}
-			return '';
+        getProcess(code) {
+            const cacheMap = this.getCacheMap();
+            const cache = cacheMap[code];
+            if (cache) {
+                if (this.sure) {
+                    return cache.done == 'two' ? '确认过岔锁闭取消完成' : '等待确认/取消';
+                } else {
+                    return cache.done == 'one' ? '已初始化' : '';
+                }
+            }
+            return '';
         },
         getStationPIM(code) {
             return '16-NSW';
@@ -250,17 +250,17 @@ export default {
         getSectionMode(code) {
             return '后备';
         },
-		getSectionCanStatus(code) {
-			return '否'
-		},
-		getSectionHasStatus(code) {
-			return '否'
-		},
+        getSectionCanStatus(code) {
+            return '否';
+        },
+        getSectionHasStatus(code) {
+            return '否';
+        },
         cancel() {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelTransferLock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelTransferLock.vue
index 67b17304f..ca81a9438 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelTransferLock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelTransferLock.vue
@@ -14,7 +14,7 @@
               <span>{{ getSectionMode(scope.row.code) }}</span>
             </template>
           </el-table-column>
-		  <el-table-column width="90" label="转换锁闭">
+          <el-table-column width="90" label="转换锁闭">
             <template slot-scope="scope">
               <span>{{ getSectionLock(scope.row.code) }}</span>
             </template>
@@ -26,7 +26,7 @@
           </el-table-column>
         </el-table>
       </el-col>
-      <el-col :span="5" :offset="1" v-if="sure">
+      <el-col v-if="sure" :span="5" :offset="1">
         <fieldset style="position: absolute;top: 40%;">
           <legend class="card_title">命令</legend>
           <el-radio-group v-model="command">
@@ -64,27 +64,27 @@ export default {
     components: {
         NoticeInfo
     },
-	props: {
-		initCacheMap: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		initInfo: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		updateDone: {
-			type: Number,
-			default: 0
-		}
-	},
+    props: {
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default: 0
+        }
+    },
     data() {
         return {
-			title: '',
+            title: '',
             status: false,
             standStatus: true,
             allChecked: false,
@@ -95,31 +95,31 @@ export default {
             radio: '1',
             operate: null,
             command: true,
-			sure: false,
-			currentSelect: null,
-			noInit: true,
-			changeIgnore: false
+            sure: false,
+            currentSelect: null,
+            noInit: true,
+            changeIgnore: false
         };
     },
     computed: {
         ...mapGetters('map', [
             'sectionList'
         ]),
-		cmdType() {
-			return ''
-		},
-		initSelect() {
-			return this.initInfo.initSelect||{};
-		},
-		disabled() {
-			return !this.currentSelect || this.currentSelect.blockade || this.noInit;
-		},
+        cmdType() {
+            return '';
+        },
+        initSelect() {
+            return this.initInfo.initSelect || {};
+        },
+        disabled() {
+            return !this.currentSelect || this.currentSelect.blockade || this.noInit;
+        },
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-		tempList() {
-			return this.sectionList.filter(el => ['01', '04'].includes(el.type) )
-		},
+        tempList() {
+            return this.sectionList.filter(el => ['01', '04'].includes(el.type) );
+        },
         domIdChoose() {
             return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
         },
@@ -139,105 +139,105 @@ export default {
                 this.commit();
             }
         },
-		updateDone() {
-			if (this.currentSelect) {
-				this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
-			}
-		}
+        updateDone() {
+            if (this.currentSelect) {
+                this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
+            }
+        }
     },
     methods: {
-		getCacheMap() {
-			return this.initCacheMap[this.cmdType.value]||{};
-		},
+        getCacheMap() {
+            return this.initCacheMap[this.cmdType.value] || {};
+        },
         doShow(operate, sure) {
-			this.operate = operate;
-			this.sure = sure;
-			if (!sure) this.command = true;
-			this.title = `${sure? '确认/取消转换锁闭取消': '初始化转换锁闭取消'}`;
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
+            this.operate = operate;
+            this.sure = sure;
+            if (!sure) this.command = true;
+            this.title = `${sure ? '确认/取消转换锁闭取消' : '初始化转换锁闭取消'}`;
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-				this.changeIgnore = sure;
-				this.$refs.table.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
+                this.changeIgnore = sure;
+                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.sure && (this.currentSelect = null);
-			this.sure && this.$refs.table.setCurrentRow();
-			this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
-				Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
-			)
+            this.sure && (this.currentSelect = null);
+            this.sure && this.$refs.table.setCurrentRow();
+            this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+                Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+            );
             this.$store.dispatch('training/emitTipFresh');
         },
         commit(isClose = true) {
-			if (this.currentSelect &&
+            if (this.currentSelect &&
 				this.currentSelect.code == this.initSelect.code) {
-				const cacheMap= this.getCacheMap();
-				const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
-				const operate = {
-					cmdType: this.sure&&isOK? this.cmdType: null,
-					operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
-					over: this.sure,
-					param: {sectionCode: this.currentSelect.code}
-				};
+                const cacheMap = this.getCacheMap();
+                const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
+                const operate = {
+                    cmdType: this.sure && isOK ? this.cmdType : null,
+                    operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
+                    over: this.sure,
+                    param: {sectionCode: this.currentSelect.code}
+                };
 
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						if (isOK) {
-							this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure? 'two': 'one'});
-						} else {
-							this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
-						}
-						this.$emit('updateDone')
-						this.$store.dispatch('map/flushMapRef');
-						isClose && this.doClose();
-					}
-				}).catch(() => {
-					isClose && this.isClose();
-					this.$refs.noticeInfo.doShow();
-				});
-			} else {
-				this.$messageBox('两次选择不一致');
-			}
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        if (isOK) {
+                            this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure ? 'two' : 'one'});
+                        } else {
+                            this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+                        }
+                        this.$emit('updateDone');
+                        this.$store.dispatch('map/flushMapRef');
+                        isClose && this.doClose();
+                    }
+                }).catch(() => {
+                    isClose && this.isClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+            } else {
+                this.$messageBox('两次选择不一致');
+            }
         },
-		handleChangeLine(val) {
-			if (!val) { return; }
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
-			this.$emit('updateDone')
+        handleChangeLine(val) {
+            if (!val) { return; }
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-			this.changeIgnore = false;
-			this.$emit('updateDone')
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.changeIgnore = false;
+            this.$emit('updateDone');
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.sure || this.$emit('initSelect', this.currentSelect);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
-		getProcess(code) {
-			const cacheMap = this.getCacheMap();
-			const cache = cacheMap[code];
-			if (cache) {
-				if (this.sure) {
-					return cache.done == 'two' ? '确认转换锁闭取消完成' : '等待确认/取消';
-				} else {
-					return cache.done == 'one' ? '已初始化' : ''
-				}
-			}
-			return '';
+        getProcess(code) {
+            const cacheMap = this.getCacheMap();
+            const cache = cacheMap[code];
+            if (cache) {
+                if (this.sure) {
+                    return cache.done == 'two' ? '确认转换锁闭取消完成' : '等待确认/取消';
+                } else {
+                    return cache.done == 'one' ? '已初始化' : '';
+                }
+            }
+            return '';
         },
         getStationPIM(code) {
             return '16-NSW';
@@ -245,15 +245,15 @@ export default {
         getSectionMode(code) {
             return '后备';
         },
-		getSectionLock(code) {
+        getSectionLock(code) {
             const elem = this.$store.getters['map/getDeviceByCode'](code);
             return elem.blockade ? '关闭' : '打开';
-		},
+        },
         cancel() {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue
index 610cd8990..7d4cf1a31 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue
@@ -61,6 +61,7 @@ export default {
             allChecked: false,
             dialogShow: false,
             loading: false,
+            changeIgnore: false,
             operate: '',
             selectSignalCode: ''
         };
@@ -99,6 +100,11 @@ export default {
         },
         'selected': function(val) {
             this.status = !val || val.callOn;
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -115,9 +121,11 @@ export default {
             this.operate = operate;
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.selectSignalCode = selected.code;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.signalList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!signal;
+                this.selectSignalCode = selected.code;
+                this.$refs.table.setCurrentRow(signal);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -127,6 +135,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -155,7 +164,7 @@ export default {
             };
             step.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE;
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 
@@ -170,20 +179,24 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
-                code: `${val.code}`,
+                // code: `${val.code}`,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code,
+                // val: val.code,
                 param: {
                     signalCode: val.code
                 }
             };
             this.selectSignalCode = val.code;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
+                this.$store.dispatch('menuOperation/setSelected', {device: val});
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -192,7 +205,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/twoConfirmation.vue
index d8c5414ba..653f33ef2 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -121,7 +121,7 @@ export default {
                 operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
             }
             this.doClose();
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
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 8a9c2c52a..b7562eb2c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 f78dc6640..fc71660e8 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 28fcef331..75c5f7310 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/intervalStopNumber.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/intervalStopNumber.vue
index a30268197..4642a039e 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/intervalStopNumber.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/intervalStopNumber.vue
@@ -128,7 +128,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue
index a9ff2decd..133743feb 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue
@@ -117,7 +117,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue
index b23dc31bc..d97188d55 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue
@@ -126,7 +126,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue
index c8a3ccbf6..6d736b0d4 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/remoteResetFunc.vue
@@ -174,7 +174,7 @@ export default {
 					param: {sectionCode: this.currentSelect.code}
 				};
 
-				this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+				this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
 					if (valid) {
 						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 						if (isOK) {
@@ -208,7 +208,7 @@ export default {
 
 			this.changeIgnore = false;
 			this.$emit('updateDone')
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
 					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 					this.sure || this.$emit('initSelect', this.currentSelect);
@@ -236,7 +236,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
index 93ebc447a..6a5ad4675 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
@@ -5,7 +5,7 @@
         <el-row>
           <div class="signal-box-title">开始</div>
           <div style="border: 1px solid #ACABAA;padding: 8px;">
-            <el-table ref="table" :data="signalList" height="184px" highlight-current-row @current-change="handleCurrentChangeStar">
+            <el-table :id="domIdStartSignal" ref="table" :data="signalList" height="184px" highlight-current-row @current-change="handleCurrentChangeStar">
               <el-table-column prop="name" label="信号机" />
             </el-table>
           </div>
@@ -13,14 +13,14 @@
         <el-row>
           <div class="signal-box-title">结束</div>
           <div style="border: 1px solid #ACABAA;padding: 8px;">
-            <el-table :data="signalList" height="184px" highlight-current-row @current-change="handleCurrentChangeEnd">
+            <el-table :id="domIdEndSignal" ref="endTable" :data="signalList" height="184px" highlight-current-row @current-change="handleCurrentChangeEnd">
               <el-table-column prop="name" label="信号机" />
             </el-table>
           </div>
         </el-row>
       </el-col>
       <el-col :span="6" class="path-box">
-        <el-table ref="singleTable" :data="tempData" height="412px" highlight-current-row @current-change="handleRowChange">
+        <el-table :id="domIdPath" ref="singleTable" :data="tempData" height="412px" highlight-current-row @current-change="handleRowChange">
           <el-table-column prop="name" label="路径" width="125" />
           <el-table-column prop="direction" label="运行方向">
             <template slot-scope="scope">
@@ -31,13 +31,14 @@
         <el-checkbox v-model="checked">显示复制路径</el-checkbox>
       </el-col>
       <el-col :span="14" style="padding-left: 8px;">
-        <el-tabs v-model="activeName" type="card">
+        <el-tabs :id="domIdRouteTabs" v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="设置进路" name="first">
             <el-row>
               <el-col :span="18">
                 <div class="border-box">
                   <div class="border-box-title">CBTC</div>
                   <el-table
+                    :id="domIdCBTC1"
                     ref="singleTable1"
                     :data="filterRouteList"
                     highlight-current-row
@@ -51,17 +52,18 @@
                   </el-table>
                 </div>
               </el-col>
-              <el-col :span="6">
+              <el-col :id="domIdUnlockType" :span="6">
                 <div class="radio-box-title">解锁类型</div>
                 <div class="radio-box">
-                  <el-radio v-model="unlockType" label="auto" style="display: block;margin-bottom: 10px;">自动</el-radio>
-                  <el-radio v-model="unlockType" label="artificial" style="display: block;">人工</el-radio>
+                  <el-radio v-model="unlockType" label="auto" style="display: block;margin-bottom: 10px;" @input="changeUnlockType">自动</el-radio>
+                  <el-radio v-model="unlockType" label="artificial" style="display: block;" @input="changeUnlockType">人工</el-radio>
                 </div>
               </el-col>
             </el-row>
             <el-row class="border-box">
               <div class="border-box-title">后备</div>
               <el-table
+                :id="domIdReserve1"
                 ref="singleTable2"
                 :data="routeList"
                 highlight-current-row
@@ -87,6 +89,7 @@
               <div class="border-box">
                 <div class="border-box-title">CBTC</div>
                 <el-table
+                  :id="domIdCBTC2"
                   ref="singleTable3"
                   :data="routeList"
                   highlight-current-row
@@ -103,6 +106,7 @@
             <el-row class="border-box">
               <div class="border-box-title">后备</div>
               <el-table
+                :id="domIdReserve2"
                 ref="singleTable4"
                 :data="routeList"
                 highlight-current-row
@@ -164,7 +168,7 @@
         <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!route" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdConfirm" :loading="loading" :disabled="!route" @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdApply" :loading="loading" :disabled="!route" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -204,6 +208,7 @@ export default {
             checked: false,
             unlockType: 'auto',
             forbidRoute: false,
+            changeIgnore: false,
             route: null
         };
     },
@@ -225,11 +230,38 @@ export default {
         domIdClose() {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
-        },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
+        },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
+        },
+        domIdStartSignal() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_startSignal.domId : '';
+        },
+        domIdEndSignal() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_endSignal.domId : '';
+        },
+        domIdPath() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_path.domId : '';
+        },
+        domIdCBTC1() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_CBTC1.domId : '';
+        },
+        domIdCBTC2() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_CBTC2.domId : '';
+        },
+        domIdReserve1() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_reserve1.domId : '';
+        },
+        domIdReserve2() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_reserve2.domId : '';
+        },
+        domIdUnlockType() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_unlockType.domId : '';
+        },
+        domIdRouteTabs() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.domId : '';
         },
         title() {
             return '进路命令';
@@ -240,9 +272,32 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
+        handleClick() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.operation,
+                param: {
+                    activeName: this.activeName
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
+        changeUnlockType() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_unlockType.operation,
+                param: {
+                    unlockType: this.unlockType
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
         doShow(operate) {
             // 如果不是断点激活，而是第一次显示，则需要设置初始值
             this.dialogShow = true;
@@ -256,11 +311,12 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!signal;
                 this.$refs.table.setCurrentRow(signal);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
-                this.handleCurrentChangeStar(signal);
+                // this.handleCurrentChangeStar(signal);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -268,14 +324,21 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
+            this.$refs.table.setCurrentRow();
+            this.$refs.endTable.setCurrentRow();
+            this.$refs.singleTable.setCurrentRow();
             this.$refs.singleTable1.setCurrentRow();
             this.$refs.singleTable2.setCurrentRow();
             this.$refs.singleTable3.setCurrentRow();
             this.$refs.singleTable4.setCurrentRow();
+            this.activeName = 'first';
+            this.unlockType = 'auto';
+            this.changeIgnore = false;
             this.$refs.table.bodyWrapper.scrollTop = 0;
         },
         // 始端信号机点击
         handleCurrentChangeStar(val) {
+            console.log('🚀 ~ file: routeCommand.vue:322 ~ handleCurrentChangeStar ~ val', val);
             if (!val) { return; }
             this.tempData = [];
             this.routeList.forEach(item => {
@@ -283,6 +346,17 @@ export default {
                     this.tempData.push(item);
                 }
             });
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_startSignal.operation,
+                param: {
+                    startSignalCode: `${val.code}`
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
         },
         handleCurrentChangeEnd(val) {
             if (!val) { return; }
@@ -293,6 +367,13 @@ export default {
                 }
             });
             this.tempData = arrList;
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_endSignal.operation,
+                param: {
+                    endSignalCode: `${val.code}`
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
         },
         restoreBeforeDevices() {
             // 恢复之前选中设备
@@ -359,22 +440,26 @@ export default {
 
             // 设置选中指令
             const step = {
-                code: `${row.code}`,
-                operation: OperationEvent.Signal.arrangementRoute.choose.operation,
-                param: {}
+                // code: `${row.code}`,
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_path.operation,
+                param: {
+                    pathCode: `${row.code}`
+                }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: row});
                 }
+                this.$store.dispatch('menuOperation/setSelected', {device: row});
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
         },
         commit(isClose = false) {
             const step = {
+                start: true, // 清空之前的参数
                 over: true,
+                operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                 param: {
                     routeCode: this.route.code,
                     signalCode: (this.selected || {}).startSignalCode
@@ -383,21 +468,22 @@ export default {
 
             if (this.activeName === 'first') {
                 if (this.unlockType === 'auto') {
-                    step.operation = OperationEvent.Signal.atsAutoControl.confirm.operation;
+                    // step.operation = OperationEvent.Signal.atsAutoControl.confirm.operation;
                     step.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
                 } else if (this.unlockType === 'artificial') {
-                    step.operation = OperationEvent.Signal.humanControl.confirm.operation;
+                    // step.operation = OperationEvent.Signal.humanControl.confirm.operation;
                     step.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
+                    step.param.unlockType = this.unlockType;
                 }
             } else if (this.activeName === 'second') {
-                step.operation = OperationEvent.Signal.cancelTrainRoute.confirm.operation;
+                // step.operation = OperationEvent.Signal.cancelTrainRoute.confirm.operation;
                 step.cmdType = CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE;
             } else {
-                step.operation = OperationEvent.Signal.cancelTrainRoute.confirm.operation;
+                // step.operation = OperationEvent.Signal.cancelTrainRoute.confirm.operation;
                 step.cmdType = CMD.Signal.CMD_SIGNAL_SET_ROUTE;
             }
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
@@ -415,15 +501,17 @@ export default {
 
             this.route = val;
             const step = {
-                code: `${val.code}`,
-                operation: OperationEvent.Signal.atsAutoControl.choose.operation,
-                param: {}
+                // code: `${val.code}`,
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_CBTC1.operation,
+                param: {
+                    CBTC1Code: `${val.code}`
+                }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
+                this.$store.dispatch('menuOperation/setSelected', {device: val});
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -435,15 +523,17 @@ export default {
             if (!val) { return; }
 
             const step = {
-                code: `${val.code}`,
-                operation: OperationEvent.Signal.atsAutoControl.choose.operation,
-                param: {}
+                // code: `${val.code}`,
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_reserve1.operation,
+                param: {
+                    code: `${val.code}`
+                }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
+                this.$store.dispatch('menuOperation/setSelected', {device: val});
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -457,15 +547,17 @@ export default {
             this.route = val;
 
             const step = {
-                code: `${val.code}`,
-                operation: OperationEvent.Signal.cancelTrainRoute.choose.operation,
-                param: {}
+                // code: `${val.code}`,
+                operation: OperationEvent.Command.commandNingBo3.Signal_command_CBTC2.operation,
+                param: {
+                    CBTC2Code: `${val.code}`
+                }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
+                this.$store.dispatch('menuOperation/setSelected', {device: val});
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
             });
@@ -480,7 +572,7 @@ export default {
             //     operation: OperationEvent.Signal.cancelTrainRoute.choose.operation,
             //     param: {}
             // };
-            // this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            // this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
             //     if (valid) {
             //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             //         this.selected = val;
@@ -504,7 +596,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -559,7 +651,7 @@ export default {
 	.signal-box-title {
 		color: #000;
 		position: relative;
-		top: 15px;
+		top: 10px;
 		left: 5px;
 		width: 40px;
 		background: #F0F0F0;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue
index dd6b0de08..c2e35d5be 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue
@@ -82,6 +82,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -107,7 +112,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/runningInterval.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/runningInterval.vue
index f4beca65d..2c70a54e7 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/runningInterval.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/runningInterval.vue
@@ -162,7 +162,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
index f1572253d..600dc490b 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
@@ -177,6 +177,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -196,9 +201,12 @@ export default {
 
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                this.changeIgnore = true;
                 this.$refs.singleTable1.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
                 this.isSetSpeed && this.$refs.singleTable2.setCurrentRow(sure ? this.limitList[this.initParams.value / 5 - 1] : 0);
+                setTimeout(()=> {
+                    this.changeIgnore = false;
+                }, 200);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -214,13 +222,15 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
+                this.changeIgnore = true;
                 let index = 0;
                 const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
                 this.$refs.singleTable1.setCurrentRow(section);
-                this.speedLimitValue = this.initParams.value || 0;
+                // this.speedLimitValue = this.initParams.value || 0;
+                this.speedLimitValue = section ? this.getLimitSpeed(section.code) : 0;
                 setTimeout(()=> {
                     this.$refs.singleTable1.bodyWrapper.scrollTop = index * 20;
+                    this.changeIgnore = false;
                 }, 200);
                 this.$emit('updateDone');
                 this.$store.dispatch('training/emitTipFresh');
@@ -230,18 +240,19 @@ export default {
             this.loading = false;
             this.dialogShow = false;
             this.speedLimitValue = 0;
-            this.sure && (this.currentSelect = null);
-            this.sure && this.$refs.singleTable1.setCurrentRow();
-            this.sure && this.isSetSpeed && this.$refs.singleTable2.setCurrentRow();
+            this.currentSelect = null;
+            this.$refs.singleTable1.setCurrentRow();
+            this.isSetSpeed && this.$refs.singleTable2.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
             this.$store.dispatch('training/emitTipFresh');
         },
         commit(isClose = true) {
+            const hasSpeed = this.isSetSpeed ? this.speedLimitValue == this.initParams.value : true;
             if (this.currentSelect &&
 				this.currentSelect.code == this.initSelect.code &&
-				this.speedLimitValue == this.initParams.value) {
+				hasSpeed) {
                 const cacheMap = this.getCacheMap();
                 const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
                 const operate = {
@@ -251,7 +262,7 @@ export default {
                     param: {sectionCode: this.currentSelect.code, speedLimitValue:this.speedLimitValue}
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         if (isOK) {
@@ -274,20 +285,21 @@ export default {
         selectLine1(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : this.getLimitSpeed(val.code)});
             this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect, {value: this.speedLimitValue});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -296,19 +308,20 @@ export default {
         selectLine2(val) {
             if (!val) { return; }
             this.speedLimitValue = val.value;
+            this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : 0});
             this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
                 operation: OperationEvent.Command.common.select.operation,
-                val: val.value
+                param: {
+                    val: val.value
+                }
             };
 
-            this.changeIgnore = false;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : 0});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -342,7 +355,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
index 8274325d4..3cef39ea6 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
@@ -97,6 +97,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -124,7 +129,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
index 76e48d703..e2ff2e1c8 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
@@ -141,6 +141,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -161,8 +166,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                const section = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
+                this.changeIgnore = !!section;
+                this.$refs.table.setCurrentRow(section);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -180,6 +186,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!section;
                 this.$refs.table.setCurrentRow(section);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -191,8 +198,9 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
-            this.sure && this.$refs.table.setCurrentRow();
+            this.currentSelect = null;
+            this.changeIgnore = false;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -210,7 +218,7 @@ export default {
                     param: {sectionCode: this.currentSelect.code}
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         if (isOK) {
@@ -234,21 +242,25 @@ export default {
         handleChangeLine(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -278,7 +290,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
index 49df57016..ac51f613c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
@@ -102,6 +102,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -153,7 +158,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
index c19dd7ef6..366f8eea6 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
@@ -143,6 +143,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -161,8 +166,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -178,9 +184,10 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -191,8 +198,9 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
-            this.sure && this.$refs.table.setCurrentRow();
+            this.changeIgnore = false;
+            this.currentSelect = null;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -210,7 +218,7 @@ export default {
                     param: {signalCode: this.currentSelect.code}
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         if (isOK) {
@@ -233,21 +241,25 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -276,7 +288,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$emit('cancelCommand');
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
index adbcc593d..8dc70411e 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
@@ -136,6 +136,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -151,8 +156,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -163,9 +169,10 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -176,8 +183,9 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
-            this.sure && this.$refs.table.setCurrentRow();
+            this.currentSelect = null;
+            this.changeIgnore = false;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -190,12 +198,12 @@ export default {
                 const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
                 const operate = {
                     cmdType: this.sure && isOK ? this.cmdType : null,
-                    operation: isClose ? OperationEvent.Signal.lock.confirm.operation : OperationEvent.Signal.unlock.confirm.operation,
+                    operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
                     over: this.sure,
                     param: {signalCode: this.currentSelect.code}
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         if (isOK) {
@@ -218,21 +226,25 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(_ => {
                 this.$refs.noticeInfo.doShow();
@@ -258,7 +270,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue
index 4d1160abe..a40f416ad 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue
@@ -87,6 +87,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -118,7 +123,7 @@ export default {
             const operate = {
                 operation: ''
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -143,7 +148,7 @@ export default {
                 cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
index 5d0da5906..60a7d0389 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
@@ -142,6 +142,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -156,8 +161,9 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -168,9 +174,10 @@ export default {
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
                 let index = 0;
-                this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
+                const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!cRow;
+                this.$refs.table.setCurrentRow(cRow);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
@@ -181,8 +188,8 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
-            this.sure && this.$refs.table.setCurrentRow();
+            this.currentSelect = null;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -200,7 +207,7 @@ export default {
                     param: {signalCode: this.currentSelect.code}
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         if (isOK) {
@@ -223,21 +230,25 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.changeIgnore = false;
             this.$emit('updateDone');
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(_ => {
                 this.$refs.noticeInfo.doShow();
@@ -268,7 +279,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.initEle = null;
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalMode.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalMode.vue
index 12ddb5392..7eac0e338 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalMode.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalMode.vue
@@ -18,7 +18,7 @@
           <el-table-column v-if="!isCbtc" prop="status" label="后备模式进程" />
         </el-table>
       </el-col>
-      <el-col :span="5" :offset="1" v-if="sure">
+      <el-col v-if="sure" :span="5" :offset="1">
         <div class="set-status-title">命令</div>
         <div class="set-status-box">
           <el-radio v-model="command" :label="true">确认</el-radio>
@@ -32,7 +32,7 @@
         <el-button :id="domIdConfirm" type="primary" :disabled="!!disabled" :loading="loading" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :disabled="!!disabled" :loading="loading"  @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdConfirm" type="primary" :disabled="!!disabled" :loading="loading" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -52,40 +52,40 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 
 export default {
-	props: {
-		initCacheMap: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		initInfo: {
-			type: Object,
-			default() {
-				return {}
-			}
-		},
-		updateDone: {
-			type: Number,
-			default: 0
-		}
-	},
     components: {
         NoticeInfo
     },
+    props: {
+        initCacheMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        initInfo: {
+            type: Object,
+            default() {
+                return {};
+            }
+        },
+        updateDone: {
+            type: Number,
+            default: 0
+        }
+    },
     data() {
         return {
-			title: '',
+            title: '',
             status: false,
             command: true,
             allChecked: false,
             dialogShow: false,
             loading: false,
             operate: {},
-			sure: false,
-			currentSelect: null,
-			noInit: true,
-			changeIgnore: false
+            sure: false,
+            currentSelect: null,
+            noInit: true,
+            changeIgnore: false
         };
     },
     computed: {
@@ -95,21 +95,21 @@ export default {
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-		tempList() {
-			return this.signalList;
-		},
-		initSelect() {
-			return this.initInfo.initSelect||{};
-		},
-        isCbtc() {
-            return  true //this.operate.operation.includes(OperationEvent.Command.mBar.cbtcMode.operation);
+        tempList() {
+            return this.signalList;
+        },
+        initSelect() {
+            return this.initInfo.initSelect || {};
+        },
+        isCbtc() {
+            return true; // this.operate.operation.includes(OperationEvent.Command.mBar.cbtcMode.operation);
+        },
+        cmdType() {
+            return this.isCbtc ? CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING : CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING;
+        },
+        disabled() {
+            return !this.currentSelect || this.noInit;
         },
-		cmdType() {
-			return this.isCbtc ? CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING : CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING;
-		},
-		disabled() {
-			return !this.currentSelect || this.noInit;
-		},
         domIdChoose() {
             return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
         },
@@ -129,103 +129,108 @@ export default {
                 this.commit();
             }
         },
-		updateDone() {
-			if (this.currentSelect) {
-				this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code]||{}).done != 'one';
-			}
-		}
+        updateDone() {
+            if (this.currentSelect) {
+                this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
+            }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
+        }
     },
     methods: {
-		getCacheMap() {
-			return this.initCacheMap[this.cmdType.value]||{};
-		},
+        getCacheMap() {
+            return this.initCacheMap[this.cmdType.value] || {};
+        },
         doShow(operate, sure) {
-			this.operate = operate;
-			this.sure = sure;
+            this.operate = operate;
+            this.sure = sure;
 
-			if (sure) {
-	            this.title = `${this.isCbtc ?  '确认/取消CBTC模式' : '确认/取消后备模式'}`;
-			} else {
-	            this.title = `${this.isCbtc ?  '初始化CBTC模式' : '初始化后备模式'}`;
-				this.command = true;
-			}
+            if (sure) {
+	            this.title = `${this.isCbtc ? '确认/取消CBTC模式' : '确认/取消后备模式'}`;
+            } else {
+	            this.title = `${this.isCbtc ? '初始化CBTC模式' : '初始化后备模式'}`;
+                this.command = true;
+            }
 
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
             this.dialogShow = true;
             this.$nextTick(function () {
-				this.changeIgnore = sure;
-				this.$refs.table.setCurrentRow(sure? this.tempList.find(el => el.code == this.initSelect.code): null);
+                this.changeIgnore = sure;
+                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-			this.sure && (this.currentSelect = null);
-			this.sure && this.$refs.table.setCurrentRow();
-			this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
-				Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
-			)
+            this.sure && (this.currentSelect = null);
+            this.sure && this.$refs.table.setCurrentRow();
+            this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
+                Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
+            );
             this.$store.dispatch('training/emitTipFresh');
         },
-		handleCurrentChange(val) {
-			if (!val) { return; }
-			this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
-			this.$emit('updateDone')
+        handleCurrentChange(val) {
+            if (!val) { return; }
+            this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.$emit('updateDone');
             if (this.changeIgnore) { return; }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-			this.changeIgnore = false;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.changeIgnore = false;
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.sure || this.$emit('initSelect', this.currentSelect);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(_ => {
                 this.$refs.noticeInfo.doShow();
             });
         },
         commit(isClose = false) {
-			if (this.currentSelect &&
+            if (this.currentSelect &&
 				this.currentSelect.code == this.initSelect.code) {
-				const cacheMap= this.getCacheMap();
-				const isOK = this.command&&(!this.sure || this.sure&&cacheMap[this.currentSelect.code])
-				const step = {
-					cmdType: this.sure&&isOK? this.cmdType: null,
-					operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
-					over: this.sure,
-					param: { signalCode: this.currentSelect.code }
-				};
+                const cacheMap = this.getCacheMap();
+                const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
+                const step = {
+                    cmdType: this.sure && isOK ? this.cmdType : null,
+                    operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
+                    over: this.sure,
+                    param: { signalCode: this.currentSelect.code }
+                };
 
-				this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
-					if (valid) {
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-						if (isOK) {
-							this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure? 'two': 'one'});
-						} else {
-							this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
-						}
-						this.$store.dispatch('map/flushMapRef');
-						isClose && this.doClose();
-					}
-				}).catch(() => {
-					isClose && this.doClose();
-					this.$refs.noticeInfo.doShow();
-				});
-			} else {
-				this.$messageBox('两次选择不一致');
-			}
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        if (isOK) {
+                            this.$root.$emit('appendCache', this.cmdType.value, this.currentSelect.code, { done: this.sure ? 'two' : 'one'});
+                        } else {
+                            this.$root.$emit('removeCache', this.cmdType.value, this.currentSelect.code);
+                        }
+                        this.$store.dispatch('map/flushMapRef');
+                        isClose && this.doClose();
+                    }
+                }).catch(() => {
+                    isClose && this.doClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+            } else {
+                this.$messageBox('两次选择不一致');
+            }
         },
         cancel() {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
index 500119a46..a941be6cf 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
@@ -64,7 +64,8 @@ export default {
             operate: null,
             allChecked: false,
             dialogShow: false,
-            loading: false
+            loading: false,
+            changeIgnore: false
         };
     },
     computed: {
@@ -116,22 +117,33 @@ export default {
                     this.status = false;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
-                    this.$refs.table.setCurrentRow(this.selected);
+                    // this.$refs.table.setCurrentRow(this.selected);
                 }
             }).catch(() => {
                 console.log();
@@ -152,17 +164,19 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const signal = this.filterSignalList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!signal;
                 this.$refs.table.setCurrentRow(signal);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
-                this.handleCurrentChange(signal);
+                // this.handleCurrentChange(signal);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -174,7 +188,7 @@ export default {
                 param: { signalCode: this.selected.code }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
@@ -191,7 +205,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
index 7f9060343..d6fd29d4d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
@@ -105,6 +105,11 @@ export default {
                     this.status = false;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -166,7 +171,7 @@ export default {
                 param: {standCodes: this.selectedStandList}
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
@@ -198,7 +203,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
index 6148dd226..f4e61d9de 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
@@ -86,6 +86,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -133,7 +138,7 @@ export default {
                 cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
index 124893cf9..36a5c0b9f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetain.vue
@@ -202,7 +202,7 @@ export default {
                     operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation
                 };
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (isClose) {
@@ -239,7 +239,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue
index eaa2cf617..5f718901f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationDevolution.vue
@@ -51,6 +51,14 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             status: true,
@@ -96,9 +104,6 @@ export default {
         domIdApply() {
             return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
         },
-        prdType() {
-            return this.$store.state.training.prdType;
-        },
         concertrateStationList() {
             return this.stationList.filter(station=>{
                 return station.centralized;
@@ -109,7 +114,7 @@ export default {
         'selected': function(val) {
             if (val) {
                 const stationEle = this.$store.getters['map/getDeviceByCode'](val.code);
-                if (stationEle && this.$store.state.training.prdType == '02') {
+                if (stationEle && this.work == 'dispatchWork') {
                     this.loading = false;
                     if (stationEle.controller) {
                         const memberData = this.$store.state.training.memberData;
@@ -162,7 +167,7 @@ export default {
                 operation: OperationEvent.Command.common.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -171,12 +176,12 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/setSelected', {device: val});
@@ -197,7 +202,7 @@ export default {
             // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
             steps.cmdType = CMD.Station.CMD_STATION_CONTROL_DEVOLVE;
 
-            this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', steps).then(({ valid }) => {
                 if (valid) {
                     isClose && this.doClose();
                     this.$emit('commandSuccess', val.code);
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue
index 39c3f5128..470e74ad5 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationReclaim.vue
@@ -70,6 +70,14 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             status: true,
@@ -111,9 +119,6 @@ export default {
         domIdApply() {
             return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
         },
-        prdType() {
-            return this.$store.state.training.prdType;
-        },
         concertrateStationList() {
             return this.stationList.filter((station) => {
                 return station.centralized;
@@ -124,7 +129,7 @@ export default {
         'selected': function(val) {
             if (val) {
                 const stationEle = this.$store.getters['map/getDeviceByCode'](val.code);
-                if (stationEle && this.$store.state.training.prdType == '02') {
+                if (stationEle && this.work == 'dispatchWork') {
                     this.loading = false;
                     if (stationEle.controller) {
                         const memberData = this.$store.state.training.memberData;
@@ -177,7 +182,7 @@ export default {
                 operation: OperationEvent.Command.common.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -188,13 +193,13 @@ export default {
                 return;
             }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
             this.$store
-                .dispatch('training/nextNew', step)
+                .dispatch('trainingNew/next', step)
                 .then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', {
@@ -224,7 +229,7 @@ export default {
             steps.cmdType = CMD.Station.CMD_STATION_CONTROL_REVOKE;
 
             this.$store
-                .dispatch('training/nextNew', steps)
+                .dispatch('trainingNew/next', steps)
                 .then(({ valid }) => {
                     if (valid) {
                         isClose && this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
index bd8133e5b..98797fb9d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationRequest.vue
@@ -52,6 +52,14 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             status: true,
@@ -98,9 +106,6 @@ export default {
         domIdApply() {
             return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
         },
-        prdType() {
-            return this.$store.state.training.prdType;
-        },
         concertrateStationList() {
             return this.stationList.filter(station=>{
                 return station.centralized;
@@ -113,7 +118,7 @@ export default {
                 const stationEle = this.$store.getters['map/getDeviceByCode'](val.code);
                 if (stationEle) {
                     this.loading = false;
-                    if (this.$store.state.training.prdType == '02') {
+                    if (this.work == 'dispatchWork') {
                         if (stationEle.controller) {
                             const memberData = this.$store.state.training.memberData;
                             if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
@@ -128,7 +133,7 @@ export default {
                         } else {
                             this.status = false;
                         }
-                    } else if (this.$store.state.training.prdType == '01') {
+                    } else if (this.work == 'localWork') {
                         if (stationEle.controller) {
                             const memberData = this.$store.state.training.memberData;
                             if (memberData[stationEle.controller].userId == this.$store.state.user.id) {
@@ -190,7 +195,7 @@ export default {
                 operation: OperationEvent.Command.common.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -199,12 +204,12 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/setSelected', {device: val});
@@ -224,7 +229,7 @@ export default {
             // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
             steps.cmdType = CMD.Station.CMD_STATION_CONTROL_APPLY;
 
-            this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', steps).then(({ valid }) => {
                 if (valid) {
                     if (isClose) {
                         this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
index 9d8b8b906..1b5713629 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
@@ -73,6 +73,14 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             status: true,
@@ -85,7 +93,8 @@ export default {
             station:{},
             stationCode: '',
             stationName:'',
-            message:''
+            message:'',
+            changeIgnore: false
         };
     },
     computed: {
@@ -123,9 +132,6 @@ export default {
         domIdApply() {
             return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
         },
-        prdType() {
-            return this.$store.state.training.prdType;
-        },
         concertrateStationList() {
             return this.stationList.filter(station=>{
                 return station.centralized;
@@ -146,6 +152,11 @@ export default {
             } else {
                 this.status = true;
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -162,6 +173,7 @@ export default {
             this.dialogShow = true;
             this.$nextTick(function () {
                 const stand = this.centralizedStaionList.find(el => el.code == selected.code);
+                this.changeIgnore = !!stand;
                 this.$refs.table.setCurrentRow(stand);
                 this.$store.dispatch('training/emitTipFresh');
             });
@@ -190,6 +202,7 @@ export default {
             this.dialogShow = false;
             this.status = true;
             this.$store.dispatch('menuOperation/setSelected', {device: {}});
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('socket/shiftMsgQueue');
@@ -200,7 +213,7 @@ export default {
                 operation: OperationEvent.Command.common.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -208,16 +221,22 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
-                val: val.code
+                param: {
+                    val: val.code
+                }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -235,7 +254,7 @@ export default {
             // steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL : CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL;
             steps.cmdType = CMD.Station.CMD_STATION_CONTROL_TRANSFER;
 
-            this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', steps).then(({ valid }) => {
                 if (valid) {
                     isClose && this.doClose();
                     this.$emit('commandSuccess', val.code);
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
index 30d6fd314..6aab2f2f6 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
@@ -61,7 +61,8 @@ export default {
             allChecked: false,
             dialogShow: false,
             loading: false,
-            isActive: false
+            isActive: false,
+            changeIgnore: false
         };
     },
     computed: {
@@ -105,6 +106,11 @@ export default {
                     this.status = false;
                 }
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -121,6 +127,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!switchEle;
                 this.$refs.table.setCurrentRow(switchEle);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -131,6 +138,7 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -142,7 +150,7 @@ export default {
                 param: { switchCode: this.selected.code}
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
@@ -154,16 +162,20 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
+            this.$store.dispatch('menuOperation/setSelected', {device: val});
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$store.dispatch('menuOperation/setSelected', {device: val});
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -181,7 +193,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
index c51a98410..226c6517c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
@@ -143,6 +143,11 @@ export default {
             if (this.currentSelect) {
                 this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -163,8 +168,9 @@ export default {
             this.currentSelect = sure ? this.$store.getters['map/getDeviceByCode'](this.initSelect.code) : null;
             this.dialogShow = true;
             this.$nextTick(function () {
-                this.changeIgnore = sure;
-                this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
+                const switchEle = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
+                this.changeIgnore = !!switchEle;
+                this.$refs.table.setCurrentRow(switchEle);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -182,6 +188,7 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const switchEle = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!switchEle;
                 this.$refs.table.setCurrentRow(switchEle);
                 setTimeout(()=> {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
@@ -193,8 +200,8 @@ export default {
         doClose() {
             this.loading = false;
             this.dialogShow = false;
-            this.sure && (this.currentSelect = null);
-            this.sure && this.$refs.table.setCurrentRow();
+            this.currentSelect = null;
+            this.$refs.table.setCurrentRow();
             this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
                 Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
             );
@@ -212,7 +219,7 @@ export default {
                     param: { switchCode: this.currentSelect.code }
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         if (isOK) {
@@ -236,20 +243,22 @@ export default {
         handleCurrentChange(val) {
             if (!val) { return; }
             this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.sure || this.$emit('initSelect', this.currentSelect);
             this.$emit('updateDone');
-            if (this.changeIgnore) { return; }
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
 
             const step = {
-                code: val.code,
+                // code: val.code,
                 operation: OperationEvent.Command.common.choose.operation,
                 val: val.code
             };
 
-            this.changeIgnore = false;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.sure || this.$emit('initSelect', this.currentSelect);
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -278,7 +287,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
index 757db3a3b..7124cb5ca 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
@@ -3,6 +3,7 @@
     <el-row>
       <el-col :span="18">
         <el-table
+          :id="domIdChoose"
           ref="table"
           :data="switchList"
           highlight-current-row
@@ -30,20 +31,20 @@
       </el-col>
       <el-col :span="6">
         <div class="radio-box-title">设置模式</div>
-        <div class="radio-box">
-          <el-radio v-model="mode" label="auto" :disabled="!!selectedSwitch.auto" style="display: block;margin-bottom: 10px;">自动</el-radio>
-          <el-radio v-model="mode" label="artificial" :disabled="!selectedSwitch.auto" style="display: block;">人工</el-radio>
+        <div :id="domIdSetMode" class="radio-box">
+          <el-radio v-model="mode" label="auto" :disabled="!!selectedSwitch.auto" style="display: block;margin-bottom: 10px;" @input="changeMode">自动</el-radio>
+          <el-radio v-model="mode" label="artificial" :disabled="!selectedSwitch.auto" style="display: block;" @input="changeMode">人工</el-radio>
         </div>
         <div class="radio-box-title">设置位置</div>
-        <div class="radio-box">
-          <el-radio v-model="position" label="normal" :disabled="!!(selectedSwitch.pos=='N' || selectedSwitch.auto)" style="display: block;margin-bottom: 10px;">定位</el-radio>
-          <el-radio v-model="position" label="reserve" :disabled="!!(selectedSwitch.pos=='R' || selectedSwitch.auto)" style="display: block;">反位</el-radio>
+        <div :id="domIdSetPosition" class="radio-box">
+          <el-radio v-model="position" label="normal" :disabled="!!(selectedSwitch.pos=='N' || selectedSwitch.auto)" style="display: block;margin-bottom: 10px;" @input="changePosition">定位</el-radio>
+          <el-radio v-model="position" label="reserve" :disabled="!!(selectedSwitch.pos=='R' || selectedSwitch.auto)" style="display: block;" @input="changePosition">反位</el-radio>
         </div>
         <div class="radio-box-title">设置预留</div>
-        <div class="radio-box">
-          <el-radio v-model="reserved" label="auto" :disabled="true" style="display: block;margin-bottom: 10px;">自动与预留</el-radio>
-          <el-radio v-model="reserved" label="reversed" :disabled="true" style="display: block;margin-bottom: 10px;">预留</el-radio>
-          <el-radio v-model="reserved" label="release" :disabled="true" style="display: block;">释放</el-radio>
+        <div :id="domIdSetReserved" class="radio-box">
+          <el-radio v-model="reserved" label="auto" :disabled="true" style="display: block;margin-bottom: 10px;" @input="changeReserved">自动与预留</el-radio>
+          <el-radio v-model="reserved" label="reversed" :disabled="true" style="display: block;margin-bottom: 10px;" @input="changeReserved">预留</el-radio>
+          <el-radio v-model="reserved" label="release" :disabled="true" style="display: block;" @input="changeReserved">释放</el-radio>
         </div>
       </el-col>
     </el-row>
@@ -52,7 +53,7 @@
         <el-button :id="domIdConfirm" type="primary" :disabled="!selectedSwitchCode" :loading="loading" :selected="true" @click="commit(true)">确定(O)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :disabled="!selectedSwitchCode" :loading="loading" :selected="true" @click="commit(false)">应用(A)</el-button>
+        <el-button :id="domIdApply" type="primary" :disabled="!selectedSwitchCode" :loading="loading" :selected="true" @click="commit(false)">应用(A)</el-button>
       </el-col>
       <el-col :span="4" :offset="2">
         <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
@@ -88,7 +89,8 @@ export default {
             selectedSwitch: {},
             mode: '',
             position: '',
-            reserved: ''
+            reserved: '',
+            changeIgnore: false
 
         };
     },
@@ -103,10 +105,22 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdChoose() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
+            return this.dialogShow ? OperationEvent.Switch.turnout.menu.domId : '';
         },
         domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
+            return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
+        },
+        domIdApply() {
+            return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
+        },
+        domIdSetMode() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Switch_command_setMode.domId : '';
+        },
+        domIdSetPosition() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Switch_command_setPosition.domId : '';
+        },
+        domIdSetReserved() {
+            return this.dialogShow ? OperationEvent.Command.commandNingBo3.Switch_command_setReserved.domId : '';
         },
         title() {
             return '道岔命令';
@@ -117,9 +131,41 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
+        changeMode() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Switch_command_setMode.operation,
+                param: {
+                    val: this.mode
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
+        changePosition() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Switch_command_setPosition.operation,
+                param: {
+                    val: this.position
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
+        changeReserved() {
+            const step = {
+                operation: OperationEvent.Command.commandNingBo3.Switch_command_setReserved.operation,
+                param: {
+                    val: this.reserved
+                }
+            };
+            this.$store.dispatch('trainingNew/next', step);
+        },
         doShow(operate) {
             // 如果不是断点激活，而是第一次显示，则需要设置初始值
             this.dialogShow = true;
@@ -137,11 +183,12 @@ export default {
             this.$nextTick(function () {
                 let index = 0;
                 const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
+                this.changeIgnore = !!switchEle;
                 this.$refs.table.setCurrentRow(switchEle);
                 setTimeout(() => {
                     this.$refs.table.bodyWrapper.scrollTop = index * 20;
                 }, 200);
-                this.handleCurrentChange(switchEle);
+                // this.handleCurrentChange(switchEle);
                 this.$store.dispatch('training/emitTipFresh');
             });
         },
@@ -150,6 +197,7 @@ export default {
             this.dialogShow = false;
             this.mode = '';
             this.position = '';
+            this.changeIgnore = false;
             this.$refs.table.setCurrentRow();
             this.$store.dispatch('training/emitTipFresh');
         },
@@ -174,7 +222,7 @@ export default {
                 param: params
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.mode = '';
@@ -192,19 +240,15 @@ export default {
         },
         handleCurrentChange(val) {
             if (!val) { return; }
-            commitOperate(menuOperate.Switch.turnout, {code:val.code}).then(({valid, operate})=>{
-                if (valid) {
-                    this.position = '';
-                    const switchModel = this.$store.getters['map/getDeviceByCode'](val.code);
-                    this.selectedSwitchCode = val.code;
-                    this.selectedSwitch = switchModel;
-                    // this.mode = elem.auto ? 'artificial' : 'auto';
-                    // if (!elem.auto) {
-                    //     if (elem.normalPosition) { this.position = 'reverse'; }
-                    //     if (elem.reversePosition) { this.position = 'normal'; }
-                    // }
-                }
-            });
+            this.position = '';
+            const switchModel = this.$store.getters['map/getDeviceByCode'](val.code);
+            this.selectedSwitchCode = val.code;
+            this.selectedSwitch = switchModel;
+            if (this.changeIgnore) {
+                this.changeIgnore = false;
+                return;
+            }
+            commitOperate(menuOperate.Switch.turnout, {code:val.code});
         },
         getSwitchPosition(code) {
             const elem = this.$store.getters['map/getDeviceByCode'](code);
@@ -237,7 +281,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
index 7d4a8d71a..671ea6ae9 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
@@ -83,6 +83,11 @@ export default {
             if (this.show) {
                 this.commit();
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (!val && this.dialogShow) {
+                this.doClose();
+            }
         }
     },
     methods: {
@@ -130,7 +135,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainCancelDeviation.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainCancelDeviation.vue
index 452e98f07..36f87e030 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainCancelDeviation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainCancelDeviation.vue
@@ -170,7 +170,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDepart.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDepart.vue
index cdcd74950..016553dc2 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDepart.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDepart.vue
@@ -139,7 +139,7 @@ export default {
                 cmdType: CMD.Train.CMD_TRAIN_DEPARTURE,
                 param: { groupNumber: this.selectTrainCode }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -158,7 +158,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDetail.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDetail.vue
index 30a405917..8190b8501 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDetail.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDetail.vue
@@ -264,7 +264,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue
index b1c8f5433..560b58b56 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue
@@ -215,7 +215,7 @@ export default {
                 steps.cmdType = CMD.TrainWindow.CMD_TRAIN_SET_HEAD;
                 steps.param.destinationCode = this.selectedRunPath;
             }
-            this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', steps).then(({ valid }) => {
                 if (valid) {
                     this.loading = false;
                     if (isClose) {
@@ -249,7 +249,7 @@ export default {
                 params: { serviceNumber: row.serviceNumber }
             };
             const _that = this;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     _that.selectedService = row.serviceNumber;
                     _that.judgeCanCommit();
@@ -265,7 +265,7 @@ export default {
                         operation: OperationEvent.Command.common.choose1.operation,
                         val: row.code
                     };
-                    this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                         if (valid) {
                             const oldRunPath = [...this.$store.state.training.runPathList];
                             runPath.forEach(path=>{
@@ -313,7 +313,7 @@ export default {
                     operation: OperationEvent.Command.common.choose.operation,
                     val: row.code
                 };
-                this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         // this.$store.dispatch('menuOperation/setSelected', {device: row});
@@ -348,7 +348,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue
index 9a6e428dd..2bb5335ac 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue
@@ -117,7 +117,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
index 385bf3dea..ec22ae85f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
@@ -271,7 +271,7 @@ export default {
                     destinationCode: val.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     _that.stationStandList.forEach(item => {
@@ -298,7 +298,7 @@ export default {
                     groupNumber: val
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     getStandListByRunLineOrTrainCode(_that.$route.query.group, { groupNumber: val }).then(resp => {
@@ -330,7 +330,7 @@ export default {
             } else {
                 step.cmdType = this.status ? CMD.Train.CMD_TRAIN_SKIP_STOP : CMD.Train.CMD_TRAIN_CANCEL_SKIP_STOP;
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     isClose && this.doClose();
@@ -345,7 +345,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.common.close.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainRunType.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainRunType.vue
index 7f7ec67c5..b518f0fef 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainRunType.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainRunType.vue
@@ -150,7 +150,7 @@ export default {
                 cmdType: CMD.Train.CMD_TRAIN_SET_RUN_TYPE,
                 param: { runType: this.selectRunType, groupNumber: this.selectTrainCode }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -165,7 +165,7 @@ export default {
                 operation: OperationEvent.Train.trainSetRunType.selected2.operation
             };
             const _that = this;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 _that.selectRunType = row.value;
             });
         },
@@ -175,7 +175,7 @@ export default {
                 operation: OperationEvent.Train.trainSetRunType.selected1.operation
             };
             const _that = this;
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.selectTrainCode = code;
                     const train = this.$store.getters['map/getDeviceByCode'](code);
@@ -194,7 +194,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
index 145d4e27f..05d37b17d 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue
index a795b40d7..f18659efb 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue
@@ -113,7 +113,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue b/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue
index 49912922a..44bee1257 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuLimit.vue
@@ -11,8 +11,8 @@ import CancelAllLimit from '@/jmapNew/theme/components/menus/dialog/cancelAllLim
 import { mapGetters } from 'vuex';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'MenuLimit',
@@ -26,28 +26,25 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             systemName:'ningbo-01__systerm',
-            menuNormal: {
-                Local: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ]
-            }
+            menuNormal: [
+                {
+                    label: '取消全线临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
+                }
+            ]
         };
     },
     computed: {
@@ -71,7 +68,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
         },
         doShow(point) {
             this.initMenu();
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
index f3801ef05..8a2bd0c41 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSection.vue
@@ -25,6 +25,7 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SectionMenu',
@@ -62,93 +63,89 @@ export default {
             default() {
                 return 0;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '区段故障解锁',
-                    //     handler: this.fault,
-                    //     cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    // },
-                    // {
-                    //     label: '区段跟踪激活',
-                    //     handler: this.active,
-                    //     cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    // },
-                    // {
-                    //     label: '区段跟踪切除',
-                    //     handler: this.split,
-                    //     cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    // },
-                ],
-                Center: [
-                    {
-                        label: '开放',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitOpen
-                            },
-                            {
-                                label: '确定/取消',
-                                handler: this.handlerOpen
-                            }
-                        ]
-                    },
-                    {
-                        label: '关闭',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitClose
-                            },
-                            {
-                                label: '确定/取消',
-                                handler: this.handlerClose
-                            }
-                        ]
-                    },
-                    {
-                        label: '临时限速',
-                        children: [
-                            {
-                                label: '设置',
-                                children: [
-                                    {
-                                        label: '初始化',
-                                        handler: this.handlerInitSetLimit
-                                    },
-                                    {
-                                        label: '确定/取消',
-                                        handler: this.handlerSetLimit
-                                    }
-                                ]
-                            },
-                            {
-                                label: '清除',
-                                children: [
-                                    {
-                                        label: '初始化',
-                                        handler: this.handlerInitCancelLimit
-                                    },
-                                    {
-                                        label: '确定/取消',
-                                        handler: this.handlerCancelLimit
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        label: '显示',
-                        handler: this.handlerDetail
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '开放',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_open_init,
+                            handler: this.handlerInitOpen
+                        },
+                        {
+                            label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_open_sure,
+                            handler: this.handlerOpen
+                        }
+                    ]
+                },
+                {
+                    label: '关闭',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_close_init,
+                            handler: this.handlerInitClose
+                        },
+                        {
+                            label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_section_close_sure,
+                            handler: this.handlerClose
+                        }
+                    ]
+                },
+                {
+                    label: '临时限速',
+                    children: [
+                        {
+                            label: '设置',
+                            children: [
+                                {
+                                    label: '初始化',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_init,
+                                    handler: this.handlerInitSetLimit
+                                },
+                                {
+                                    label: '确定/取消',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure,
+                                    handler: this.handlerSetLimit
+                                }
+                            ]
+                        },
+                        {
+                            label: '清除',
+                            children: [
+                                {
+                                    label: '初始化',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init,
+                                    handler: this.handlerInitCancelLimit
+                                },
+                                {
+                                    label: '确定/取消',
+                                    operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure,
+                                    handler: this.handlerCancelLimit
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_section_detail,
+                    handler: this.handlerDetail
+                }
+            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuSection.setFault'),
@@ -189,7 +186,7 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
                 cmdType: CMD.Section.CMD_Train_Init_Plan
@@ -201,7 +198,17 @@ export default {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
                 // this.menu = MenuContextHandler.covert(this.menuNormal);
-                this.menu = this.menuNormal.Center;
+                // this.menu = this.menuNormal.Center;
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                    if (menuItem.roleDisabled) {
+                        status = true;
+                    }
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
@@ -315,32 +322,77 @@ export default {
                 }
             });
         },
-        handlerInitOpen() {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_init, false, this.selected);
+        handlerInitOpen(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, false, this.selected);
         },
-        handlerOpen() {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_sure, true, this.selected);
+        handlerOpen(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitClose() {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_init, false, this.selected);
+        handlerInitClose(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, false, this.selected);
         },
-        handlerClose() {
-            this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_sure, true, this.selected);
+        handlerClose(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionOpen.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitSetLimit() {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_init, false, this.selected);
+        handlerInitSetLimit(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, false, this.selected);
         },
-        handlerSetLimit() {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure, true, this.selected);
+        handlerSetLimit(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitCancelLimit() {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init, false, this.selected);
+        handlerInitCancelLimit(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, false, this.selected);
         },
-        handlerCancelLimit() {
-            this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure, true, this.selected);
+        handlerCancelLimit(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionLimitSpeed.rightClickShow(item.operate, true, this.selected);
         },
-        handlerDetail() {
-            this.$refs.sectionShow.rightClickShow('', this.selected);
+        handlerDetail(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.sectionShow.rightClickShow(item.operate, this.selected);
         }
     }
 };
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
index b0d518c6a..927da566c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
@@ -29,6 +29,7 @@ import SignalModel from './menuDialog/signalModel';
 import SignalBlock from './menuDialog/signalBlock';
 import SignalDetail from './menuDialog/signalDetail';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SignalMenu',
@@ -68,104 +69,119 @@ export default {
             default() {
                 return 0;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '引导',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitGuide
-                            },
-                            {
-                                label: '确定/取消',
-                                handler: this.handlerGuide
-                            },
-                            {
-                                label: '清除',
-                                handler: this.handlerCancelGuide
-                            }
-                        ]
-                    },
-                    {
-                        label: '取消允许锁闭',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitAllowLock
-                            },
-                            {
-                                label: '确定/取消',
-                                handler: this.handlerAllowLock
-                            }
-                        ]
-                    },
-                    {
-                        label: '进路',
-                        children: [
-                            {
-                                label: '命令',
-                                handler: this.handlerRouteCommand
-                            },
-                            {
-                                label: '显示',
-                                children: [
-                                    {
-                                        label: 'CBTC进路信息',
-                                        handler: this.undeveloped
-                                    },
-                                    {
-                                        label: '后备进路信息',
-                                        handler: this.undeveloped
-                                    }
-                                ]
-                            }
-                        ]
-                    },
-                    {
-                        label: '信号指示模式',
-                        handler: this.handlerSignalModel,
-                        cmdType: ''
-                    },
-                    {
-                        label: '封锁',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitBlock
-                            },
-                            {
-                                label: '确认/取消',
-                                handler: this.handlerBlock
-                            }
-                        ]
-                    },
-                    {
-                        label: '解除封锁',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitUnblock
-                            },
-                            {
-                                label: '确认/取消',
-                                handler: this.handlerUnblock
-                            }
-                        ]
-                    },
-                    {
-                        label: '显示',
-                        handler: this.handlerDetail
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '引导',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Signal.guide.initMenu,
+                            handler: this.handlerInitGuide
+                        },
+                        {
+                            label: '确定/取消',
+                            operate: OperationEvent.Signal.guide.menu,
+                            handler: this.handlerGuide
+                        },
+                        {
+                            label: '清除',
+                            operate: OperationEvent.Signal.cancelGuide.menu,
+                            handler: this.handlerCancelGuide
+                        }
+                    ]
+
+                },
+                {
+                    label: '取消允许锁闭',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Signal.lock.initMenu,
+                            handler: this.handlerInitAllowLock
+                        },
+                        {
+                            label: '确定/取消',
+                            operate: OperationEvent.Signal.lock.menu,
+                            handler: this.handlerAllowLock
+                        }
+                    ]
+                },
+                {
+                    label: '进路',
+                    children: [
+                        {
+                            label: '命令',
+                            operate: OperationEvent.Signal.arrangementRoute.menu,
+                            handler: this.handlerRouteCommand
+                        },
+                        {
+                            label: '显示',
+                            children: [
+                                {
+                                    label: 'CBTC进路信息',
+                                    handler: this.undeveloped
+                                },
+                                {
+                                    label: '后备进路信息',
+                                    handler: this.undeveloped
+                                }
+                            ]
+                        }
+                    ]
+                },
+                {
+                    label: '信号指示模式',
+                    operate: OperationEvent.Signal.reopenSignal.menu,
+                    handler: this.handlerSignalModel,
+                    cmdType: ''
+                },
+                {
+                    label: '封锁',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
+                            handler: this.handlerInitBlock
+                        },
+                        {
+                            label: '确认/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
+                            handler: this.handlerBlock
+                        }
+                    ]
+                },
+                {
+                    label: '解除封锁',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
+                            handler: this.handlerInitUnblock
+                        },
+                        {
+                            label: '确认/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
+                            handler: this.handlerUnblock
+                        }
+                    ]
+                },
+                {
+                    label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
+                    handler: this.handlerDetail
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -204,7 +220,17 @@ export default {
     methods: {
         initMenu() {
             // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            // this.menu = this.menuNormal.Center;
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -246,41 +272,101 @@ export default {
         undeveloped() {
 
         },
-        handlerInitGuide() {
-            this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.initMenu, false, this.selected);
+        handlerInitGuide(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalGuide.rightClickShow(item.operate, false, this.selected);
         },
-        handlerGuide() {
-            this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.menu, true, this.selected);
+        handlerGuide(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalGuide.rightClickShow(item.operate, true, this.selected);
         },
-        handlerCancelGuide() {
-            this.$refs.cancelSignal.rightClickShow(OperationEvent.Signal.cancelGuide.menu, this.selected);
+        handlerCancelGuide(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.cancelSignal.rightClickShow(item.operate, this.selected);
         },
-        handlerInitAllowLock() {
-            this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.initMenu, false, this.selected);
+        handlerInitAllowLock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalCanBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerAllowLock() {
-            this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.menu, true, this.selected);
+        handlerAllowLock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalCanBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerRouteCommand() {
-            this.$refs.routeCommand.rightClickShow(OperationEvent.Signal.arrangementRoute.menu, this.selected);
+        handlerRouteCommand(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.routeCommand.rightClickShow(item.operate, this.selected);
         },
-        handlerSignalModel() {
-            this.$refs.signalModel.rightClickShow('', this.selected);
+        handlerSignalModel(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalModel.rightClickShow(item.operate, this.selected);
         },
-        handlerInitBlock() {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_init, false, this.selected);
+        handlerInitBlock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerBlock() {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_sure, true, this.selected);
+        handlerBlock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitUnblock() {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_init, false, this.selected);
+        handlerInitUnblock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerUnblock() {
-            this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_sure, true, this.selected);
+        handlerUnblock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerDetail() {
-            this.$refs.signalDetail.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_detail, this.selected);
+        handlerDetail(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.signalDetail.rightClickShow(item.operate, this.selected);
         }
     }
 };
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
index f6b6683f8..8e01af41c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuStation.vue
@@ -19,9 +19,10 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationMenu',
@@ -39,61 +40,18 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '全站设置联锁自动触发',
-                    //     handler: this.setAutoTrigger,
-                    //     cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
-                    // },
-                    // {
-                    //     label: '全站取消联锁自动触发',
-                    //     handler: this.cancelAutoTrigger,
-                    //     cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
-                    // },
-                    // {
-                    //     label: '上电解锁',
-                    //     handler: this.powerUnLock,
-                    //     cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK
-                    // },
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    // }
-                ],
-                Center: [
-                    // {
-                    //     label: '开放/关闭',
-                    //     handler: ''
-                    // },
-                    // {
-                    //     label: '设置/取消扣车',
-                    //     handler: ''
-                    // },
-                    // {
-                    //     label: '设置站间列车数量',
-                    //     handler: ''
-                    // },
-                    // {
-                    //     label: '分配停站时间',
-                    //     handler: ''
-                    // },
-                    // {
-                    //     label: '授权转移',
-                    //     handler: ''
-                    // },
-                    // {
-                    //     label: '显示',
-                    //     handler: ''
-                    // }
-                ]
-            },
+            menuNormal: [],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -133,7 +91,17 @@ export default {
     },
     methods: {
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
index dada4a68e..488b1bbd4 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
@@ -24,6 +24,8 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'StationStandMenu',
@@ -43,61 +45,49 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '扣车',
-                    //     handler: this.setDetainTrain,
-                    //     cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    // },
-                    // {
-                    //     label: '取消扣车',
-                    //     handler: this.cancelDetainTrain,
-                    //     cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    // },
-                    // {
-                    //     label: '提前发车',
-                    //     handler: this.earlyDeparture,
-                    //     cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    // },
-                    // {
-                    //     label: '站台详细信息',
-                    //     handler: this.detail,
-                    //     cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '开放/关闭',
-                        handler: this.handlerOpenOrClose
-                    },
-                    {
-                        label: '设置/取消扣车',
-                        handler: this.handlerDetain
-                    },
-                    {
-                        label: '设置站间列车数量',
-                        handler: this.undeveloped
-                    },
-                    {
-                        label: '分配停站时间',
-                        handler: this.handlerAllocateTime
-                    },
-                    {
-                        label: '授权转移',
-                        handler: this.handlerStationTransfer
-                    },
-                    {
-                        label: '显示',
-                        handler: this.handlerDetail
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '开放/关闭',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose,
+                    handler: this.handlerOpenOrClose
+                },
+                {
+                    label: '设置/取消扣车',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot,
+                    handler: this.handlerDetain
+                },
+                {
+                    label: '设置站间列车数量',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum,
+                    handler: this.undeveloped
+                },
+                {
+                    label: '分配停站时间',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime,
+                    handler: this.handlerAllocateTime
+                },
+                {
+                    label: '授权转移',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_transfer,
+                    handler: this.handlerStationTransfer
+                },
+                {
+                    label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_stand_detail,
+                    handler: this.handlerDetail
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -134,7 +124,17 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            // this.menu = this.menuNormal.Center;
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -168,20 +168,45 @@ export default {
                 }
             });
         },
-        handlerOpenOrClose() {
-            this.$refs.standControl.rightClickShow('', this.selected);
+        handlerOpenOrClose(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.standControl.rightClickShow(item.operate, this.selected);
         },
-        handlerDetain() {
-            this.$refs.standDetain.rightClickShow('', this.selected);
+        handlerDetain(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.standDetain.rightClickShow(item.operate, this.selected);
         },
-        handlerAllocateTime() {
-            this.$refs.allocateTime.rightClickShow('', this.selected);
+        handlerAllocateTime(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.allocateTime.rightClickShow(item.operate, this.selected);
         },
-        handlerStationTransfer() {
-            this.$refs.stationTransfer.rightClickShow('', this.selected);
+        handlerStationTransfer(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.stationTransfer.rightClickShow(item.operate, this.selected);
         },
-        handlerDetail() {
-            this.$refs.standDetail.rightClickShow('', this.selected);
+        handlerDetail(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.standDetail.rightClickShow(item.operate, this.selected);
         },
         undeveloped() {
             this.$alert('实现中......', '提示', {
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
index f5e54c5b8..6a80b1e78 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
@@ -21,6 +21,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SwitchMenu',
@@ -56,95 +57,76 @@ export default {
             default() {
                 return 0;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '定操',
-                    //     handler: this.locate,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    // },
-                    // {
-                    //     label: '反操',
-                    //     handler: this.reverse,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    // },
-                    // {
-                    //     label: '道岔单锁',
-                    //     handler: this.lock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    // },
-                    // {
-                    //     label: '道岔单解',
-                    //     handler: this.unlock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    // },
-                    // {
-                    //     label: '道岔封锁',
-                    //     handler: this.block,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-                    // },
-                    // {
-                    //     label: '道岔解封',
-                    //     handler: this.unblock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '命令',
-                        handler: this.handlerCommand
-                    },
-                    {
-                        label: '封锁',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitBlock
-                            },
-                            {
-                                label: '确定/取消',
-                                handler: this.handlerBlock
-                            }
-                        ]
-                    },
-                    {
-                        label: '解除封锁',
-                        children: [
-                            {
-                                label: '初始化',
-                                handler: this.handlerInitUnblock
-                            },
-                            {
-                                label: '确定/取消',
-                                handler: this.handlerUnblock
-                            }
-                        ]
-                    },
-                    {
-                        label: '请求动岔',
-                        children: [
-                            {
-                                label: '请求或授权/取消',
-                                handler: this.handlerActive
-                            },
-                            {
-                                label: '显示',
-                                disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        label: '显示',
-                        handler: this.handlerDetail
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '命令',
+                    operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
+                    handler: this.handlerCommand
+
+                },
+                {
+                    label: '封锁',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_init,
+                            handler: this.handlerInitBlock
+                        },
+                        {
+                            label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_block_sure,
+                            handler: this.handlerBlock
+                        }
+                    ]
+                },
+                {
+                    label: '解除封锁',
+                    children: [
+                        {
+                            label: '初始化',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_init,
+                            handler: this.handlerInitUnblock
+                        },
+                        {
+                            label: '确定/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_sure,
+                            handler: this.handlerUnblock
+                        }
+                    ]
+                },
+                {
+                    label: '请求动岔',
+                    children: [
+                        {
+                            label: '请求或授权/取消',
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_init,
+                            handler: this.handlerActive
+                        },
+                        {
+                            label: '显示',
+                            disabled: true,
+                            operate: OperationEvent.Command.commandNingBo3.line_switch_empower_sure,
+                            handler: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    label: '显示',
+                    operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
+                    handler: this.handlerDetail
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -181,7 +163,17 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             // this.menu = MenuContextHandler.covert(this.menuNormal);
-            this.menu = this.menuNormal.Center;
+            // this.menu = this.menuNormal.Center;
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
@@ -240,26 +232,61 @@ export default {
         hookLock() {
             this.$refs.switchHookLock.doShow(this.selected);
         },
-        handlerCommand() {
-            this.$refs.switchCommand.rightClickShow('', this.selected);
+        handlerCommand(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchCommand.rightClickShow(item.operate, this.selected);
         },
-        handlerInitBlock() {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_init, false, this.selected);
+        handlerInitBlock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerBlock() {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_sure, true, this.selected);
+        handlerBlock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerInitUnblock() {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_init, false, this.selected);
+        handlerInitUnblock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, false, this.selected);
         },
-        handlerUnblock() {
-            this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_sure, true, this.selected);
+        handlerUnblock(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchBlock.rightClickShow(item.operate, true, this.selected);
         },
-        handlerActive() {
-            this.$refs.switchActive.rightClickShow('', this.selected);
+        handlerActive(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchActive.rightClickShow(item.operate, this.selected);
         },
-        handlerDetail() {
-            this.$refs.switchDetail.rightClickShow('', this.selected);
+        handlerDetail(item) {
+            const operate = {
+                code: this.selected.code,
+                operation: item.operate.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.$refs.switchDetail.rightClickShow(item.operate, this.selected);
         }
     }
 };
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
index 2e21da03c..04eb36e1e 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
@@ -30,7 +30,7 @@ import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit'
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 // import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
@@ -56,150 +56,83 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '设置车组号',
-                        handler: this.addTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '删除车组号',
-                        handler: this.delTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '移动车组号',
-                        handler: this.moveTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '设置计划车',
-                        handler: this.setPlanTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-                    },
-                    {
-                        label: '设置头码车',
-                        handler: this.setHeadTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
-                    },
-                    {
-                        label: '设置人工车',
-                        handler: this.setWorkTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
-                    },
-                    {
-                        label: '设乘务组号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '标记ATP切除',
-                        handler: this.setTrainATPdel,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '标记ATP恢复',
-                        handler: this.setTrainATPRec,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '旅行冲突列车',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '列车信息',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置车组号',
+                    handler: this.addTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '删除车组号',
+                    handler: this.delTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '移动车组号',
+                    handler: this.moveTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '设置计划车',
+                    handler: this.setPlanTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+                },
+                {
+                    label: '设置头码车',
+                    handler: this.setHeadTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
+                },
+                {
+                    label: '设置人工车',
+                    handler: this.setWorkTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
+                },
+                {
+                    label: '设乘务组号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '标记ATP切除',
+                    handler: this.setTrainATPdel,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '标记ATP恢复',
+                    handler: this.setTrainATPRec,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    type: 'separator'
+                },
+                {
+                    label: '旅行冲突列车',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                },
+                {
+                    label: '列车信息',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -303,7 +236,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -449,7 +388,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -478,7 +417,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDefine.doShow(operate, this.selected);
@@ -495,7 +434,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate, this.selected);
@@ -512,7 +451,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(operate, this.selected);
@@ -527,7 +466,7 @@ export default {
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -542,7 +481,7 @@ export default {
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetHead.doShow(operate, this.selected);
@@ -559,7 +498,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWork.doShow(operate, this.selected);
@@ -576,7 +515,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
@@ -593,7 +532,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
index ef7b53afb..d63f77d70 100644
--- a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -186,7 +186,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6f206a533..fcf1b6d5c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue
index b26c15f87..6b38fb968 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue
@@ -291,7 +291,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.confirm1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.type = 'password';
@@ -313,7 +313,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose1.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.chooseStation.blur();
             });
@@ -330,7 +330,7 @@ export default {
                 operate.operation = OperationEvent.Switch.alxeEffective.choose2.operation;
             }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.chooseSection.blur();
             });
@@ -355,7 +355,7 @@ export default {
             if (this.model.stationCode == this.model.confirmStationCode && this.model.sectionCode == this.model.confirmSectionCode) {
                 this.stepNum = 3;
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.type = 'text';
@@ -382,7 +382,7 @@ export default {
             };
 
             this.$store
-                .dispatch('training/nextNew', operate)
+                .dispatch('trainingNew/next', operate)
                 .then(({ valid }) => {
                     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 797066a0f..e0a99c84f 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 bba11b6a8..05bc95bd1 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -83,7 +83,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -102,7 +102,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/routeSelection.vue b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue
index ff25d8172..096ddacb9 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue
@@ -201,7 +201,7 @@ export default {
                         val: row.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -231,7 +231,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue b/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue
index e40abfa89..1f2699d6c 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue
@@ -126,7 +126,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue
index 0b140a920..40765b987 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue
@@ -112,7 +112,7 @@ export default {
                 val: this.sectionCode
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -130,7 +130,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue b/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue
index 995e777fb..05a7032f5 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/standBulkBuckleTrain.vue
@@ -204,7 +204,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -241,7 +241,7 @@ export default {
             }
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -259,7 +259,7 @@ export default {
             };
 
             this.loading = false;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue
index 36af8e429..89f842de1 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue
@@ -120,7 +120,7 @@ export default {
             };
             this.strategyId = row.id;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue b/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue
index 4655aefec..65395bfe2 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/stationControl.vue
@@ -246,7 +246,7 @@ export default {
                     operation: OperationEvent.Signal.arrangementRoute.choose.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -278,7 +278,7 @@ export default {
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -295,7 +295,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
index b97f18a56..5b0c0eedd 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
@@ -120,7 +120,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -152,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 ee217b933..cc41329b3 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
@@ -116,7 +116,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -133,7 +133,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 8c46e1a1a..b05f13b66 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
@@ -120,7 +120,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -152,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue
index 1e7cc4435..0e50fc415 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue
@@ -157,7 +157,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
index f0131012b..07e4d73b2 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
@@ -178,7 +178,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue
index 6571e2416..b1c62e2ba 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue
@@ -114,7 +114,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 ede65dfcb..dac69b1d0 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
@@ -115,7 +115,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -130,7 +130,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -147,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue
index b95fb447a..0870422ef 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue
@@ -162,7 +162,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/race_01/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..2eac28363
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dispatchWorkMenu.vue
@@ -0,0 +1,363 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
+    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" :work="'dispatchWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'dispatchWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'dispatchWork'" />
+    <menu-power ref="menuPower" :selected="selected" :work="'dispatchWork'" />
+    <passive-contorl ref="passiveControl" pop-class="race-01__systerm" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './dispatchWorkMenuBar';
+import MenuStationTurnBack from './menuStationTurnBack';
+import MenuPower from './menuPower';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+
+export default {
+    name: 'DispatchWorkMenu',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        MenuStationTurnBack,
+        MenuPower,
+        PassiveContorl
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
+};
+</script>
+
+<style>
+.menus{
+	height:0px;
+}
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.race-01__systerm {
+	overflow: hidden !important;
+}
+
+.race-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgba(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__header {
+	padding: 10px;
+	height: 26px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.race-01__systerm .el-dialog .el-dialog__body {
+	padding: 10px;
+	margin: 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.race-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 6px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.race-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	filter: blur(7px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(190, 190, 190, 0.8);
+	z-index: -1;
+}
+
+.race-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 5px;
+	right: 5px;
+	line-height: 18px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.race-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.race-01__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.race-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.race-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.race-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.race-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.race-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.race-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.race-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.race-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.race-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.race-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.race-01__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.race-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.race-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.race-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+	background: #fff !important;
+	border-right: 1px solid #fff !important;
+	border-bottom: 1px solid #EBEEF5 !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+.race-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+	border-right: 1px solid #e2e2e2 !important;
+}
+.race-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+	border-right: 1px solid #e2e2e2 !important;
+}
+
+.race-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.race-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.race-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.race-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.race-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.race-01__systerm .el-dialog .base-label {
+	background: #F0F0F0;
+	padding: 0 5px;
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.race-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.race-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.race-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.race-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/race_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..2baaead3c
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,847 @@
+<template>
+  <div id="menuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li
+            v-if="handleShow(item)"
+            :id="getDomId(item)"
+            :key="i"
+            class="nav-li"
+            @click.stop="selectedClassA(item, i)"
+          >
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template v-if="child.children && child.children.length > 0">
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="selectedClassB(child, j)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
+                          <span class="status">&ensp;</span>
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li
+                          v-else-if="grandchild.show"
+                          :id="getDomId(grandchild)"
+                          :key="k"
+                          class="menu-li"
+                          @click.stop="hookClick(grandchild)"
+                        >
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else-if="child.show"
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="hookClick(child)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+    <station-control ref="stationControl" />
+    <detain-train-contorl ref="detainTrainContorl" />
+    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
+    <notice-info ref="noticeInfo" pop-class="race-01__systerm" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+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';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'MenuBar',
+    components: {
+        NoticeInfo,
+        StationControl,
+        DetainTrainContorl,
+        DetainTrainContorlUpDown,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            menu: [
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl,
+                            show: true
+                        },
+                        {
+                            title: '区域选择',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '全线扣车',
+                            operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '取消全线扣车',
+                            operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about,
+                            show: true
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.training.started': function (val) {
+            this.closeMenu(true);
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        handleShow(item) {
+            if (item.hide) {
+                return false;
+            }
+            return true;
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        initMenu() {
+            if (this.menu[2]) {
+                this.menu[2].children = this.initStationList();
+            }
+            this.clickEvent();
+            this.closeMenu(true);
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                if (document.getElementById('menuBar')) {
+                    self.closeMenu(false);
+                }
+            };
+        },
+        getDomId(item) {
+            if (item && item.operate) {
+                return item.operate.domId;
+            }
+            return '';
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu(flag) {
+            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+                this.classA = this.tempClassA = -1;
+                this.classB = this.tempClassB = -1;
+            }
+        },
+        hookClick(item, event) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            if (item && typeof item.click == 'function') {
+                item.click(item.operate);
+            }
+        },
+        selectedClassA(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuA(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuA(item, index);
+            }
+        },
+        // 弹出顶部菜单操作
+        popupMenuA(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            this.clickEvent();
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassA = index;
+            this.tempClassB = -1;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        selectedClassB(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuB(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuB(item, index);
+            }
+        },
+        popupMenuB(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassB = index;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.closeMenu(true);
+            }
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        // 设置全线扣车
+        setDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消全线扣车
+        cancelDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消上行扣车
+        cancelUpDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 取消下行扣车
+        cancelDownDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+@import "src/styles/mixin.scss";
+$width: 30px;
+$height: 30px;
+$menuPadding: 10px;
+$menuItemHeight: 30px;
+$menuItemWidth: 180px;
+$menuItemPadding: 5px;
+
+#menuBar {
+	z-index: 36;
+	position: absolute;
+	width: inherit;
+	height: $height;
+	line-height: $height;
+}
+
+.nav {
+	display: block;
+	cursor: pointer;
+	color: #0000;
+	background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+	background: linear-gradient(#FDFDFE, #DEE3F3);
+	border: 1px solid #B6BCCC !important;
+	border-bottom: 2px solid #B6BCCC !important;
+	list-style: none;
+}
+
+.nav-li {
+	position: relative;
+	display: inline-block;
+	padding-left: $menuPadding;
+	padding-right: $menuPadding;
+}
+
+.nav-li:active {
+	background: #C9D0E1;
+	border-radius: 4px;
+}
+
+.nav-li-text {
+	font-size: 13px;
+	color: #000;
+	text-align: center;
+	text-decoration: none;
+}
+
+.nav-ul {
+	display: none;
+	position: absolute;
+	list-style: none;
+	border: 1px solid gray !important;
+	line-height: $menuItemHeight;
+	width: $menuItemWidth;
+	padding: 0px;
+	margin: 0px;
+	max-height: 550px;
+	overflow-y: scroll;
+
+	&::-webkit-scrollbar {
+		width: 4px;
+	}
+
+	&::-webkit-scrollbar-thumb {
+		border-radius: 10px;
+		background: #c3c3c3;
+	}
+
+	&::-webkit-scrollbar-track {
+		border-radius: 0;
+		background: #f0f0f0;
+
+	}
+}
+
+.menu-ul {
+	display: none;
+	list-style: none;
+	background: #F0F0F0;
+	line-height: $menuItemHeight;
+	width: $menuItemWidth;
+	bottom: $menuItemHeight;
+}
+
+.active {
+	position: absolute;
+	display: block !important;
+}
+
+.menu-ul-text {
+	font-size: 14px;
+	color: #000;
+	letter-spacing: 0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li {
+	text-align: left;
+	background: #F0F0F0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li-block {
+	display: flex;
+	letter-spacing: 0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li-text {
+	font-size: 14px;
+	color: #000;
+}
+
+.menu-li-text .status {
+	display: inline-block;
+	border-right: 1px inset #CACACA;
+	width: $width;
+}
+
+.menu-li-text .label {
+	display: inline-block;
+}
+
+.menu-separator {
+	text-align: left;
+	background: #F0F0F0;
+	height: 2px;
+	line-height: 2px;
+}
+
+.menu-separator .status {
+	display: inline-block;
+	border-right: 1px inset #CACACA;
+	width: $width;
+	height: 100%;
+	background: #EFECDE;
+}
+
+.menu-separator .separator {
+	display: inline-block;
+	background: #CACACA;
+	margin-left: 5px;
+	height: 2px;
+	width: $menuItemWidth - $width - 30px;
+}
+
+.menu-li-block:hover {
+	background: #C9DEF7;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+}
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/localWorkMenu.vue b/src/jmapNew/theme/race_01/menus/localWorkMenu.vue
new file mode 100644
index 000000000..4dedcdbfd
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/localWorkMenu.vue
@@ -0,0 +1,363 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" />
+    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" :work="'localWork'" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
+    <menu-power ref="menuPower" :selected="selected" :work="'localWork'" />
+    <passive-contorl ref="passiveControl" pop-class="race-01__systerm" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './localWorkMenuBar';
+import MenuStationTurnBack from './menuStationTurnBack';
+import MenuPower from './menuPower';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+
+export default {
+    name: 'LocalWorkMenu',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        MenuStationTurnBack,
+        MenuPower,
+        PassiveContorl
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    }
+};
+</script>
+
+<style>
+.menus{
+	height:0px;
+}
+.menus .pop-menu {
+	background: #F0F0F0;
+}
+
+.menus .pop-menu span {
+	color: #000;
+}
+
+.menus .pop-menu .is-disabled span {
+	color: #B4B3B8;
+}
+
+.race-01__systerm {
+	overflow: hidden !important;
+}
+
+.race-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgba(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__header {
+	padding: 10px;
+	height: 26px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.race-01__systerm .el-dialog .el-dialog__body {
+	padding: 10px;
+	margin: 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.race-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 6px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.race-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	filter: blur(7px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(190, 190, 190, 0.8);
+	z-index: -1;
+}
+
+.race-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 5px;
+	right: 5px;
+	line-height: 18px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.race-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+
+.race-01__systerm .el-dialog .el-button {
+	height: 32px;
+	line-height: 32px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 0px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+
+.race-01__systerm .el-dialog .expand {
+	width: 120px;
+}
+
+.race-01__systerm .el-dialog .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.race-01__systerm .el-dialog .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.race-01__systerm .el-dialog .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.race-01__systerm .el-dialog .el-button:disabled span {
+	border: 0px;
+}
+
+.race-01__systerm .el-dialog .el-input {
+	border: 2px inset #E9E9E9;
+}
+
+.race-01__systerm .el-dialog .el-input .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.race-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.race-01__systerm .el-dialog .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.race-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.race-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.race-01__systerm .el-dialog .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.race-01__systerm .el-dialog .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .el-table .cell {
+	line-height: unset !important;
+}
+
+.race-01__systerm .el-dialog .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.race-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+	background: #fff !important;
+	border-right: 1px solid #fff !important;
+	border-bottom: 1px solid #EBEEF5 !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+.race-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+	border-right: 1px solid #e2e2e2 !important;
+}
+.race-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+	border-right: 1px solid #e2e2e2 !important;
+}
+
+.race-01__systerm .el-dialog .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.race-01__systerm .el-dialog .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.race-01__systerm .el-dialog .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__label {
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.race-01__systerm .el-dialog .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio__label {
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.race-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.race-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.race-01__systerm .el-dialog .base-label {
+	background: #F0F0F0;
+	padding: 0 5px;
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.race-01__systerm .el-dialog .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+
+.race-01__systerm .el-dialog .context {
+	height: 100px;
+	border: 2px inset #E2E2E2;
+	overflow-y: scroll;
+}
+
+.race-01__systerm .el-dialog .table {
+	margin-top: 10px;
+}
+
+.race-01__systerm .el-dialog .notice {
+	margin-left: 62px;
+	line-height: 30px;
+}
+
+.race-01__systerm .el-dialog .button-group {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/race_01/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..a88d6f757
--- /dev/null
+++ b/src/jmapNew/theme/race_01/menus/localWorkMenuBar.vue
@@ -0,0 +1,851 @@
+<template>
+  <div id="menuBar">
+    <div class="nav">
+      <template v-for="(item,i) in menu">
+        <template v-if="noShowingChildren(item.children)">
+          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li
+            v-if="handleShow(item)"
+            :id="getDomId(item)"
+            :key="i"
+            class="nav-li"
+            @click.stop="selectedClassA(item, i)"
+          >
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template v-if="child.children && child.children.length > 0">
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="selectedClassB(child, j)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
+                          <span class="status">&ensp;</span>
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li
+                          v-else-if="grandchild.show"
+                          :id="getDomId(grandchild)"
+                          :key="k"
+                          class="menu-li"
+                          @click.stop="hookClick(grandchild)"
+                        >
+                          <div class="menu-li-block">
+                            <span class="menu-li-text">
+                              <span class="status">&ensp;</span>
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="status">&ensp;</span>
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li
+                    v-else-if="child.show"
+                    :id="getDomId(child)"
+                    :key="j"
+                    class="menu-li"
+                    @click.stop="hookClick(child)"
+                  >
+                    <div class="menu-li-block">
+                      <span class="menu-li-text">
+                        <span class="status">&ensp;</span>
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+    </div>
+    <station-control ref="stationControl" />
+    <detain-train-contorl ref="detainTrainContorl" />
+    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
+    <notice-info ref="noticeInfo" pop-class="race-01__systerm" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+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';
+import TrainAdd from './menuDialog/trainAdd';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'MenuBar',
+    components: {
+        NoticeInfo,
+        StationControl,
+        DetainTrainContorl,
+        DetainTrainContorlUpDown,
+        TrainAdd,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            valid: true,
+            menu: [
+                {
+                    title: '系统',
+                    operate: OperationEvent.Command.mBar.system,
+                    children: [
+                        {
+                            title: '登录',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '注销',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '站遥控',
+                            operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                            click: this.stationRemoteControl,
+                            show: true
+                        },
+                        {
+                            title: '区域选择',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '连接主用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '连接备用中心',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '退出',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '查看',
+                    operate: OperationEvent.Command.mBar.check,
+                    children: [
+                        {
+                            title: '运行图',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报告分析',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '视图',
+                            click: this.undeveloped,
+                            operate: '',
+                            children: [{
+                                title: '报警',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车运行信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '设备状态',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '列车详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            },
+                            {
+                                title: '站台详细信息',
+                                click: this.undeveloped,
+                                show: true
+                            }]
+                        },
+                        {
+                            title: '终端站发车列表',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '详细设备状态',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '查找列车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示目的地号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示轨道名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示道岔名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示信号机名',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车次窗位置',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '显示车次号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '显示车组号',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: '全屏',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '放大',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '缩小',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '恢复',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '车站定位',
+                    operate: '',
+                    children: [
+                    ]
+                },
+                {
+                    title: 'ATS终端操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '当天运行车计划',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '出入库预告',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '计划车操作',
+                    operate: '',
+                    children: [
+                        {
+                            title: '添加计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '平移计划车',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '删除计划车',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '批处理命令',
+                    operate: OperationEvent.Command.mBar.detainControl,
+                    children: [
+                        {
+                            title: '全线扣车',
+                            operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
+                            click: this.setDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消全线扣车',
+                            operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
+                            click: this.cancelDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消上行全线扣车',
+                            operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
+                            click: this.cancelUpDetainTrainAll,
+                            show: true
+                        },
+                        {
+                            title: '取消下行全线扣车',
+                            operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
+                            click: this.cancelDownDetainTrainAll,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '信息管理',
+                    operate: '',
+                    children: [
+                        {
+                            title: '调度日志',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '调度留言提醒',
+                            click: this.undeveloped,
+                            show: true
+                        },
+                        {
+                            title: '报警设置',
+                            click: this.undeveloped,
+                            show: true
+                        }
+                    ]
+                },
+                {
+                    title: '帮助',
+                    operate: '',
+                    children: [
+                        {
+                            title: '关于ITS GPC 工作站',
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about,
+                            show: true
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode',
+            'started',
+            'steps',
+            'order',
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$store.state.training.operatemode': function (mode) {
+            this.initMenu();
+        },
+        '$store.state.training.started': function (val) {
+            this.closeMenu(true);
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        handleShow(item) {
+            if (item.hide) {
+                return false;
+            }
+            return true;
+        },
+        initStationList() {
+            const list = [];
+            this.stationList.forEach(station => {
+                if (station.visible) {
+                    const node = {
+                        title: station.name,
+                        operate: station.code,
+                        show: true,
+                        click: this.mapLocation,
+                        code: station.code
+                    };
+
+                    list.push(node);
+                }
+            });
+            return list;
+        },
+        initMenu() {
+            if (this.menu[2]) {
+                this.menu[2].children = this.initStationList();
+            }
+            this.clickEvent();
+            this.closeMenu(true);
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                if (document.getElementById('menuBar')) {
+                    self.closeMenu(false);
+                }
+            };
+        },
+        getDomId(item) {
+            if (item && item.operate) {
+                return item.operate.domId;
+            }
+            return '';
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu(flag) {
+            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
+                this.classA = this.tempClassA = -1;
+                this.classB = this.tempClassB = -1;
+            }
+        },
+        hookClick(item, event) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            if (item && typeof item.click == 'function') {
+                item.click(item.operate);
+            }
+        },
+        selectedClassA(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuA(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuA(item, index);
+            }
+        },
+        // 弹出顶部菜单操作
+        popupMenuA(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            this.clickEvent();
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassA = index;
+            this.tempClassB = -1;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        selectedClassB(item, index) {
+            const order = this.order || 0;
+            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
+                this.popupMenuB(item, index);
+            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
+                this.popupMenuB(item, index);
+            }
+        },
+        popupMenuB(item, index) {
+            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+            const operate = {
+                type: 'bar',
+                operation: item.operate.operation
+            };
+            this.tempClassB = index;
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        // 设置地图定位
+        mapLocation(code) {
+            if (code) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
+                this.closeMenu(true);
+            }
+        },
+        // 站遥控
+        stationRemoteControl(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControl.doShow(operate);
+                }
+            });
+        },
+        // 设置全线扣车
+        setDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消全线扣车
+        cancelDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorl.doShow(operate);
+                }
+            });
+        },
+        // 取消上行扣车
+        cancelUpDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 取消下行扣车
+        cancelDownDetainTrainAll(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.detainTrainContorlUpDown.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+@import "src/styles/mixin.scss";
+$width: 30px;
+$height: 30px;
+$menuPadding: 10px;
+$menuItemHeight: 30px;
+$menuItemWidth: 180px;
+$menuItemPadding: 5px;
+
+#menuBar {
+	z-index: 36;
+	position: absolute;
+	width: inherit;
+	height: $height;
+	line-height: $height;
+}
+
+.nav {
+	display: block;
+	cursor: pointer;
+	color: #0000;
+	background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -o-linear-gradient(#FDFDFE, #DEE3F3);
+	background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
+	background: linear-gradient(#FDFDFE, #DEE3F3);
+	border: 1px solid #B6BCCC !important;
+	border-bottom: 2px solid #B6BCCC !important;
+	list-style: none;
+}
+
+.nav-li {
+	position: relative;
+	display: inline-block;
+	padding-left: $menuPadding;
+	padding-right: $menuPadding;
+}
+
+.nav-li:active {
+	background: #C9D0E1;
+	border-radius: 4px;
+}
+
+.nav-li-text {
+	font-size: 13px;
+	color: #000;
+	text-align: center;
+	text-decoration: none;
+}
+
+.nav-ul {
+	display: none;
+	position: absolute;
+	list-style: none;
+	border: 1px solid gray !important;
+	line-height: $menuItemHeight;
+	width: $menuItemWidth;
+	padding: 0px;
+	margin: 0px;
+	max-height: 550px;
+	overflow-y: scroll;
+
+	&::-webkit-scrollbar {
+		width: 4px;
+	}
+
+	&::-webkit-scrollbar-thumb {
+		border-radius: 10px;
+		background: #c3c3c3;
+	}
+
+	&::-webkit-scrollbar-track {
+		border-radius: 0;
+		background: #f0f0f0;
+
+	}
+}
+
+.menu-ul {
+	display: none;
+	list-style: none;
+	background: #F0F0F0;
+	line-height: $menuItemHeight;
+	width: $menuItemWidth;
+	bottom: $menuItemHeight;
+}
+
+.active {
+	position: absolute;
+	display: block !important;
+}
+
+.menu-ul-text {
+	font-size: 14px;
+	color: #000;
+	letter-spacing: 0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li {
+	text-align: left;
+	background: #F0F0F0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li-block {
+	display: flex;
+	letter-spacing: 0;
+	height: $menuItemHeight;
+	line-height: $menuItemHeight;
+}
+
+.menu-li-text {
+	font-size: 14px;
+	color: #000;
+}
+
+.menu-li-text .status {
+	display: inline-block;
+	border-right: 1px inset #CACACA;
+	width: $width;
+}
+
+.menu-li-text .label {
+	display: inline-block;
+}
+
+.menu-separator {
+	text-align: left;
+	background: #F0F0F0;
+	height: 2px;
+	line-height: 2px;
+}
+
+.menu-separator .status {
+	display: inline-block;
+	border-right: 1px inset #CACACA;
+	width: $width;
+	height: 100%;
+	background: #EFECDE;
+}
+
+.menu-separator .separator {
+	display: inline-block;
+	background: #CACACA;
+	margin-left: 5px;
+	height: 2px;
+	width: $menuItemWidth - $width - 30px;
+}
+
+.menu-li-block:hover {
+	background: #C9DEF7;
+	box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+}
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/race_01/menus/menuAutoTrunRoute.vue
deleted file mode 100644
index ed34443f4..000000000
--- a/src/jmapNew/theme/race_01/menus/menuAutoTrunRoute.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <turn-back-control ref="turnBackControl" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import TurnBackControl from './dialog/turnBackControl';
-import { mapGetters } from 'vuex';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuLimit',
-    components: {
-        PopMenu,
-        TurnBackControl
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置自动折返',
-                        handler: this.handlerTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
-                    },
-                    {
-                        label: '取消自动折返',
-                        handler: this.cancelTurnBack,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.AutoTurnBack) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        // 设置自动折返
-        handlerTurnBack() {
-            commitOperate(menuOperate.Signal.setAutoTurnBack, {cycleCode:this.selected.cycleCode}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.turnBackControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        // 取消自动折返
-        cancelTurnBack() {
-            commitOperate(menuOperate.Signal.cancelAutoTurnBack, {cycleCode:this.selected.cycleCode, cancelRoute:false}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.turnBackControl.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuAxleReset.vue b/src/jmapNew/theme/race_01/menus/menuAxleReset.vue
deleted file mode 100644
index acc598954..000000000
--- a/src/jmapNew/theme/race_01/menus/menuAxleReset.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <section-alxe-reset ref="sectionAlxeReset" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import SectionAlxeReset from './dialog/sectionAlxeReset';
-import { mapGetters } from 'vuex';
-
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuLimit',
-    components: {
-        PopMenu,
-        SectionAlxeReset
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '计轴复位',
-                        handler: this.handleAxleReset,
-                        cmdType: CMD.Section.CMD_SECTION_AXIS_PRE_RESET
-                    }
-                ],
-                Center: [
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.AxleReset) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        // 设置计轴复位
-        handleAxleReset() {
-            commitOperate(menuOperate.AxleReset.SetAxleReset, {}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.sectionAlxeReset.doShow(operate);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuBar.vue b/src/jmapNew/theme/race_01/menus/menuBar.vue
deleted file mode 100644
index 86f84f8bf..000000000
--- a/src/jmapNew/theme/race_01/menus/menuBar.vue
+++ /dev/null
@@ -1,1136 +0,0 @@
-<template>
-  <div id="menuBar">
-    <div class="nav">
-      <template v-for="(item,i) in menu">
-        <template v-if="noShowingChildren(item.children)">
-          <li :id="getDomId(item)" :key="i" class="nav-li" @click="hookClick(item)">
-            <span class="nav-li-text">{{ item.title }}</span>
-          </li>
-        </template>
-        <template v-else>
-          <li
-            v-if="handleShow(item)"
-            :id="getDomId(item)"
-            :key="i"
-            class="nav-li"
-            @click.stop="selectedClassA(item, i)"
-          >
-            <span class="nav-li-text">{{ item.title }}</span>
-            <ul class="nav-ul" :class="{'active' :i==classA}">
-              <template v-for="(child,j) in item.children">
-                <template v-if="child.children && child.children.length > 0">
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li
-                    v-else
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="selectedClassB(child, j)"
-                  >
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                    <ul class="menu-ul" :class="{'active' :j==classB}">
-                      <template v-for="(grandchild,k) in child.children">
-                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
-                          <span class="status">&ensp;</span>
-                          <span class="separator">&ensp;</span>
-                        </li>
-                        <li
-                          v-else-if="grandchild.show"
-                          :id="getDomId(grandchild)"
-                          :key="k"
-                          class="menu-li"
-                          @click.stop="hookClick(grandchild)"
-                        >
-                          <div class="menu-li-block">
-                            <span class="menu-li-text">
-                              <span class="status">&ensp;</span>
-                              <span class="label">{{ grandchild.title }}</span>
-                            </span>
-                          </div>
-                        </li>
-                      </template>
-                    </ul>
-                  </li>
-                </template>
-                <template v-else>
-                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
-                    <span class="status">&ensp;</span>
-                    <span class="separator">&ensp;</span>
-                  </li>
-                  <li
-                    v-else-if="child.show"
-                    :id="getDomId(child)"
-                    :key="j"
-                    class="menu-li"
-                    @click.stop="hookClick(child)"
-                  >
-                    <div class="menu-li-block">
-                      <span class="menu-li-text">
-                        <span class="status">&ensp;</span>
-                        <span class="label">{{ child.title }}</span>
-                      </span>
-                    </div>
-                  </li>
-                </template>
-              </template>
-            </ul>
-          </li>
-        </template>
-      </template>
-    </div>
-    <station-control ref="stationControl" />
-    <detain-train-contorl ref="detainTrainContorl" />
-    <detain-train-contorl-up-down ref="detainTrainContorlUpDown" />
-    <notice-info ref="noticeInfo" pop-class="race-01__systerm" />
-    <train-add ref="trainAdd" />
-    <train-transtalet ref="trainTranstalet" />
-    <train-delete ref="trainDelete" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-  </div>
-</template>
-<script>
-import { mapGetters } from 'vuex';
-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';
-import TrainAdd from './menuDialog/trainAdd';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-import TrainDelete from './menuDialog/trainDelete';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { EventBus } from '@/scripts/event-bus';
-import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'MenuBar',
-    components: {
-        NoticeInfo,
-        StationControl,
-        DetainTrainContorl,
-        DetainTrainContorlUpDown,
-        TrainAdd,
-        TrainTranstalet,
-        TrainDelete,
-        ManageUser,
-        HelpAbout
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            classA: -1,
-            classB: -1,
-            tempClassA: -1,
-            tempClassB: -1,
-            valid: true,
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '站遥控',
-                                operate: OperationEvent.MixinCommand.remoteControl.mbar,
-                                click: this.stationRemoteControl
-                            },
-                            {
-                                title: '区域选择',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '批处理命令',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '全线扣车',
-                                operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                                click: this.setDetainTrainAll
-                            },
-                            {
-                                title: '取消全线扣车',
-                                operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                                click: this.cancelDetainTrainAll
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                                click: this.cancelUpDetainTrainAll
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                                click: this.cancelDownDetainTrainAll
-                            }
-                        ]
-                    },
-                    {
-                        title: '信息管理',
-                        operate: '',
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        operate: '',
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ],
-                Center: [
-                    {
-                        title: '系统',
-                        operate: OperationEvent.Command.mBar.system,
-                        children: [
-                            {
-                                title: '登录',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '注销',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '站遥控',
-                                operate: OperationEvent.MixinCommand.remoteControl.mbar,
-                                click: this.stationRemoteControl
-                            },
-                            {
-                                title: '区域选择',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '连接主用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '连接备用中心',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '退出',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '查看',
-                        operate: OperationEvent.Command.mBar.check,
-                        children: [
-                            {
-                                title: '运行图',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报告分析',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '视图',
-                                click: this.undeveloped,
-                                operate: '',
-                                children: [{
-                                    title: '报警',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车运行信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '设备状态',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '列车详细信息',
-                                    click: this.undeveloped
-                                },
-                                {
-                                    title: '站台详细信息',
-                                    click: this.undeveloped
-                                }]
-                            },
-                            {
-                                title: '终端站发车列表',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '详细设备状态',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '查找列车',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示目的地号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示轨道名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示道岔名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示信号机名',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车次窗位置',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '显示车次号',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '显示车组号',
-                                click: this.undeveloped
-                            },
-                            {
-                                type: 'separator'
-                            },
-                            {
-                                title: '全屏',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '放大',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '缩小',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '恢复',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '车站定位',
-                        operate: '',
-                        children: [
-                        ]
-                    },
-                    {
-                        title: 'ATS终端操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '当天运行车计划',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '出入库预告',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '计划车操作',
-                        operate: '',
-                        children: [
-                            {
-                                title: '添加计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '平移计划车',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '删除计划车',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '批处理命令',
-                        operate: OperationEvent.Command.mBar.detainControl,
-                        children: [
-                            {
-                                title: '全线扣车',
-                                operate: OperationEvent.StationStand.setDetainTrainAll.mbar,
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消全线扣车',
-                                operate: OperationEvent.StationStand.cancelDetainTrainAll.mbar,
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消上行全线扣车',
-                                operate: OperationEvent.StationStand.cancelUpDetainTrainAll.mbar,
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '取消下行全线扣车',
-                                operate: OperationEvent.StationStand.cancelDownDetainTrainAll.mbar,
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '信息管理',
-                        operate: '',
-                        children: [
-                            {
-                                title: '调度日志',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '调度留言提醒',
-                                click: this.undeveloped
-                            },
-                            {
-                                title: '报警设置',
-                                click: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        title: '帮助',
-                        children: [
-                            {
-                                title: '关于ITS GPC 工作站',
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'started',
-            'steps',
-            'order',
-            'mode'
-        ]),
-        ...mapGetters('map', [
-            'stationList'
-        ])
-    },
-    watch: {
-        tempClassA() {
-            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
-        },
-        tempClassB() {
-            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
-        },
-        '$store.state.menuOperation.break': function (val) {
-            if (val) {
-                this.classA = this.classB = -1;
-            } else {
-                this.classA = this.tempClassA;
-                this.classB = this.tempClassB;
-            }
-        },
-        '$store.state.training.operatemode': function (mode) {
-            this.initMenu();
-        },
-        '$store.state.training.started': function (val) {
-            this.closeMenu(true);
-        },
-        '$store.state.training.prdType': function () {
-            this.initMenu();
-        }
-    },
-    mounted() {
-        this.initMenu();
-    },
-    methods: {
-        handleShow(item) {
-            if (item.hide) {
-                return false;
-            }
-            return true;
-        },
-        initStationList() {
-            const list = [];
-            this.stationList.forEach(station => {
-                if (station.visible) {
-                    const node = {
-                        title: station.name,
-                        operate: station.code,
-                        show: true,
-                        click: this.mapLocation,
-                        code: station.code
-                    };
-
-                    list.push(node);
-                }
-            });
-            return list;
-        },
-        initMenu(menu) {
-            const type = State2SimulationMap[this.$store.state.training.prdType];
-            this.menu = MenuContextHandler.menuBarConvert(this.menuNormal[type], this.$store.state.training.operatemode);
-            if (this.menu[2]) {
-                this.menu[2].children = this.initStationList();
-            }
-            this.clickEvent();
-            this.closeMenu(true);
-        },
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                if (document.getElementById('menuBar')) {
-                    self.closeMenu(false);
-                }
-            };
-        },
-        getDomId(item) {
-            if (item && item.operate) {
-                return item.operate.domId;
-            }
-            return '';
-        },
-        noShowingChildren(children) {
-            if (!children || children.length <= 0) {
-                return true;
-            }
-            return false;
-        },
-        hasShowingChildren(children) {
-            if (children && children.length > 0) {
-                return true;
-            }
-            return false;
-        },
-        closeMenu(flag) {
-            if (flag || (this.mode !== TrainingMode.EDIT && this.mode !== TrainingMode.TEACH)) {
-                this.classA = this.tempClassA = -1;
-                this.classB = this.tempClassB = -1;
-            }
-        },
-        hookClick(item, event) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            if (item && typeof item.click == 'function') {
-                item.click(item.operate);
-            }
-        },
-        selectedClassA(item, index) {
-            const order = this.order || 0;
-            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-                this.popupMenuA(item, index);
-            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-                this.popupMenuA(item, index);
-            }
-        },
-        // 弹出顶部菜单操作
-        popupMenuA(item, index) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            this.clickEvent();
-            const operate = {
-                type: 'bar',
-                operation: item.operate.operation
-            };
-            this.tempClassA = index;
-            this.tempClassB = -1;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        selectedClassB(item, index) {
-            const order = this.order || 0;
-            if (this.mode !== TrainingMode.TEACH) { // 编辑模式下可显示
-                this.popupMenuB(item, index);
-            } else if (this.steps[order] && this.steps[order].type == 'bar') { // 操作步骤没有顶部操作顶部菜单都不可显示
-                this.popupMenuB(item, index);
-            }
-        },
-        popupMenuB(item, index) {
-            this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-            const operate = {
-                type: 'bar',
-                operation: item.operate.operation
-            };
-            this.tempClassB = index;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                }
-            });
-        },
-        // 设置地图定位
-        mapLocation(code) {
-            if (code) {
-                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: code });
-                this.closeMenu(true);
-            }
-        },
-        // 站遥控
-        stationRemoteControl(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControl.doShow(operate);
-                }
-            });
-        },
-        // 设置全线扣车
-        setDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorl.doShow(operate);
-                }
-            });
-        },
-        // 取消全线扣车
-        cancelDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorl.doShow(operate);
-                }
-            });
-        },
-        // 取消上行扣车
-        cancelUpDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorlUpDown.doShow(operate);
-                }
-            });
-        },
-        // 取消下行扣车
-        cancelDownDetainTrainAll(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.detainTrainContorlUpDown.doShow(operate);
-                }
-            });
-        },
-        // 添加计划车
-        addPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainAdd.doShow(operate);
-                }
-            });
-        },
-        // 平移计划车
-        translatPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainTranstalet.doShow(operate);
-                }
-            });
-        },
-        // 删除计划车
-        delPlanTrain(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDelete.doShow(operate);
-                }
-            });
-        },
-        // 用户管理
-        userManage(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.manageUser.doShow(operate);
-                }
-            });
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                type: 'bar',
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.closeMenu(true);
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        // 刷新
-        refresh() {
-            this.closeMenu(true);
-            EventBus.$emit('refresh');
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        undeveloped() {
-            this.doClose();
-            this.$alert('实现中......', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                }
-            });
-        },
-        doClose() {
-            this.$nextTick(() => {
-                EventBus.$emit('closeMenu');
-            });
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    @import "src/styles/mixin.scss";
-    $width: 30px;
-    $height: 30px;
-    $menuPadding: 10px;
-    $menuItemHeight: 30px;
-    $menuItemWidth: 180px;
-    $menuItemPadding: 5px;
-
-    #menuBar {
-        z-index: 36;
-        position: absolute;
-        width: inherit;
-        height: $height;
-        line-height: $height;
-    }
-
-    .nav {
-        display: block;
-        cursor: pointer;
-        color: #0000;
-        background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -o-linear-gradient(#FDFDFE, #DEE3F3);
-        background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
-        background: linear-gradient(#FDFDFE, #DEE3F3);
-        border: 1px solid #B6BCCC !important;
-        border-bottom: 2px solid #B6BCCC !important;
-        list-style: none;
-    }
-
-    .nav-li {
-        position: relative;
-        display: inline-block;
-        padding-left: $menuPadding;
-        padding-right: $menuPadding;
-    }
-
-    .nav-li:active {
-        background: #C9D0E1;
-        border-radius: 4px;
-    }
-
-    .nav-li-text {
-        font-size: 13px;
-        color: #000;
-        text-align: center;
-        text-decoration: none;
-    }
-
-    .nav-ul {
-        display: none;
-        position: absolute;
-        list-style: none;
-        border: 1px solid gray !important;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        padding: 0px;
-        margin: 0px;
-        max-height: 550px;
-        overflow-y: scroll;
-
-        &::-webkit-scrollbar {
-            width: 4px;
-        }
-
-        &::-webkit-scrollbar-thumb {
-            border-radius: 10px;
-            background: #c3c3c3;
-        }
-
-        &::-webkit-scrollbar-track {
-            border-radius: 0;
-            background: #f0f0f0;
-
-        }
-    }
-
-    .menu-ul {
-        display: none;
-        list-style: none;
-        background: #F0F0F0;
-        line-height: $menuItemHeight;
-        width: $menuItemWidth;
-        bottom: $menuItemHeight;
-    }
-
-    .active {
-        position: absolute;
-        display: block !important;
-    }
-
-    .menu-ul-text {
-        font-size: 14px;
-        color: #000;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li {
-        text-align: left;
-        background: #F0F0F0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-block {
-        display: flex;
-        letter-spacing: 0;
-        height: $menuItemHeight;
-        line-height: $menuItemHeight;
-    }
-
-    .menu-li-text {
-        font-size: 14px;
-        color: #000;
-    }
-
-    .menu-li-text .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-    }
-
-    .menu-li-text .label {
-        display: inline-block;
-    }
-
-    .menu-separator {
-        text-align: left;
-        background: #F0F0F0;
-        height: 2px;
-        line-height: 2px;
-    }
-
-    .menu-separator .status {
-        display: inline-block;
-        border-right: 1px inset #CACACA;
-        width: $width;
-        height: 100%;
-        background: #EFECDE;
-    }
-
-    .menu-separator .separator {
-        display: inline-block;
-        background: #CACACA;
-        margin-left: 5px;
-        height: 2px;
-        width: $menuItemWidth - $width - 30px;
-    }
-
-    .menu-li-block:hover {
-        background: #C9DEF7;
-        box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        -webkit-box-sizing: border-box;
-    }
-</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue
index d59671b30..55d28467b 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -101,7 +101,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -121,7 +121,7 @@ export default {
                 operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
             }
             this.doClose();
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
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 00a5e307f..0fceb63c9 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 ccd6bba04..b1ea93d3a 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 6c65ce4a6..042a1e387 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
index ed9212f81..92429095a 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -159,7 +159,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -183,7 +183,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     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 2819a5071..4d8076598 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -127,7 +127,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -155,7 +155,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -179,7 +179,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 dc619c144..7543de030 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
@@ -99,7 +99,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
index 6dd749732..de6eb54b5 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue
index 4ce4003c5..38b2f9ff3 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue
@@ -129,6 +129,8 @@ export default {
     methods: {
         doShow(operate) {
             this.message = '';
+            this.station = {};
+            this.stationType = '01';
             if (!this.dialogShow) {
                 this.operate = operate || {};
                 this.operation = operate.operation;
@@ -164,7 +166,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -187,7 +189,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose1.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.chooseStation.blur();
@@ -208,7 +210,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -235,21 +237,21 @@ export default {
         },
         // 请求遥控
         conterCommit() {
-            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
+            commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
                 this.doClose();
                 this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由站控转为遥控:\n' + this.stationName);
             });
         },
         // 请求站控
         requestCommit() {
-            commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
+            commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
                 this.doClose();
                 this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
             });
         },
         // 紧急站控
         emergencyCommit() {
-            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
+            commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
                 this.doClose();
                 this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
             });
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
index 75c877812..083849a9e 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 04b071e23..545416989 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
@@ -109,7 +109,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -129,7 +129,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 6fe09a8bf..e4976cc29 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuLimit.vue b/src/jmapNew/theme/race_01/menus/menuLimit.vue
deleted file mode 100644
index 818a063fc..000000000
--- a/src/jmapNew/theme/race_01/menus/menuLimit.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <cancel-all-limit ref="cancelAllLimit" :system-name="systemName" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import CancelAllLimit from '@/jmapNew/theme/components/menus/dialog/cancelAllLimit';
-import { mapGetters } from 'vuex';
-import { DeviceMenu } from '@/scripts/ConstDic';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
-
-export default {
-    name: 'MenuLimit',
-    components: {
-        PopMenu,
-        CancelAllLimit
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menu: [],
-            systemName:'race-01__systerm',
-            menuNormal: {
-                Local: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '取消全线临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.LimitControl.CMD_CANCEL_ALL_LIMIT_SPEED
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.LimitControl) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        // 取消速度
-        cancelSpeed() {
-            commitOperate(menuOperate.LimitControl.cancelSpeed, {}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.cancelAllLimit.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuPower.vue b/src/jmapNew/theme/race_01/menus/menuPower.vue
index b8be97db0..841d507c3 100644
--- a/src/jmapNew/theme/race_01/menus/menuPower.vue
+++ b/src/jmapNew/theme/race_01/menus/menuPower.vue
@@ -10,7 +10,6 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 export default {
     name: 'SectionMenu',
@@ -74,7 +73,6 @@ export default {
             };
         },
         initMenu() {
-            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/race_01/menus/menuSection.vue b/src/jmapNew/theme/race_01/menus/menuSection.vue
index 70ca6485b..5df27104e 100644
--- a/src/jmapNew/theme/race_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSection.vue
@@ -24,7 +24,7 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 
@@ -47,67 +47,75 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '区段故障解锁',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    },
-                    {
-                        label: '区段跟踪激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '区段跟踪切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: '区段封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: '区段解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    }
-                ],
-                Center: [
-                    {
-                        label: '区段跟踪激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    },
-                    {
-                        label: '区段跟踪切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    },
-                    {
-                        label: '确认计轴有效',
-                        handler: this.alxeEffective,
-                        cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '区段故障解锁',
+                    handler: this.fault,
+                    cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
+                    isDisabled: (section, work) => false,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'localWork'
+                },
+                {
+                    label: '区段跟踪激活',
+                    handler: this.active,
+                    cmdType: CMD.Section.CMD_SECTION_ACTIVE,
+                    isDisabled: (section, work) => false,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: '区段跟踪切除',
+                    handler: this.split,
+                    cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
+                    isDisabled: (section, work) => false,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: '区段封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Section.CMD_SECTION_BLOCK,
+                    isDisabled: (section, work) => section.blockade === 1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'localWork'
+                },
+                {
+                    label: '区段解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
+                    isDisabled: (section, work) => section.blockade !== 1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'localWork'
+                },
+                {
+                    label: '确认计轴有效',
+                    handler: this.alxeEffective,
+                    cmdType: CMD.Section.CMD_SECTION_COMFIRMATION_AXLE,
+                    isDisabled: (section, work) => false,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'dispatchWork'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (section, work) => section.speedUpLimit !== -1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'dispatchWork'
+                },
+                {
+                    label: '取消临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (section, work) => section.speedUpLimit === -1,
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work == 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: this.$t('menu.menuSection.setFault'),
@@ -165,10 +173,12 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
-                cmdType: CMD.Section.CMD_Train_Init_Plan
+                cmdType: CMD.Section.CMD_Train_Init_Plan,
+                isDisabled: (section, work) => false,
+                isShow: (section, work) => true
             });
         }
     },
@@ -182,7 +192,12 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    menuItem.disabled = !judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                    menuItem.show = menuItem.isShow(this.selected, this.work);
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
diff --git a/src/jmapNew/theme/race_01/menus/menuSignal.vue b/src/jmapNew/theme/race_01/menus/menuSignal.vue
index ed45200d0..a34bfe348 100644
--- a/src/jmapNew/theme/race_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSignal.vue
@@ -24,9 +24,9 @@ import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SignalMenu',
@@ -47,122 +47,117 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '排列进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '信号机引导办理',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '人工解锁进路', // 信号机引导取消
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
-                    },
-                    {
-                        label: '信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: 'Fleet进路办理',
-                        handler: this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: 'Fleet进路取消',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '进路自排关',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路自排开',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路控制状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ],
-                Center: [
-                    {
-                        label: '排列进路',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '人工解锁进路', // 信号机引导取消
-                        handler: this.humanTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '进路自排关',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路自排开',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '设置通过模式',
-                        handler: this.singalPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '取消通过模式',
-                        handler: this.singalCancelPassModel,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '查询进路控制状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '排列进路',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '取消进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '信号机引导办理',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '人工解锁进路', // 信号机引导取消
+                    handler: this.humanTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '信号封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => signal.blockade === 1,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '信号解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => signal.blockade !== 1,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: 'Fleet进路办理',
+                    handler: this.singalPassModel,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: (signal, work) => signal.fleetMode === 1,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: 'Fleet进路取消',
+                    handler: this.singalCancelPassModel,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: (signal, work) => signal.fleetMode === 0,
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '进路自排关',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '进路自排开',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                },
+                {
+                    label: '设置通过模式',
+                    handler: this.singalPassModel,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: (signal, work) => signal.fleetMode === 1,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消通过模式',
+                    handler: this.singalCancelPassModel,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: (signal, work) => signal.fleetMode === 0,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查询进路控制状态',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+                    isDisabled: (signal, work) => false,
+                    isShow: (signal, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -214,7 +209,12 @@ export default {
             };
         },
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/race_01/menus/menuStation.vue b/src/jmapNew/theme/race_01/menus/menuStation.vue
index 9f7c9c1f6..5789df8b2 100644
--- a/src/jmapNew/theme/race_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/race_01/menus/menuStation.vue
@@ -19,10 +19,10 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-// import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
+
 export default {
     name: 'StationMenu',
     components: {
@@ -39,52 +39,61 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '全站设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '全站取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '上电解锁',
-                        handler: this.powerUnLock,
-                        cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK
-                    },
-                    {
-                        label: '执行关键操作测试',
-                        handler: this.execKeyOperationTest,
-                        cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    }
-                ],
-                Center: [
-                    {
-                        label: '所有进路自排关',
-                        handler: this.humanControlALL,
-                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '所有进路自排开',
-                        handler: this.atsAutoControlALL,
-                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '执行关键操作测试',
-                        handler: this.execKeyOperationTest,
-                        cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '全站设置联锁自动触发',
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '全站取消联锁自动触发',
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '上电解锁',
+                    handler: this.powerUnLock,
+                    cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '所有进路自排关',
+                    handler: this.humanControlALL,
+                    cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '所有进路自排开',
+                    handler: this.atsAutoControlALL,
+                    cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '执行关键操作测试',
+                    handler: this.execKeyOperationTest,
+                    cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST,
+                    isDisabled: (station, work) => false,
+                    isShow: (station, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -136,13 +145,17 @@ export default {
         },
         initMenu() {
             if (this.selected.centralized) {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    menuItem.show = menuItem.isShow(this.selected, this.work);
+                    menuItem.disabled = !judgeStationControl(this.selected.code, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                    this.menu.push(menuItem);
+                });
                 // 故障模式菜单列表
                 if (this.operatemode === OperateMode.FAULT) {
                     this.menu = this.menuForce;
                 }
             }
-
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/race_01/menus/menuStationControl.vue b/src/jmapNew/theme/race_01/menus/menuStationControl.vue
deleted file mode 100644
index 0425495e9..000000000
--- a/src/jmapNew/theme/race_01/menus/menuStationControl.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div>
-    <pop-menu ref="popMenu" :menu="menu" />
-    <station-control ref="stationControl" />
-  </div>
-</template>
-
-<script>
-import PopMenu from '@/components/PopMenu';
-import StationControl from './dialog/stationControl';
-import { mapGetters } from 'vuex';
-import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-
-export default {
-    name: 'StationControlMenu',
-    components: {
-        PopMenu,
-        StationControl
-    },
-    // props: {
-    //     selected: {
-    //         type: Object,
-    //         default() {
-    //             return null;
-    //         }
-    //     }
-    // },
-    data() {
-        return {
-            menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '请求站控',
-                        handler: this.setStationControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    },
-                    {
-                        label: '请求遥控',
-                        handler: this.setCenterControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                    }
-                ],
-                Center: [
-                    {
-                        label: '请求站控',
-                        handler: this.setStationControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    },
-                    {
-                        label: '请求遥控',
-                        handler: this.setCenterControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                    }
-                ]
-            },
-            menuForce: [
-            ]
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'operatemode'
-        ]),
-        ...mapGetters('menuOperation', [
-            'buttonOperation'
-        ])
-    },
-    watch: {
-        '$store.state.menuOperation.menuCount': function (val) {
-            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.StationControl) && !this.buttonOperation) {
-                this.doShow(this.$store.state.menuOperation.menuPosition);
-            } else {
-                this.doClose();
-            }
-        }
-    },
-    methods: {
-        clickEvent() {
-            const self = this;
-            window.onclick = function (e) {
-                self.doClose();
-            };
-        },
-        initMenu() {
-            // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-            // 故障模式菜单列表
-            if (this.operatemode === OperateMode.FAULT) {
-                this.menu = this.menuForce;
-            }
-            this.getCurrentStateObject();
-        },
-        doShow(point) {
-            this.clickEvent();
-            this.initMenu();
-            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
-                this.$refs.popMenu.resetShowPosition(point);
-            }
-        },
-        doClose() {
-            if (this.$refs && this.$refs.popMenu) {
-                this.$refs.popMenu.close();
-            }
-        },
-        getCurrentStateObject() {
-            this.selected = this.$store.getters['menuOperation/selected'];
-        },
-        setCenterControl() {
-            // 请求中控（遥控）
-            commitOperate(menuOperate.StationControl.requestCentralControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.stationControl.doShow(operate, this.selected);
-                }
-            });
-        },
-        setStationControl() {
-            // 请求站控
-            commitOperate(menuOperate.StationControl.requestStationControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.stationControl.doShow(operate, this.selected);
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/jmapNew/theme/race_01/menus/menuStationStand.vue b/src/jmapNew/theme/race_01/menus/menuStationStand.vue
index 1a6396bae..fb6913f21 100644
--- a/src/jmapNew/theme/race_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/race_01/menus/menuStationStand.vue
@@ -26,7 +26,7 @@ import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuO
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationStandMenu',
@@ -47,97 +47,117 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '查看站台信息',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ],
-                Center: [
-                    {
-                        label: '扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
-                    },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '批量扣车',
-                        handler: this.setBulkBuckleTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL
-                    },
-                    {
-                        label: '批量取消扣车',
-                        handler: this.cancelBulkBuckleTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
-                    },
-                    {
-                        label: '提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: '设置停站时间',
-                        handler: this.setStopTime,
-                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '设置运行等级',
-                        handler: this.setRunLevel,
-                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: '区间列车数量限制',
-                        handler: this.setDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO
-                    },
-                    {
-                        label: '取消区间列车数量限制',
-                        handler: this.cancelDetainTrainAll,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO
-                    },
-                    {
-                        label: '查看站台信息',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '扣车',
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.stationHoldTrain === 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.stationHoldTrain === 1,
+                    isShow: (stand, work) => work === 'localWork'
+                },
+                {
+                    label: '扣车',
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain === 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => stand.centerHoldTrain === 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '批量扣车',
+                    handler: this.setBulkBuckleTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '批量取消扣车',
+                    handler: this.cancelBulkBuckleTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '提前发车',
+                    handler: this.earlyDeparture,
+                    cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: (stand, work) => stand.trainParking !== 1,
+                    isShow: (stand, work) => false
+                },
+                {
+                    label: '设置跳停',
+                    handler: this.setJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 0,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消跳停',
+                    handler: this.cancelJumpStop,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => stand.allSkip !== 1,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置停站时间',
+                    handler: this.setStopTime,
+                    cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置运行等级',
+                    handler: this.setRunLevel,
+                    cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '区间列车数量限制',
+                    handler: this.setDetainTrainAll,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_AUTO,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消区间列车数量限制',
+                    handler: this.cancelDetainTrainAll,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_AUTO,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查看站台信息',
+                    handler: this.detail,
+                    cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (stand, work) => false,
+                    isShow: (stand, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -189,8 +209,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue
index 57fd3c2e5..87c8973b3 100644
--- a/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue
+++ b/src/jmapNew/theme/race_01/menus/menuStationTurnBack.vue
@@ -12,7 +12,6 @@ import { mapGetters } from 'vuex';
 
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -27,27 +26,24 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置折返策略',
+                    handler: this.setBackStrategy,
+                    cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
+                }
+            ],
             menuForce: [
             ]
         };
@@ -79,8 +75,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
-
+            this.menu = this.menuNormal;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/race_01/menus/menuSwitch.vue b/src/jmapNew/theme/race_01/menus/menuSwitch.vue
index 3be1aa39f..0baaea01b 100644
--- a/src/jmapNew/theme/race_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSwitch.vue
@@ -21,10 +21,9 @@ import AlxeEffective from './dialog/alxeEffective';
 import SwitchHookLock from '@/jmapNew/theme/components/menus/dialog/switchHookLock';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
-
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -45,111 +44,118 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '定操',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '反操',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔封锁',
-                        handler: this.block,
-                        cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-                    },
-                    {
-                        label: '道岔解封',
-                        handler: this.unblock,
-                        cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '定操',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '反操',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    // {
-                    //     label: '道岔单锁',
-                    //     handler: this.lock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    // },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType: CMD.Switch.CMD_SWITCH_ACTIVE
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '确认计轴有效',
-                        handler: this.alxeEffective,
-                        cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE
-                    },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '查看公里标',
-                        handler: this.undeveloped,
-                        cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '定操',
+                    handler: this.locate,
+                    cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: (switchDevice, work) => switchDevice.normalPosition === 1,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '反操',
+                    handler: this.reverse,
+                    cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: (switchDevice, work) => switchDevice.reversePosition === 1,
+                    isShow: (switchDevice, work) => true
+                },
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.singleLock === 1,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.singleLock !== 1,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '道岔封锁',
+                    handler: this.block,
+                    cmdType: CMD.Switch.CMD_SWITCH_BLOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.blockade === 1,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    label: '道岔解封',
+                    handler: this.unblock,
+                    cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK,
+                    isDisabled: (switchDevice, work) => switchDevice.blockade !== 1,
+                    isShow: (switchDevice, work) => work === 'localWork'
+                },
+                {
+                    type: 'separator',
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '区段激活',
+                    handler: this.active,
+                    cmdType: CMD.Switch.CMD_SWITCH_ACTIVE,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '区段切除',
+                    handler: this.split,
+                    cmdType: CMD.Switch.CMD_SWITCH_CUT_OFF,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator',
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '确认计轴有效',
+                    handler: this.alxeEffective,
+                    cmdType: CMD.Switch.CMD_SWITCH_COMFIRMATION_AXLE,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消临时限速',
+                    handler: this.cancelSpeed,
+                    cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator',
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查看公里标',
+                    handler: this.undeveloped,
+                    cmdType: CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => true
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -202,7 +208,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work);
+                menuItem.show = menuItem.isShow(this.selected, this.work);
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 // if (!this.$store.state.scriptRecord.bgSet) {
diff --git a/src/jmapNew/theme/race_01/menus/menuTrain.vue b/src/jmapNew/theme/race_01/menus/menuTrain.vue
index 75cb2ceed..2c1a7c9bb 100644
--- a/src/jmapNew/theme/race_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/race_01/menus/menuTrain.vue
@@ -32,7 +32,6 @@ import SetTrainOperation from '@/jmapNew/theme/components/menus/dialog/setTrainO
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -63,145 +62,89 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    // {
-                    //     label: '设置车组号',
-                    //     handler: this.addTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '删除车组号',
-                    //     handler: this.delTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '移动车组号',
-                    //     handler: this.moveTrainId,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '新建计划车',
-                    //     handler: this.addPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '设置计划车',
-                    //     handler: this.setPlanTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置头码车',
-                    //     handler: this.setHeadTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设置人工车',
-                    //     handler: this.setWorkTrain,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '设乘务组号',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '标记ATP切除',
-                    //     handler: this.setTrainATPdel,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '标记ATP恢复',
-                    //     handler: this.setTrainATPRec,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     type: 'separator'
-                    // },
-                    // {
-                    //     label: '旅行冲突列车',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // },
-                    // {
-                    //     label: '列车信息',
-                    //     handler: this.undeveloped,
-                    //     cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '设置车组号',
-                        handler: this.addTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '删除车组号',
-                        handler: this.delTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '移动车组号',
-                        handler: this.moveTrainId,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '设置计划车',
-                        handler: this.setPlanTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-                    },
-                    {
-                        label: '设置头码车',
-                        handler: this.setHeadTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
-                    },
-                    {
-                        label: '设置人工车',
-                        handler: this.setWorkTrain,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
-                    },
-                    {
-                        label: '设乘务组号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '标记ATP切除',
-                        handler: this.setTrainATPdel,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '标记ATP恢复',
-                        handler: this.setTrainATPRec,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        type: 'separator'
-                    },
-                    {
-                        label: '旅行冲突列车',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    },
-                    {
-                        label: '列车信息',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_Train_Init_Plan
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置车组号',
+                    handler: this.addTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '删除车组号',
+                    handler: this.delTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '移动车组号',
+                    handler: this.moveTrainId,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator',
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置计划车',
+                    handler: this.setPlanTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置头码车',
+                    handler: this.setHeadTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置人工车',
+                    handler: this.setWorkTrain,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设乘务组号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator',
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '标记ATP切除',
+                    handler: this.setTrainATPdel,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '标记ATP恢复',
+                    handler: this.setTrainATPRec,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    type: 'separator',
+                    isDisabled: (switchDevice, work) => false,
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '旅行冲突列车',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '列车信息',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
+                    isShow: (train, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -319,7 +262,12 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -489,7 +437,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -518,7 +466,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDefine.doShow(operate, this.selected);
@@ -535,7 +483,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate, this.selected);
@@ -552,7 +500,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(operate, this.selected);
@@ -567,7 +515,7 @@ export default {
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -582,7 +530,7 @@ export default {
                 operation: OperationEvent.Train.editTrainId.menu.operation,
                 param: {}
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetHead.doShow(operate, this.selected);
@@ -599,7 +547,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWork.doShow(operate, this.selected);
@@ -616,7 +564,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
@@ -633,7 +581,7 @@ export default {
                     sectionCode: this.$store.state.map.trainWindowSectionCode
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWorkATP.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
index bb6d4f973..3276d62e2 100644
--- a/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
@@ -2,7 +2,7 @@
   <el-dialog
     v-dialogDrag
     class="race-01__systerm alarm-detail"
-    :title="level+'级告警详细信息'"
+    :title="level+'级报警详细信息'"
     :visible.sync="show"
     width="760px"
     :before-close="doClose"
@@ -128,8 +128,8 @@ export default {
             if (elem && elem.hasOwnProperty('success')) {
                 if (elem.success) {
                     const operate = this.$store.state.training.operate;
-                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                    // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                     const newOperate = {
                         type: operate.type,
                         name: station.name
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -186,7 +186,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 dfdbeede1..9c4d00e17 100644
--- a/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
@@ -42,8 +42,8 @@ export default {
         '$store.state.socket.msgHead': function (elem) {
             if (elem && (elem.hasOwnProperty('success') || elem.hasOwnProperty('timeout'))) {
                 const operate = this.$store.state.training.operate;
-                const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                // const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
                 const newOperate = {
                     type: operate.type,
                     name: station.name
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue
index e6774f770..979276774 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmControl.vue
@@ -157,7 +157,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -177,7 +177,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -197,7 +197,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -217,7 +217,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -237,7 +237,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -257,7 +257,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -278,7 +278,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -299,7 +299,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -320,7 +320,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -336,7 +336,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index 964b63171..55d10320e 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -81,7 +81,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -99,7 +99,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
index 644b1e4fb..59be3abcd 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
@@ -139,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue
index d605c54a1..1d3466b12 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeCmdControl.vue
@@ -276,7 +276,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (this.operation == OperationEvent.Signal.unlock.menu.operation) {
@@ -296,7 +296,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -322,7 +322,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -352,7 +352,7 @@ export default {
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -382,7 +382,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -399,7 +399,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue
index 888e4d45d..7bb99c63e 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeLock.vue
@@ -143,7 +143,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
index 9cee32dfb..123427f49 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/routeSelection.vue
@@ -208,7 +208,7 @@ export default {
                         val: row.code
                     };
 
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         if (valid) {
                             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         }
@@ -236,7 +236,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue
index 2621cabd6..ea75bd767 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/sectionCmdControl.vue
@@ -273,7 +273,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -301,7 +301,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -316,8 +316,9 @@ export default {
             });
         },
         confirm2() {
-            const operate = {};
-
+            const operate = {
+                send: true
+            };
             if (this.operation == OperationEvent.Section.unlock.menu.operation) {
                 /** 区段解封*/
                 operate.operation = OperationEvent.Section.unlock.confirm2.operation;
@@ -334,7 +335,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -366,7 +367,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -383,7 +384,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue b/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue
index 60de321ba..c5309036d 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/setFault.vue
@@ -124,7 +124,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
index 2b0ce4898..3dc18ad24 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standBackStrategy.vue
@@ -130,7 +130,7 @@ export default {
             this.strategy = strategy;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -188,7 +188,7 @@ export default {
                     }
                 };
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -207,7 +207,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue
index 09db2ca0a..118130657 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standControl.vue
@@ -159,7 +159,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
index b3766a351..c25e0745d 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standDetainTrainAll.vue
@@ -143,7 +143,7 @@ export default {
                 val: (this.rightUp && upDown) || (!this.rightUp && !upDown) ? '02' : '01'
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -161,7 +161,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -177,7 +177,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue
index b15a2e9c4..f2581c78a 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standRunLevel.vue
@@ -195,7 +195,7 @@ export default {
             this.time = time;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -208,7 +208,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -235,7 +235,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -256,7 +256,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue
index a43b9d280..86a2138dd 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/standStopTime.vue
@@ -171,7 +171,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -184,7 +184,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -197,7 +197,7 @@ export default {
                 param: {}
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -215,7 +215,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -233,7 +233,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/xian_01/menus/dialog/stationBackStrategy.vue
index d4d0384f6..de910e6b2 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/stationBackStrategy.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/stationBackStrategy.vue
@@ -113,7 +113,7 @@ export default {
             };
             this.strategyId = row.id;
             this.isConfirm = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -161,7 +161,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
index ef5d4c56f..9e279e9ab 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/switchCmdControl.vue
@@ -320,7 +320,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -353,7 +353,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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -391,7 +391,7 @@ export default {
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -427,7 +427,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -444,7 +444,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 d5d15cae2..3c1aab95f 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 4fa336715..afdda768d 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
@@ -38,7 +38,7 @@
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import Handler from '@/scripts/cmdPlugin/Handler';
+// import Handler from '@/scripts/cmdPlugin/Handler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import {TrainType} from '@/scripts/ConstDic';
 
@@ -103,7 +103,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Train.trainDetailInfo.confirm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -115,7 +115,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 e9bf58c84..ecaf2533f 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
@@ -92,7 +92,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -112,7 +112,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 1fc713dbd..7822684b0 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
@@ -154,7 +154,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -175,7 +175,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 cadaf14ff..5f36e0e84 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
@@ -159,7 +159,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue
similarity index 93%
rename from src/jmapNew/theme/xian_01/menus/index.vue
rename to src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue
index 2d1c4fb81..8c7fd31db 100644
--- a/src/jmapNew/theme/xian_01/menus/index.vue
+++ b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenu.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" />
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
-    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" />
+    <menu-bar ref="menuBar" :selected="selected" :work="work" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" />
+    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" :work="work" />
     <passive-alarm ref="passiveAlarm" />
     <passive-contorl ref="passiveControl" pop-class="xian-01__systerm" />
     <passive-Timeout ref="passiveTimeout" />
@@ -24,7 +24,7 @@ import MenuSwitch from './menuSwitch';
 import MenuSection from './menuSection';
 import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
-import MenuBar from './menuBar';
+import MenuBar from './dispatchWorkMenuBar';
 import MenuStationTurnBack from './menuStationTurnBack';
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
@@ -32,7 +32,7 @@ import PassiveTimeout from './passiveDialog/timeout';
 import PopMenu from '@/components/PopMenu';
 
 export default {
-    name: 'Menus',
+    name: 'DispatchWorkMenu',
     components: {
         MenuBar,
         MenuSignal,
@@ -58,21 +58,16 @@ export default {
     data() {
         return {
             menu: [],
-            menuNormal: []
+            menuNormal: [],
+            work: 'dispatchWork'
         };
     },
     computed: {
         ...mapGetters('config', [
             'width'
-        ]),
-        isShowBar() {
-            return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
+        ])
     },
     watch: {
-        isShowBar(val) {
-            val && this.$store.dispatch('config/updateMenuBar');
-        },
         '$store.state.menuOperation.menuCount': function (val) {
             // && this.$store.state.training.prdType == '02'
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
@@ -119,7 +114,7 @@ export default {
         },
         initMenu() {
             this.menuNormal = [];
-            if (this.$store.state.training.prdType == '02') {
+            if (this.work === 'dispatchWork') {
                 this.$store.state.map.map.stationList.forEach(station => {
                     if (station.relStationCodeList && station.relStationCodeList.length) {
                         const node = {
@@ -127,7 +122,7 @@ export default {
                             children: []
                         };
                         const relStationCodeList = [...station.relStationCodeList];
-                        relStationCodeList.push(station.code);
+                        // relStationCodeList.push(station.code);
                         relStationCodeList.sort((a, b) => {
                             const stationA = this.$store.getters['map/getDeviceByCode'](a);
                             const stationB = this.$store.getters['map/getDeviceByCode'](b);
@@ -144,10 +139,10 @@ export default {
                         this.menuNormal.push(node);
                     }
                 });
-            } else if (this.$store.state.training.prdType == '01') {
+            } else if (this.work === 'localWork') {
                 const roleDeviceCode = this.$store.state.training.roleDeviceCode;
                 const displayList = this.$store.state.map.map.displayList;
-                const display = displayList.find(each=>{
+                const display = displayList && displayList.find(each=>{
                     return each.stationCodeList.includes(roleDeviceCode);
                 });
                 if (display) {
@@ -203,6 +198,10 @@ export default {
 </script>
 
 <style>
+	.menus {
+		position: absolute;
+		top: 0;
+	}
     .menus .pop-menu {
         background: #F0F0F0;
     }
diff --git a/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue
new file mode 100644
index 000000000..ab3a76b4b
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/dispatchWorkMenuBar.vue
@@ -0,0 +1,421 @@
+<template>
+  <div id="menuBarXian01">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <!--<div class="deviceStatus">-->
+    <!--<div class="holdTrainStatus">H</div>-->
+    <!--<div class="jumpStopStatus">S</div>-->
+    <!--</div>-->
+    <menu-system-time ref="menuSystemTime" />
+    <station-control-convert ref="stationControlConvert" :work="work" />
+    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
+    <view-train-id ref="viewTrainId" />
+    <view-name ref="viewName" />
+    <view-device ref="viewDevice" />
+    <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" />
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+    <!-- <delete-runplan-line ref="deleteRunplanLine" /> -->
+    <!-- <add-runplan-line ref="addRunplanLine" /> -->
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
+import StationControlConvert from './menuDialog/stationControlConvert';
+import TrainAdd from './menuDialog/trainAdd';
+// import AddRunplanLine from './menuDialog/addRunplanLine';
+import TrainTranstalet from './menuDialog/trainTranstalet';
+import TrainDelete from './menuDialog/trainDelete';
+import PasswordBox from './menuDialog/passwordBox';
+import ViewTrainId from './menuDialog/viewTrainId';
+import ViewName from './menuDialog/viewName';
+import ViewDevice from './menuDialog/viewDevice';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+// import DeleteRunplanLine from './menuDialog/deleteRunplanLine';
+import { EventBus } from '@/scripts/event-bus';
+import MenuSystemTime from './menuSystemTime';
+
+export default {
+    name: 'DispatchWorkMenuBarXian01',
+    components: {
+        MenuBar,
+        StationControlConvert,
+        PasswordBox,
+        ViewTrainId,
+        ViewName,
+        ViewDevice,
+        TrainAdd,
+        // AddRunplanLine,
+        TrainTranstalet,
+        TrainDelete,
+        ManageUser,
+        HelpAbout,
+        MenuSystemTime
+        // DeleteRunplanLine
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: this.$t('menu.menuBar.system'),
+                    operate: OperationEvent.Command.mBar.system,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.view'),
+                    operate: OperationEvent.Command.mBar.check,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.refresh'),
+                    operate: OperationEvent.Command.mBar.fresh,
+                    click: this.refresh,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.display'),
+                    operate: OperationEvent.Command.mBar.view,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setNameDisplay'),
+                            click: this.setNameDisplay,
+                            operate: OperationEvent.Command.view.setNameDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setDeviceDisplay'),
+                            click: this.setDeviceDisplay,
+                            operate: OperationEvent.Command.view.setDeviceDisplay
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.stationMapSwitch'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.planCarOperation'),
+                    operate: OperationEvent.Command.mBar.planTrain,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.addPlanCar'),
+                            click: this.addPlanTrain,
+                            operate: OperationEvent.Command.planTrain.addPlanTrain
+                        },
+                        {
+                            title: this.$t('menu.menuBar.panPlanCar'),
+                            click: this.translatPlanTrain,
+                            operate: OperationEvent.Command.planTrain.translatPlanTrain
+                        },
+                        {
+                            title: this.$t('menu.menuBar.deletePlanCar'),
+                            click: this.delPlanTrain,
+                            operate: OperationEvent.Command.planTrain.delPlanTrain
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.trainNumberMaintenance'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.controlModeSwitch'),
+                    operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.toStationControl'),
+                            click: this.turnToStationControl,
+                            operate: OperationEvent.StationControl.requestStationControl.mbar,
+                            force: true
+                        },
+                        {
+                            title: this.$t('menu.menuBar.forcedStationControl'),
+                            click: this.mandatoryStationControl,
+                            operate: OperationEvent.StationControl.forcedStationControl.password,
+                            force: true
+                        },
+                        {
+                            title: this.$t('menu.menuBar.toCentralControl'),
+                            click: this.conterStationControl,
+                            operate: OperationEvent.StationControl.requestCentralControl.mbar
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.requestOperationArea'),
+                    operate: OperationEvent.Command.mBar.requestZone,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.schedulingLog'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.systemAnalysis'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.userManage'),
+                    operate: OperationEvent.Command.mBar.userManage,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.userManage'),
+                            click: this.userManage,
+                            operate: OperationEvent.Command.manage.userManage
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.historyQuery'),
+                    operate: OperationEvent.Command.mBar.historyQuery,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.help'),
+                    operate: OperationEvent.Command.mBar.help,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.about'),
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    methods: {
+        // 转为站控
+        turnToStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 强制转为站控
+        mandatoryStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
+        },
+        // 请求中控
+        conterStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        // 设置设备显示
+        setNameDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewName.doShow(operate);
+                }
+            });
+        },
+        // 设置名称显示
+        setDeviceDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewDevice.doShow(operate);
+                }
+            });
+        },
+        // 添加计划车
+        addPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    if (this.$route.query.lineCode == '10') {
+                        this.$refs.trainAdd.doShow(operate);
+                    } else {
+                        // this.$refs.addRunplanLine.doShow(operate);
+                        this.$refs.trainAdd.doShow(operate);
+                    }
+                }
+            });
+        },
+        // 平移计划车
+        translatPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainTranstalet.doShow(operate);
+                }
+            });
+        },
+        // 删除计划车
+        delPlanTrain(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.trainDelete.doShow(operate);
+                    // this.$refs.deleteRunplanLine.doShow(operate);
+                }
+            });
+        },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+
+            EventBus.$emit('refresh');
+        },
+        getLoginResult(operate) {
+            /** 密码校验*/
+            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+                if (operate.success) {
+                    /** 校验成功*/
+                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+                }
+            }
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    .deviceStatus{
+        display: inline-block;
+        font-size: 0;
+        height: 40px;
+        background: #f0f0f0;
+        width: 300px;
+    }
+    .holdTrainStatus,.jumpStopStatus{
+        color: #fff;
+        display: inline-block;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        background: #ccc;
+        font-size:14px;
+    }
+
+    #menuBarXian01{
+        line-height:30px;
+    }
+    #menuBarXian01 #menuBar .menu-li-block .label{
+        padding: 0px 30px 0px 5px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/localWorkMenu.vue b/src/jmapNew/theme/xian_01/menus/localWorkMenu.vue
new file mode 100644
index 000000000..53c72e56c
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/localWorkMenu.vue
@@ -0,0 +1,494 @@
+<template>
+  <div class="menus" :style="{width: width + 'px'}">
+    <menu-bar ref="menuBar" :selected="selected" :work="work" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="work" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="work" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="work" />
+    <menu-section ref="menuSection" :selected="selected" :work="work" />
+    <menu-train ref="menuTrain" :selected="selected" :work="work" />
+    <menu-station ref="menuStation" :selected="selected" :work="work" />
+    <menu-station-turn-back ref="menuStationTurnBack" :selected="selected" :work="work" />
+    <passive-alarm ref="passiveAlarm" />
+    <passive-contorl ref="passiveControl" pop-class="xian-01__systerm" />
+    <passive-Timeout ref="passiveTimeout" />
+    <pop-menu ref="popMenu" :menu="menu" pop-class="preview_new_pop" />
+  </div>
+</template>
+
+<script>
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+import MenuStationStand from './menuStationStand';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+import MenuBar from './localWorkMenuBar';
+import MenuStationTurnBack from './menuStationTurnBack';
+import PassiveAlarm from './passiveDialog/alarm';
+import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
+import PassiveTimeout from './passiveDialog/timeout';
+import PopMenu from '@/components/PopMenu';
+
+export default {
+    name: 'LocalWorkMenu',
+    components: {
+        MenuBar,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        MenuStationStand,
+        MenuStation,
+        MenuTrain,
+        PassiveAlarm,
+        MenuStationTurnBack,
+        PassiveContorl,
+        PassiveTimeout,
+        PopMenu
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            menu: [],
+            menuNormal: [],
+            work: 'localWork'
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            // && this.$store.state.training.prdType == '02'
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Cancel)) {
+                this.popDoShow(this.$store.state.menuOperation.menuPosition);
+            } else {
+                this.popDoClose();
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+            const _that = this;
+            window.onclick = function (e) {
+                if (!_that.$store.state.training.trainingStart) {
+                    _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose();
+                }
+                _that.$refs.menuStationStand.doClose();
+                _that.$refs.menuSwitch.doClose();
+                _that.$refs.menuSignal.doClose();
+                _that.$refs.menuSection.doClose();
+                _that.$refs.menuTrain.doClose();
+                _that.$refs.menuStation.doClose();
+                _that.$refs.menuStationTurnBack.doClose();
+            };
+        });
+    },
+    beforeDestroy() {
+        window.onclick = function (e) {};
+    },
+    methods:{
+        popClickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.popDoClose();
+            };
+        },
+        popDoShow(point) {
+            this.popClickEvent();
+            this.initMenu();
+            if (this.$refs && this.$refs.popMenu && this.menu && this.menu.length) {
+                this.$refs.popMenu.resetShowPosition(point);
+            }
+        },
+        initMenu() {
+            this.menuNormal = [];
+            if (this.work === 'dispatchWork') {
+                this.$store.state.map.map.stationList.forEach(station => {
+                    if (station.relStationCodeList && station.relStationCodeList.length) {
+                        const node = {
+                            label: station.name,
+                            children: []
+                        };
+                        const relStationCodeList = [...station.relStationCodeList];
+                        // relStationCodeList.push(station.code);
+                        relStationCodeList.sort((a, b) => {
+                            const stationA = this.$store.getters['map/getDeviceByCode'](a);
+                            const stationB = this.$store.getters['map/getDeviceByCode'](b);
+                            return stationA.kmRange - stationB.kmRange;
+                        });
+                        relStationCodeList.forEach(item => {
+                            const next = this.$store.getters['map/getDeviceByCode'](item);
+                            node.children.push({
+                                code: next.code,
+                                label: next.name,
+                                handler: this.mapLocation
+                            });
+                        });
+                        this.menuNormal.push(node);
+                    }
+                });
+            } else if (this.work === 'localWork') {
+                const roleDeviceCode = this.$store.state.training.roleDeviceCode;
+                const displayList = this.$store.state.map.map.displayList;
+                const display = displayList && displayList.find(each=>{
+                    return each.stationCodeList.includes(roleDeviceCode);
+                });
+                if (display) {
+                    const codeList = [...display.switchStationCodeList];
+                    let relStationCodeList = [];
+                    let ciStaionCode = '';
+                    codeList.sort((a, b) => {
+                        const stationA = this.$store.getters['map/getDeviceByCode'](a);
+                        const stationB = this.$store.getters['map/getDeviceByCode'](b);
+                        if (stationA.relStationCodeList && stationA.relStationCodeList.length > 0 && relStationCodeList.length <= 0) {
+                            relStationCodeList = [...stationA.relStationCodeList];
+                            ciStaionCode = stationA.code;
+                            relStationCodeList.push(stationA.code);
+                        }
+                        return stationA.kmRange - stationB.kmRange;
+                    });
+                    const ciStaion = this.$store.getters['map/getDeviceByCode'](ciStaionCode);
+                    const currentNode = {label: ciStaion.name, children: []};
+                    codeList.forEach(code=>{
+                        let node;
+                        const station = this.$store.getters['map/getDeviceByCode'](code);
+                        if (station.depot) {
+                            return;
+                        }
+                        if (relStationCodeList.includes(code)) {
+                            currentNode.children.push({label: station.name, code: station.code, handler: this.mapLocation});
+                            if (currentNode.children.length == relStationCodeList.length) {
+                                this.menuNormal.push(currentNode);
+                            }
+                        } else {
+                            node = {label: station.name, code: station.code, handler: this.mapLocation};
+                            this.menuNormal.push(node);
+                        }
+                    });
+                }
+            }
+            this.menu = [...this.menuNormal];
+        },
+        popDoClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        // 设置地图定位
+        mapLocation(item) {
+            if (item) {
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: item.code });
+                this.popDoClose();
+            }
+        }
+    }
+};
+</script>
+
+<style>
+	.menus {
+		position: absolute;
+		top: 0;
+	}
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .xian-01__systerm {
+        overflow: hidden !important;
+    }
+
+	.xian-01__systerm.pop-menu{
+		padding: 0;
+		padding-left: 20px;
+	}
+	.xian-01__systerm.pop-menu .container{
+		border-left: 1px solid #ccc;
+	}
+	.xian-01__systerm.pop-menu .dsp-block {
+		display: block;
+		text-align: left;
+		width: 100%;
+		border-radius: unset;
+		border: 1px solid transparent;
+		color: #000;
+		padding: 6px 6px;
+		border-left: 1px solid #bdbcbc;
+	}
+
+    .xian-01__systerm .el-dialog {
+        background: rgba(100, 100, 100, 0.3);
+        border: 2px solid rgb(144, 144, 144, 0.8);
+        border-radius: 6px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__header {
+        padding: 5px;
+        height: 26px;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__footer {
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__body {
+        padding-top: 10px;
+        padding-bottom: 10px;
+        padding-left: 5px;
+        padding-right: 5px;
+        margin: 0px 5px 5px;
+        border: 2px solid rgba(120, 121, 123, 0.5);
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__title {
+        position: absolute;
+        top: 4px;
+        color: #000;
+        border-radius: 4px;
+        padding: 0px 2px;
+        height: 20px;
+        line-height: 20px
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__title::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        -webkit-filter: blur(10px);
+        filter: blur(10px);
+        height: 20px;
+        width: -webkit-fill-available;
+        background: rgba(128, 128, 128, 0.8);
+        z-index: -1;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 4px;
+        right: 5px;
+        line-height: 16px;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .xian-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .xian-01__systerm .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .xian-01__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .xian-01__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .xian-01__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .xian-01__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .xian-01__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .xian-01__systerm .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .xian-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .xian-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .xian-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .xian-01__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .xian-01__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+    }
+
+    .xian-01__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .xian-01__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .xian-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .xian-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .xian-01__systerm .el-dialog .base-label {
+        background: rgb(240 240 240);
+        position: relative;
+    }
+
+    .xian-01__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .xian-01__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .xian-01__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .xian-01__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .xian-01__systerm .el-dialog .button-group {
+        margin-top: 10px;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue b/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue
new file mode 100644
index 000000000..55749e623
--- /dev/null
+++ b/src/jmapNew/theme/xian_01/menus/localWorkMenuBar.vue
@@ -0,0 +1,378 @@
+<template>
+  <div id="menuBarXian01">
+    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <!--<div class="deviceStatus">-->
+    <!--<div class="holdTrainStatus">H</div>-->
+    <!--<div class="jumpStopStatus">S</div>-->
+    <!--</div>-->
+    <menu-system-time ref="menuSystemTime" />
+    <station-control-convert ref="stationControlConvert" :work="work" />
+    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
+    <view-train-id ref="viewTrainId" />
+    <view-name ref="viewName" />
+    <view-device ref="viewDevice" />
+    <!-- <train-add ref="trainAdd" />
+    <train-transtalet ref="trainTranstalet" />
+    <train-delete ref="trainDelete" /> -->
+    <manage-user ref="manageUser" />
+    <help-about ref="helpAbout" />
+    <!-- <delete-runplan-line ref="deleteRunplanLine" /> -->
+    <!-- <add-runplan-line ref="addRunplanLine" /> -->
+  </div>
+</template>
+<script>
+import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
+import StationControlConvert from './menuDialog/stationControlConvert';
+// import TrainAdd from './menuDialog/trainAdd';
+// import AddRunplanLine from './menuDialog/addRunplanLine';
+// import TrainTranstalet from './menuDialog/trainTranstalet';
+// import TrainDelete from './menuDialog/trainDelete';
+import PasswordBox from './menuDialog/passwordBox';
+import ViewTrainId from './menuDialog/viewTrainId';
+import ViewName from './menuDialog/viewName';
+import ViewDevice from './menuDialog/viewDevice';
+import ManageUser from './menuDialog/manageUser';
+import HelpAbout from './menuDialog/helpAbout';
+// import DeleteRunplanLine from './menuDialog/deleteRunplanLine';
+import { EventBus } from '@/scripts/event-bus';
+import MenuSystemTime from './menuSystemTime';
+
+export default {
+    name: 'LocalWorkMenuBarXian01',
+    components: {
+        MenuBar,
+        StationControlConvert,
+        PasswordBox,
+        ViewTrainId,
+        ViewName,
+        ViewDevice,
+        // TrainAdd,
+        // AddRunplanLine,
+        // TrainTranstalet,
+        // TrainDelete,
+        ManageUser,
+        HelpAbout,
+        MenuSystemTime
+        // DeleteRunplanLine
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            menuNormal: [
+                {
+                    title: this.$t('menu.menuBar.system'),
+                    operate: OperationEvent.Command.mBar.system,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.view'),
+                    operate: OperationEvent.Command.mBar.check,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.refresh'),
+                    operate: OperationEvent.Command.mBar.fresh,
+                    click: this.refresh,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.display'),
+                    operate: OperationEvent.Command.mBar.view,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.setTrainIdDisplay'),
+                            click: this.setTrainIdDisplay,
+                            operate: OperationEvent.Command.view.setTrainIdDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setNameDisplay'),
+                            click: this.setNameDisplay,
+                            operate: OperationEvent.Command.view.setNameDisplay
+                        },
+                        {
+                            title: this.$t('menu.menuBar.setDeviceDisplay'),
+                            click: this.setDeviceDisplay,
+                            operate: OperationEvent.Command.view.setDeviceDisplay
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.stationMapSwitch'),
+                    operate: '',
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.controlModeSwitch'),
+                    operate: OperationEvent.MixinCommand.remoteControl.mbar,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.toStationControl'),
+                            click: this.turnToStationControl,
+                            operate: OperationEvent.StationControl.requestStationControl.mbar
+                        },
+                        {
+                            title: this.$t('menu.menuBar.forcedStationControl'),
+                            click: this.mandatoryStationControl,
+                            operate: OperationEvent.StationControl.forcedStationControl.password
+                        },
+                        {
+                            title: this.$t('menu.menuBar.toCentralControl'),
+                            click: this.conterStationControl,
+                            operate: OperationEvent.StationControl.requestCentralControl.mbar,
+                            force: true
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.requestOperationArea'),
+                    operate: OperationEvent.Command.mBar.requestZone,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.historyQuery'),
+                    operate: OperationEvent.Command.mBar.historyQuery,
+                    click: this.undeveloped,
+                    children: [
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.userManage'),
+                    operate: OperationEvent.Command.mBar.userManage,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.userManage'),
+                            click: this.userManage,
+                            operate: OperationEvent.Command.manage.userManage
+                        }
+                    ]
+                },
+                {
+                    title: this.$t('menu.menuBar.help'),
+                    operate: OperationEvent.Command.mBar.help,
+                    children: [
+                        {
+                            title: this.$t('menu.menuBar.about'),
+                            click: this.about,
+                            operate: OperationEvent.Command.help.about
+                        }
+                    ]
+                }
+            ]
+        };
+    },
+    methods: {
+        // 转为站控
+        turnToStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 强制转为站控
+        mandatoryStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.passwordBox.doShow(operate);
+                }
+            });
+        },
+        // 请求中控
+        conterStationControl(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.stationControlConvert.doShow(operate);
+                }
+            });
+        },
+        // 设置列车识别号显示
+        setTrainIdDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewTrainId.doShow(operate);
+                }
+            });
+        },
+        // 设置设备显示
+        setNameDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewName.doShow(operate);
+                }
+            });
+        },
+        // 设置名称显示
+        setDeviceDisplay(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.viewDevice.doShow(operate);
+                }
+            });
+        },
+        // 添加计划车
+        // addPlanTrain(order) {
+        //     const operate = {
+        //         operation: order.operation
+        //     };
+        //     this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             if (this.$route.query.lineCode == '10') {
+        //                 this.$refs.trainAdd.doShow(operate);
+        //             } else {
+        //                 // this.$refs.addRunplanLine.doShow(operate);
+        //                 this.$refs.trainAdd.doShow(operate);
+        //             }
+        //         }
+        //     });
+        // },
+        // 平移计划车
+        // translatPlanTrain(order) {
+        //     const operate = {
+        //         operation: order.operation
+        //     };
+        //     this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             this.$refs.trainTranstalet.doShow(operate);
+        //         }
+        //     });
+        // },
+        // 删除计划车
+        // delPlanTrain(order) {
+        //     const operate = {
+        //         operation: order.operation
+        //     };
+        //     this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+        //         if (valid) {
+        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        //             this.$refs.trainDelete.doShow(operate);
+        //             // this.$refs.deleteRunplanLine.doShow(operate);
+        //         }
+        //     });
+        // },
+        // 用户管理
+        userManage(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.manageUser.doShow(operate);
+                }
+            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
+        },
+        // 刷新
+        refresh() {
+
+            EventBus.$emit('refresh');
+        },
+        getLoginResult(operate) {
+            /** 密码校验*/
+            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
+                if (operate.success) {
+                    /** 校验成功*/
+                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
+                }
+            }
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
+        },
+        undeveloped() {
+            this.$refs.menuBar.doClose();
+            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    .deviceStatus{
+        display: inline-block;
+        font-size: 0;
+        height: 40px;
+        background: #f0f0f0;
+        width: 300px;
+    }
+    .holdTrainStatus,.jumpStopStatus{
+        color: #fff;
+        display: inline-block;
+        width: 30px;
+        height: 30px;
+        text-align: center;
+        background: #ccc;
+        font-size:14px;
+    }
+
+    #menuBarXian01{
+        line-height:30px;
+    }
+    #menuBarXian01 #menuBar .menu-li-block .label{
+        padding: 0px 30px 0px 5px !important;
+    }
+</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuBar.vue b/src/jmapNew/theme/xian_01/menus/menuBar.vue
deleted file mode 100644
index 11c964005..000000000
--- a/src/jmapNew/theme/xian_01/menus/menuBar.vue
+++ /dev/null
@@ -1,529 +0,0 @@
-<template>
-  <div id="menuBarXian01">
-    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
-    <!--<div class="deviceStatus">-->
-    <!--<div class="holdTrainStatus">H</div>-->
-    <!--<div class="jumpStopStatus">S</div>-->
-    <!--</div>-->
-    <station-control-convert ref="stationControlConvert" @warningInfoDoShow="warningInfoDoShow" />
-    <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
-    <view-train-id ref="viewTrainId" />
-    <view-name ref="viewName" />
-    <view-device ref="viewDevice" />
-    <train-add ref="trainAdd" />
-    <train-transtalet ref="trainTranstalet" />
-    <train-delete ref="trainDelete" />
-    <manage-user ref="manageUser" />
-    <help-about ref="helpAbout" />
-    <warning-info ref="warningInfo" />
-    <!-- <delete-runplan-line ref="deleteRunplanLine" /> -->
-    <!-- <add-runplan-line ref="addRunplanLine" /> -->
-  </div>
-</template>
-<script>
-import MenuBar from '@/jmapNew/theme/components/menus/menuBar';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler.js';
-import StationControlConvert from './menuDialog/stationControlConvert';
-import WarningInfo from './menuDialog/warningInfo';
-import TrainAdd from './menuDialog/trainAdd';
-// import AddRunplanLine from './menuDialog/addRunplanLine';
-import TrainTranstalet from './menuDialog/trainTranstalet';
-import TrainDelete from './menuDialog/trainDelete';
-import PasswordBox from './menuDialog/passwordBox';
-import ViewTrainId from './menuDialog/viewTrainId';
-import ViewName from './menuDialog/viewName';
-import ViewDevice from './menuDialog/viewDevice';
-import ManageUser from './menuDialog/manageUser';
-import HelpAbout from './menuDialog/helpAbout';
-// import DeleteRunplanLine from './menuDialog/deleteRunplanLine';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MenuBarXian01',
-    components: {
-        MenuBar,
-        StationControlConvert,
-        PasswordBox,
-        ViewTrainId,
-        ViewName,
-        ViewDevice,
-        TrainAdd,
-        // AddRunplanLine,
-        TrainTranstalet,
-        TrainDelete,
-        ManageUser,
-        HelpAbout,
-        WarningInfo
-        // DeleteRunplanLine
-    },
-    props: {
-        selected: {
-            type: Object,
-            default() {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            menuNormal: {
-                Local: [
-                    {
-                        title: this.$t('menu.menuBar.system'),
-                        operate: OperationEvent.Command.mBar.system,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.view'),
-                        operate: OperationEvent.Command.mBar.check,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.refresh'),
-                        operate: OperationEvent.Command.mBar.fresh,
-                        click: this.refresh,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.display'),
-                        operate: OperationEvent.Command.mBar.view,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setNameDisplay'),
-                                click: this.setNameDisplay,
-                                operate: OperationEvent.Command.view.setNameDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setDeviceDisplay'),
-                                click: this.setDeviceDisplay,
-                                operate: OperationEvent.Command.view.setDeviceDisplay
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.stationMapSwitch'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.controlModeSwitch'),
-                        operate: OperationEvent.Command.mBar.remoteControl,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.toStationControl'),
-                                click: this.turnToStationControl,
-                                operate: OperationEvent.StationControl.requestStationControl.mbar
-                            },
-                            {
-                                title: this.$t('menu.menuBar.forcedStationControl'),
-                                click: this.mandatoryStationControl,
-                                operate: OperationEvent.StationControl.forcedStationControl.password
-                            },
-                            {
-                                title: this.$t('menu.menuBar.toCentralControl'),
-                                click: this.conterStationControl,
-                                operate: OperationEvent.StationControl.requestCentralControl.mbar,
-                                force: true
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.requestOperationArea'),
-                        operate: OperationEvent.Command.mBar.requestZone,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.historyQuery'),
-                        operate: OperationEvent.Command.mBar.historyQuery,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.userManage'),
-                        operate: OperationEvent.Command.mBar.userManage,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.userManage'),
-                                click: this.userManage,
-                                operate: OperationEvent.Command.manage.userManage
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.help'),
-                        operate: OperationEvent.Command.mBar.help,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.about'),
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ],
-                Center: [
-                    {
-                        title: this.$t('menu.menuBar.system'),
-                        operate: OperationEvent.Command.mBar.system,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.view'),
-                        operate: OperationEvent.Command.mBar.check,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.refresh'),
-                        operate: OperationEvent.Command.mBar.fresh,
-                        click: this.refresh,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.display'),
-                        operate: OperationEvent.Command.mBar.view,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.setTrainIdDisplay'),
-                                click: this.setTrainIdDisplay,
-                                operate: OperationEvent.Command.view.setTrainIdDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setNameDisplay'),
-                                click: this.setNameDisplay,
-                                operate: OperationEvent.Command.view.setNameDisplay
-                            },
-                            {
-                                title: this.$t('menu.menuBar.setDeviceDisplay'),
-                                click: this.setDeviceDisplay,
-                                operate: OperationEvent.Command.view.setDeviceDisplay
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.stationMapSwitch'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.planCarOperation'),
-                        operate: OperationEvent.Command.mBar.planTrain,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.addPlanCar'),
-                                click: this.addPlanTrain,
-                                operate: OperationEvent.Command.planTrain.addPlanTrain
-                            },
-                            {
-                                title: this.$t('menu.menuBar.panPlanCar'),
-                                click: this.translatPlanTrain,
-                                operate: OperationEvent.Command.planTrain.translatPlanTrain
-                            },
-                            {
-                                title: this.$t('menu.menuBar.deletePlanCar'),
-                                click: this.delPlanTrain,
-                                operate: OperationEvent.Command.planTrain.delPlanTrain
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.trainNumberMaintenance'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.controlModeSwitch'),
-                        operate: OperationEvent.Command.mBar.remoteControl,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.toStationControl'),
-                                click: this.turnToStationControl,
-                                operate: OperationEvent.StationControl.requestStationControl.mbar,
-                                force: true
-                            },
-                            {
-                                title: this.$t('menu.menuBar.forcedStationControl'),
-                                click: this.mandatoryStationControl,
-                                operate: OperationEvent.StationControl.forcedStationControl.password,
-                                force: true
-                            },
-                            {
-                                title: this.$t('menu.menuBar.toCentralControl'),
-                                click: this.conterStationControl,
-                                operate: OperationEvent.StationControl.requestCentralControl.mbar
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.requestOperationArea'),
-                        operate: OperationEvent.Command.mBar.requestZone,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.schedulingLog'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.systemAnalysis'),
-                        operate: '',
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.userManage'),
-                        operate: OperationEvent.Command.mBar.userManage,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.userManage'),
-                                click: this.userManage,
-                                operate: OperationEvent.Command.manage.userManage
-                            }
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.historyQuery'),
-                        operate: OperationEvent.Command.mBar.historyQuery,
-                        click: this.undeveloped,
-                        children: [
-                        ]
-                    },
-                    {
-                        title: this.$t('menu.menuBar.help'),
-                        operate: OperationEvent.Command.mBar.help,
-                        children: [
-                            {
-                                title: this.$t('menu.menuBar.about'),
-                                click: this.about,
-                                operate: OperationEvent.Command.help.about
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    methods: {
-        // 转为站控
-        turnToStationControl(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControlConvert.doShow(operate);
-                }
-            });
-        },
-        // 强制转为站控
-        mandatoryStationControl(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.passwordBox.doShow(operate);
-                }
-            });
-        },
-        // 请求中控
-        conterStationControl(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.stationControlConvert.doShow(operate);
-                }
-            });
-        },
-        // 设置列车识别号显示
-        setTrainIdDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewTrainId.doShow(operate);
-                }
-            });
-        },
-        // 设置设备显示
-        setNameDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewName.doShow(operate);
-                }
-            });
-        },
-        // 设置名称显示
-        setDeviceDisplay(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.viewDevice.doShow(operate);
-                }
-            });
-        },
-        // 添加计划车
-        addPlanTrain(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    if (this.$route.query.lineCode == '10') {
-                        this.$refs.trainAdd.doShow(operate);
-                    } else {
-                        // this.$refs.addRunplanLine.doShow(operate);
-                        this.$refs.trainAdd.doShow(operate);
-                    }
-                }
-            });
-        },
-        // 平移计划车
-        translatPlanTrain(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainTranstalet.doShow(operate);
-                }
-            });
-        },
-        // 删除计划车
-        delPlanTrain(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.trainDelete.doShow(operate);
-                    // this.$refs.deleteRunplanLine.doShow(operate);
-                }
-            });
-        },
-        // 用户管理
-        userManage(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.manageUser.doShow(operate);
-                }
-            });
-        },
-        // 关于
-        about(order) {
-            const operate = {
-                operation: order.operation
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.$refs.helpAbout.doShow(operate);
-                }
-            });
-        },
-        // 刷新
-        refresh() {
-
-            EventBus.$emit('refresh');
-        },
-        getLoginResult(operate) {
-            /** 密码校验*/
-            if (operate.operation == OperationEvent.StationControl.forcedStationControl.passwordConfirm.operation) {
-                if (operate.success) {
-                    /** 校验成功*/
-                    this.$refs.stationControlConvert.doShow({ operation: OperationEvent.StationControl.forcedStationControl.mbar.operation });
-                }
-            }
-        },
-        blankClickClose() {
-            this.$refs.menuBar.doClose();
-        },
-        warningInfoDoShow(info) {
-            this.$refs.warningInfo.doShow(info);
-        },
-        undeveloped() {
-            this.$refs.menuBar.doClose();
-            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                callback: action => {
-                }
-            });
-        }
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-    .deviceStatus{
-        display: inline-block;
-        font-size: 0;
-        height: 40px;
-        background: #f0f0f0;
-        width: 300px;
-    }
-    .holdTrainStatus,.jumpStopStatus{
-        color: #fff;
-        display: inline-block;
-        width: 30px;
-        height: 30px;
-        text-align: center;
-        background: #ccc;
-        font-size:14px;
-    }
-
-    #menuBarXian01{
-        line-height:30px;
-    }
-    #menuBarXian01 #menuBar .menu-li-block .label{
-        padding: 0px 30px 0px 5px !important;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue
index 73da5e252..061d65a09 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/addRunplanLine.vue
@@ -334,7 +334,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue
index bd1cad30b..76c75f1fc 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -19,7 +19,7 @@
     </div>
     <el-row class="button-group">
       <el-col :span="10" :offset="3">
-        <el-button :id="show? domIdConfirm: ''" :loading="loading" @click="commit">确认</el-button>
+        <el-button :id="show? domIdConfirm: ''" :loading="loading" :disabled="loading" @click="commit">确认</el-button>
       </el-col>
       <el-col :span="6" :offset="4">
         <el-button :id="domIdCancel" @click="cancel">关闭</el-button>
@@ -94,7 +94,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
             this.$emit('setOperate', { selection: this.operate.selection, cancel: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -102,6 +102,7 @@ export default {
             });
         },
         commit() {
+            this.loading = true;
             const operate = {
                 over: true,
                 operation: ''
@@ -120,14 +121,20 @@ export default {
                 operate.operation = OperationEvent.StationControl.forcedStationControl.confirm.operation;
             }
             this.$emit('setOperate', { selection: this.operate.selection, commit: true });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.doClose();
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
+                setTimeout(() => {
+                    this.loading = false;
+                }, 200);
             }).catch((error) => {
                 console.error(error);
                 this.$refs.noticeInfo.doShow();
+                setTimeout(() => {
+                    this.loading = false;
+                }, 200);
             });
         }
     }
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 d8db8dd18..ed385e589 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 830cdbb23..a27365d02 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
@@ -100,7 +100,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 cfcf9623e..fc4e842d9 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 0c5b43b25..72c74c9fa 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
@@ -98,7 +98,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -114,7 +114,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 81cab565c..30ed743b8 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue
index 7e9905b7d..24b13e7a7 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/passwordBox.vue
@@ -123,7 +123,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -140,7 +140,7 @@ export default {
 
             if (this.model.password == '12') {
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
index 65a827a7d..833f8c6b6 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/stationControlConvert.vue
@@ -74,6 +74,14 @@ export default {
     components: {
         TwoConfirmation
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             operate: null,
@@ -153,12 +161,6 @@ export default {
         '$store.state.map.controlTransfer':function (controlTransferList) {
             controlTransferList.forEach(controlTransfer=>{
                 this.updateTableValue(controlTransfer);
-                if (controlTransfer.applicantId && this.$store.state.training.memberData[controlTransfer.applicantId] &&
-					this.$store.state.training.memberData[controlTransfer.applicantId].userId == this.$store.state.user.id &&
-					this.$store.state.training.prdType === '01'
-                ) {
-                    this.$emit('warningInfoDoShow', controlTransfer);
-                }
             });
         },
         // 深度数据状态
@@ -248,7 +250,7 @@ export default {
         },
         initTableDataStatus() {
             this.tableData = [];
-            if (this.$store.state.training.prdType === '02') {
+            if (this.work === 'dispatchWork') {
                 this.stationList && this.stationList.forEach(station => {
                     if (station.createControlMode) {
                         const control = this.$store.getters['map/getDeviceByCode'](station.code);
@@ -263,9 +265,10 @@ export default {
                         });
                     }
                 });
-            } else if (this.$store.state.training.prdType === '01') {
-                const stationCodeList = this.$store.state.map.stationControlMap[this.$store.state.training.roleDeviceCode];
-                stationCodeList && stationCodeList.forEach(stationCode => {
+            } else if (this.work === 'localWork') {
+                const stationCodeList = this.$store.state.map.stationControlMap[this.$store.state.training.roleDeviceCode] || [];
+                const list = [...new Set(stationCodeList)]; // 去重
+                list && list.forEach(stationCode => {
                     const station = this.$store.getters['map/getDeviceByCode'](stationCode);
                     this.tableData.push({
                         code: station.code,
@@ -298,7 +301,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -334,11 +337,11 @@ export default {
                 }
 
                 this.disabledSure = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
-                        this.disabledSure = false;
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
+                    this.disabledSure = false;
                 });
             } else if (!selection) {
                 this.$messageBox(this.$t('menu.menuDialog.selectData'));
@@ -361,7 +364,7 @@ export default {
             });
 
             this.disabledSure = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -389,7 +392,7 @@ export default {
             });
 
             this.disabledSure = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
@@ -417,7 +420,7 @@ export default {
             });
 
             this.disabledSure = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.twoConfirmation.doShow(operate);
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
index c90f675f4..ff02613ad 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 187d145f6..1e595e771 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
@@ -108,7 +108,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 59fbc5b60..c979d42db 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
@@ -125,7 +125,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -148,7 +148,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 fd3bf4a84..64159cb42 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
@@ -96,7 +96,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -111,7 +111,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 ed2ec059f..acb64858d 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -146,7 +146,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 1c3a700ba..d7b51f4fb 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
@@ -145,7 +145,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -160,7 +160,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.setTrainDispaly();
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue
deleted file mode 100644
index 0fb63db15..000000000
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/warningInfo.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-01__systerm station-control-convert"
-    title="0级报警详细信息"
-    :visible.sync="show"
-    width="900px"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div style="font-size: 14px;color: #000;">
-      <el-row>
-        <el-col :span="8" style="display: flex;">
-          <div>线路名称</div>
-          <div style="width: 180px;" class="border-style">{{ $store.state.map.mapName }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>单位名称</div>
-          <div style="width: 180px;" class="border-style">{{ stationName }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>模块名称</div>
-          <div style="width: 180px;" class="border-style">CMM控制模式转换模块</div>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <el-col :span="8" style="display: flex;">
-          <div>报警时间</div>
-          <div style="width: 180px;" class="border-style">{{ time }}</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>等&#12288&#12288级</div>
-          <div style="width: 180px;" class="border-style">0级告警</div>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <div>确认状态</div>
-          <div style="width: 180px;" class="border-style">未确认</div>
-        </el-col>
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <el-col :span="12" style="display: flex;">
-          <div>类&#12288&#12288型</div>
-          <div style="width: 325px;" class="border-style">系统事件</div>
-        </el-col>
-        <el-col :span="12" style="display: flex;">
-          <div>子&#8194类&#8194型</div>
-          <div style="width: 325px;" class="border-style">依据信号设备操作命令设置控制模式</div>
-        </el-col>
-      </el-row>
-      <el-row style="display: flex;margin-top: 10px;">
-        <div>事件摘要</div>
-        <div style="width: 760px;" class="border-style">控制模式转换</div>
-      </el-row>
-      <el-row style="display: flex;margin-top: 10px;">
-        <div>推荐操作</div>
-        <div style="width: 760px;" class="border-style" />
-      </el-row>
-      <el-row style="margin-top: 10px;">
-        <span>报警详细描述</span>
-        <div style="width: 825px;margin-left: 0;height: 80px;" class="border-style">{{ `控制模式转换:${stationName}由中控模式转为站控模式！` }}</div>
-      </el-row>
-      <div style="text-align: center;margin-top: 10px;">
-        <el-button @click="doClose">确认</el-button>
-        <span>未确认0级报警数目：1</span>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { parseTime } from '@/utils/index';
-export default {
-    name: 'WarningInfo',
-    data() {
-        return {
-            show: false,
-            stationName: '',
-            time: ''
-        };
-    },
-    methods: {
-        doClose() {
-            this.show = false;
-        },
-        doShow(info) {
-            const station = this.$store.getters['map/getDeviceByCode'](info.code);
-            this.stationName = station.name;
-            this.time = parseTime(this.$store.state.training.initTime);
-            this.show = true;
-        }
-    }
-};
-</script>
-
-<style scoped>
-	.border-style {
-		border-top: 2px solid #858585;
-		border-left: 2px solid #858585;
-		border-right: 2px solid #F2F2F2;
-		border-bottom: 2px solid #F2F2F2;
-		padding: 0 10px;
-		margin-left: 10px;
-	}
-</style>
diff --git a/src/jmapNew/theme/xian_01/menus/menuSection.vue b/src/jmapNew/theme/xian_01/menus/menuSection.vue
index 69e45946d..e07dd9921 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSection.vue
@@ -22,10 +22,10 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 // import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SectionMenu',
@@ -45,77 +45,100 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '区段封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
+            menuNormal: [
+                {
+                    label: '区段封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Section.CMD_SECTION_BLOCK,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return section.blockade === 1;
+                        } else {
+                            return section.blockade === 1;
+                        }
                     },
-                    {
-                        label: '区段解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                    isShow: (section, work) => ['01', '02'].includes(section.type)
+                },
+                {
+                    label: '区段解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return section.blockade !== 1;
+                        } else {
+                            return section.blockade !== 1;
+                        }
                     },
-                    {
-                        label: '故障解锁',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    isShow: (section, work) => ['01', '02'].includes(section.type)
+                },
+                {
+                    label: '故障解锁',
+                    handler: this.fault,
+                    cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
+                    isDisabled: (section, work) => {
+                        return false;
                     },
-                    {
-                        label: '设置限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type)
+                },
+                {
+                    label: '设置限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (section, work) => {
+                        return false;
                     },
-                    {
-                        label: '取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
-                    }
-                ],
-                Center: [
-                    {
-                        label: '故障解锁',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+                    isShow: (section, work) => section.type === '02'
+                },
+                {
+                    label: '取消限速',
+                    handler: this.cancelSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
+                    isDisabled: (section, work) => {
+                        return false;
                     },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+                    isShow: (section, work) => section.type === '02'
+                },
+                {
+                    label: '区段切除',
+                    handler: this.split,
+                    cmdType: CMD.Section.CMD_SECTION_CUT_OFF,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return section.cutOff === 1;
+                        }
                     },
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType: CMD.Section.CMD_SECTION_ACTIVE
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                },
+                {
+                    label: '区段激活',
+                    handler: this.active,
+                    cmdType: CMD.Section.CMD_SECTION_ACTIVE,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return section.cutOff !== 1;
+                        }
                     },
-                    {
-                        label: '区段封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    },
-                    {
-                        label: '区段解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    },
-                    {
-                        label: '设置限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
-                    }
-                ]
-            },
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -161,7 +184,7 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
                 cmdType: CMD.Section.CMD_Train_Init_Plan
@@ -172,7 +195,17 @@ export default {
         initMenu() {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
-                this.menu = MenuContextHandler.covert(this.menuNormal);
+                // this.menu = MenuContextHandler.covert(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                    if (menuItem.roleDisabled) {
+                        status = true;
+                    }
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
diff --git a/src/jmapNew/theme/xian_01/menus/menuSignal.vue b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
index 76059495b..63eab3df1 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSignal.vue
@@ -24,11 +24,12 @@ import RouteHandControl from '@/jmapNew/theme/components/menus/dialog/routeHandC
 import RouteDetail from '@/jmapNew/theme/components/menus/dialog/routeDetail';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import ConflictRoute from './dialog/conflictRoute';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SignalMenu',
@@ -50,157 +51,163 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '进路选排',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '进路取消',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '信号关灯',
-                        handler: this.signalClose,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '引导进路办理',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '设置联锁自动进路',
-                        handler: this.setAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '取消联锁自动进路',
-                        handler: this.cancelAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交ATS自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+            menuNormal: [
+                {
+                    label: '进路选排',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => {
+                        return false;
                     }
-                ],
-                Center: [
-                    {
-                        label: '进路选排',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '进路取消',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '信号关灯',
-                        handler: this.signalClose,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL
-                    },
-                    {
-                        label: '信号重开',
-                        handler: this.reopenSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL
-                    },
-                    {
-                        label: '设置联锁自动进路',
-                        handler: this.setAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '取消联锁自动进路',
-                        handler: this.cancelAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER
-                    },
-                    {
-                        label: '进路引导',
-                        handler: this.guide,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-                        label: '进路交人工控',
-                        handler: this.humanControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING
-                    },
-                    {
-                        label: '进路交ATS自动控',
-                        handler: this.atsAutoControl,
-                        cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING
-                    },
-                    {
-                        label: '查询进路状态',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+                },
+                {
+                    label: '进路取消',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => {
+                        return false;
                     }
-                ]
-            },
+                },
+                {
+                    label: '信号封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.blockade === 1;
+                        } else {
+                            return signal.blockade === 1;
+                        }
+                    }
+                },
+                {
+                    label: '信号解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.blockade !== 1;
+                        } else {
+                            return signal.blockade !== 1;
+                        }
+                    }
+                },
+                {
+                    label: '信号关灯',
+                    handler: this.signalClose,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '信号重开',
+                    handler: this.reopenSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: this.work === 'localWork' ? '引导进路办理' : '进路引导',
+                    handler: this.guide,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '设置联锁自动进路',
+                    handler: this.setAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.fleetMode !== 0;
+                        } else {
+                            return signal.fleetMode !== 0;
+                        }
+                    },
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '取消联锁自动进路',
+                    handler: this.cancelAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.fleetMode !== 1;
+                        } else {
+                            return signal.fleetMode !== 1;
+                        }
+                    },
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '设置联锁自动触发',
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.ciControl === 1 || !signal.canSetCi;
+                        } else {
+                            return signal.ciControl === 1 || !signal.canSetCi;
+                        }
+                    },
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '取消联锁自动触发',
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.ciControl !== 1;
+                        } else {
+                            return signal.ciControl !== 1;
+                        }
+                    },
+                    isShow: (signal, work) => work === 'localWork'
+                },
+                {
+                    label: '进路交人工控',
+                    handler: this.humanControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    },
+                    isShow: (signal, work, lineCode) => {
+                        return work === 'dispatchWork' || lineCode == '11';
+                    }
+                },
+                {
+                    label: '进路交ATS自动控',
+                    handler: this.atsAutoControl,
+                    cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    },
+                    isShow: (signal, work, lineCode) => {
+                        return work === 'dispatchWork' || lineCode == '11';
+                    }
+                },
+                {
+                    label: '查询进路状态',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+                    isShow: (signal, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -233,6 +240,9 @@ export default {
         ]),
         group() {
             return this.$route.query.group;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
         }
     },
     watch: {
@@ -261,7 +271,14 @@ export default {
     },
     methods: {
         initMenu() {
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work, this.lineCode) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             const ciAutoMenuItem = this.menu.find( item => item.cmdType === CMD.Signal.CMD_SIGNAL_SET_CI_AUTO);
             const ciAutoTriggerMenuItem = this.menu.find( item => item.cmdType === CMD.Signal.CMD_SIGNAL_SET_CI_AUTO_TRIGGER);
diff --git a/src/jmapNew/theme/xian_01/menus/menuStation.vue b/src/jmapNew/theme/xian_01/menus/menuStation.vue
index 0424afbf9..4da15dea5 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStation.vue
@@ -19,9 +19,10 @@ import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { DeviceMenu } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationMenu',
@@ -39,62 +40,112 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '上电解锁',
-                        handler: this.powerUnLock,
-                        cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK
+            menuNormal: [
+                {
+                    label: '上电解锁',
+                    handler: this.powerUnLock,
+                    cmdType: CMD.Station.CMD_STATION_POWER_ON_UNLOCK,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.controlMode !== 'Local';
+                        } else {
+                            return station.controlMode !== 'Center';
+                        }
                     },
-                    {
-                        label: '全站设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '全站设置联锁自动触发',
+                    handler: this.setAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.controlMode !== 'Local';
+                        } else {
+                            return station.controlMode !== 'Center';
+                        }
                     },
-                    {
-                        label: '全站取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '全站取消联锁自动触发',
+                    handler: this.cancelAutoTrigger,
+                    cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.controlMode !== 'Local';
+                        } else {
+                            return station.controlMode !== 'Center';
+                        }
                     },
-                    {
-                        label: '所有进路交ATS自动控',
-                        handler: this.atsAutoControlALL,
-                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
+                    isShow: (station, work) => work === 'localWork'
+                },
+                {
+                    label: '所有进路交ATS自动控',
+                    handler: this.atsAutoControlALL,
+                    cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.controlMode !== 'Local';
+                        } else {
+                            return station.controlMode !== 'Center';
+                        }
                     },
-                    {
-                        label: '所有进路交人工控',
-                        handler: this.humanControlALL,
-                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
-                    }
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST,
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '所有进路交人工控',
-                        handler: this.humanControlALL,
-                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '所有进路交人工控',
+                    handler: this.humanControlALL,
+                    cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.controlMode !== 'Local';
+                        } else {
+                            return station.controlMode !== 'Center';
+                        }
                     },
-                    {
-                        label: '所有进路交ATS自动控',
-                        handler: this.atsAutoControlALL,
-                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
-                    }
-                    // {
-                    //     label: '执行关键操作测试',
-                    //     handler: this.execKeyOperationTest,
-                    //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
-                    // }
-                ]
-            },
+                    isShow: (station, work) => work === 'dispatchWork'
+                }
+                // {
+                //     label: '执行关键操作测试',
+                //     handler: this.execKeyOperationTest,
+                //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST,
+                // }
+                // {
+                //     label: '所有进路交人工控',
+                //     handler: this.humanControlALL,
+                //     cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                //     isDisabled: (station, work) => {
+                //         return false;
+                //     },
+                //     isShow: (station, work) => work === 'dispatchWork'
+                // },
+                // {
+                //     label: '所有进路交ATS自动控',
+                //     handler: this.atsAutoControlALL,
+                //     cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                //     isDisabled: (station, work) => {
+                //         return false;
+                //     },
+                //     isShow: (station, work) => work === 'dispatchWork'
+                // }
+                // {
+                //     label: '执行关键操作测试',
+                //     handler: this.execKeyOperationTest,
+                //     cmdType: CMD.Station.CMD_STATION_KEY_OPERATION_TEST
+                // }
+            ],
             menuForce: [
                 // {
                 //     label: '设置ZC故障',
@@ -140,7 +191,14 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                const status = judgeStationControl(this.selected.code, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
index b3e280039..81d513375 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationStand.vue
@@ -27,8 +27,9 @@ import Psl from '@/jmapNew/theme/components/menus/dialog/psl';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationStandMenu',
@@ -50,92 +51,116 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置扣车',
-                        handler: this.setDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+            menuNormal: [
+                {
+                    label: '设置扣车',
+                    handler: this.setDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    isDisabled: (stand, work) => {
+                        const centralStation = this.$store.getters['map/getDeviceByCode'](stand.deviceStationCode);
+                        if (centralStation.controlMode === 'Center') {
+                            return stand.centerHoldTrain !== 0;
+                        } else {
+                            return stand.stationHoldTrain !== 0;
+                        }
                     },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
+                    roleDisabled: this.work === 'dispatchWork'
+                },
+                {
+                    label: '取消扣车',
+                    handler: this.cancelDetainTrain,
+                    cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
+                    isDisabled: (stand, work) => {
+                        const centralStation = this.$store.getters['map/getDeviceByCode'](stand.deviceStationCode);
+                        if (centralStation.controlMode === 'Center') {
+                            return stand.centerHoldTrain !== 1;
+                        } else {
+                            return stand.stationHoldTrain !== 1;
+                        }
                     },
-                    {
-                        label: '强制取消扣车',
-                        handler: this.cancelDetainTrainForce,
-                        cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
+                    roleDisabled: this.work === 'dispatchWork'
+                },
+                {
+                    label: '强制取消扣车',
+                    handler: this.cancelDetainTrainForce,
+                    cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN,
+                    isShow: (section, work) => work === 'localWork'
+                },
+                {
+                    label: '查询站台状态',
+                    handler: this.detail,
+                    cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
+                },
+                {
+                    label: '全线取消扣车',
+                    handler: this.cancelDetainTrainAll,
+                    cmdType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置跳停',
+                    handler: this.setJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    isDisabled: (stand, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return stand.allSkip !== 0;
+                        }
                     },
-                    {
-                        label: '查询站台状态',
-                        handler: this.detail,
-                        cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置扣车',
-                        handler: this.setDetainTrain,
-                        cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消跳停',
+                    handler: this.cancelJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (stand, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return stand.allSkip !== 1 && stand.assignSkip !== 1;
+                        }
                     },
-                    {
-                        label: '取消扣车',
-                        handler: this.cancelDetainTrain,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '全线取消扣车',
-                        handler: this.cancelDetainTrainAll,
-                        cmdType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '强制取消扣车',
-                        handler: this.cancelDetainTrainForce,
-                        cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
-                    },
-                    {
-                        label: '设置跳停',
-                        handler: this.setJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP
-                    },
-                    {
-                        label: '取消跳停',
-                        handler: this.cancelJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
-                    },
-                    {
-                        label: '设置停站时间',
-                        handler: this.setStopTime,
-                        cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    },
-                    {
-                        label: '设置运行等级',
-                        handler: this.setRunLevel,
-                        cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
-                    },
-                    {
-                        label: '设置提前发车',
-                        handler: this.earlyDeparture,
-                        cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
-                    },
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
-                    },
-                    {
-                        label: '查询站台状态',
-                        handler: this.detail,
-                        cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置停站时间',
+                    handler: this.setStopTime,
+                    cmdType:CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置运行等级',
+                    handler: this.setRunLevel,
+                    cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置提前发车',
+                    handler: this.earlyDeparture,
+                    cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置折返策略',
+                    handler: this.setBackStrategy,
+                    cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -174,7 +199,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce];
             }
@@ -183,15 +218,15 @@ export default {
                 this.menu = this.menuForce;
             }
             // 非故障模式 且 角色为车站值班员时 增加PSL盘
-            if (this.operatemode !== OperateMode.FAULT && this.$store.state.training.prdType === '01') {
-                this.menu = [
-                    ...this.menu,
-                    {
-                        label: 'PSL',
-                        handler: this.openPsl
-                    }
-                ];
-            }
+            // if (this.operatemode !== OperateMode.FAULT && this.work === 'localWork') {
+            //     this.menu = [
+            //         ...this.menu,
+            //         {
+            //             label: 'PSL',
+            //             handler: this.openPsl
+            //         }
+            //     ];
+            // }
         },
         doShow(point) {
             this.initMenu();
diff --git a/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
index 6828d3e71..d89fe982f 100644
--- a/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuStationTurnBack.vue
@@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
 
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
 export default {
@@ -27,27 +27,24 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ],
-                Center: [
-                    {
-                        label: '设置折返策略',
-                        handler: this.setBackStrategy,
-                        cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '设置折返策略',
+                    handler: this.setBackStrategy,
+                    cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
+                }
+            ],
             menuForce: [
             ]
         };
@@ -73,7 +70,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
 
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
diff --git a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
index 2f43b49c1..5cb403b64 100644
--- a/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSwitch.vue
@@ -21,8 +21,8 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SwitchMenu',
@@ -41,122 +41,132 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔封锁',
-                        handler: this.block,
-                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
-                    },
-                    {
-                        label: '道岔解封',
-                        handler: this.unblock,
-                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
-                    },
-                    {
-                        label: '道岔转动',
-                        handler: this.switchTurnout,
-                        cmdType:CMD.Switch.CMD_SWITCH_TURN
-                    },
-                    {
-                        label: '道岔故障解锁',
-                        handler: this.fault,
-                        cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
-                    },
-                    {
-                        label: '计轴预复位',
-                        handler: this.axlePreReset,
-                        cmdType:CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF
-                    },
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType:CMD.Switch.CMD_SWITCH_ACTIVE
-                    },
-                    {
-                        label: '道岔设置限速',
-                        handler: this.setSpeed,
-                        cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '道岔取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
+            menuNormal: [
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.singleLock === 1;
+                        } else {
+                            return switchDevice.singleLock === 1;
+                        }
                     }
-                ],
-                Center: [
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-                        label: '道岔封锁',
-                        handler: this.block,
-                        cmdType:CMD.Switch.CMD_SWITCH_BLOCK
-                    },
-                    {
-                        label: '道岔解封',
-                        handler: this.unblock,
-                        cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK
-                    },
-                    {
-                        label: '道岔转动',
-                        handler: this.switchTurnout,
-                        cmdType:CMD.Switch.CMD_SWITCH_TURN
-                    },
-                    {
-                        label: '道岔故障解锁',
-                        handler: this.fault,
-                        cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
-                    },
-                    {
-                        label: '区段切除',
-                        handler: this.split,
-                        cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF
-                    },
-                    {
-                        label: '区段激活',
-                        handler: this.active,
-                        cmdType:CMD.Switch.CMD_SWITCH_ACTIVE
-                    },
-                    {
-                        label: '道岔设置限速',
-                        handler: this.setSpeed,
-                        cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '道岔取消限速',
-                        handler: this.cancelSpeed,
-                        cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType:CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.singleLock !== 1;
+                        } else {
+                            return switchDevice.singleLock !== 1;
+                        }
                     }
-                ]
-            },
+                },
+                {
+                    label: '道岔封锁',
+                    handler: this.block,
+                    cmdType:CMD.Switch.CMD_SWITCH_BLOCK,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.blockade === 1;
+                        } else {
+                            return switchDevice.blockade === 1;
+                        }
+                    }
+                },
+                {
+                    label: '道岔解封',
+                    handler: this.unblock,
+                    cmdType:CMD.Switch.CMD_SWITCH_UNBLOCK,
+                    isDisabled: (switchDevice, work) => {
+                        if (work === 'localWork') {
+                            return switchDevice.blockade !== 1;
+                        } else {
+                            return switchDevice.blockade !== 1;
+                        }
+                    }
+                },
+                {
+                    label: '道岔转动',
+                    handler: this.switchTurnout,
+                    cmdType:CMD.Switch.CMD_SWITCH_TURN,
+                    isDisabled: (switchDevice, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '道岔故障解锁',
+                    handler: this.fault,
+                    cmdType:CMD.Switch.CMD_SWITCH_FAULT_UNLOCK,
+                    isDisabled: (switchDevice, work) => {
+                        return false;
+                    }
+                },
+                // {
+                //     label: '计轴预复位',
+                //     handler: this.axlePreReset,
+                //     cmdType:CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET
+                // },
+                {
+                    label: '区段切除',
+                    handler: this.split,
+                    cmdType:CMD.Switch.CMD_SWITCH_CUT_OFF,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return section.cutOff === 1;
+                        }
+                    },
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '区段激活',
+                    handler: this.active,
+                    cmdType:CMD.Switch.CMD_SWITCH_ACTIVE,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return false;
+                        } else {
+                            return section.cutOff !== 1;
+                        }
+                    },
+                    roleDisabled: this.work === 'dispatchWork',
+                    isShow: (switchDevice, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '道岔设置限速',
+                    handler: this.setSpeed,
+                    cmdType:CMD.Switch.CMD_SWITCH_SET_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => {
+                        return false;
+                    }
+                },
+                {
+                    label: '道岔取消限速',
+                    handler: this.cancelSpeed,
+                    cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED,
+                    isDisabled: (switchDevice, work) => {
+                        return false;
+                    }
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -201,7 +211,17 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                let status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                if (menuItem.roleDisabled) {
+                    status = true;
+                }
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce];
             }
diff --git a/src/views/newMap/displayCity/menuSystemTime.vue b/src/jmapNew/theme/xian_01/menus/menuSystemTime.vue
similarity index 60%
rename from src/views/newMap/displayCity/menuSystemTime.vue
rename to src/jmapNew/theme/xian_01/menus/menuSystemTime.vue
index ef4be0e88..4e4b69c41 100644
--- a/src/views/newMap/displayCity/menuSystemTime.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuSystemTime.vue
@@ -1,35 +1,36 @@
 <template>
-  <div v-if="isShowSystemTime" class="display-card" :style="{top: top+'px', right: newRight+'px'}">
-    <!--<template v-if="pause">-->
-    <!--<span class="display-pause">{{ $t('display.systemTime.timePause') }}</span>-->
-    <!--</template>-->
-    <!--<template v-else>-->
-    <system-time
-      class="display-time"
-      :time="time"
-    />
-    <div v-if="isShowDate" style="width: 80px;height: 58px;float: right;box-shadow: 0 0 5px #eee;">
-      <div class="display-date-box">{{ dateString }}</div>
-      <div class="display-date-box">{{ dayString }}</div>
+  <div class="display-card" :style="{top: top+'px', right: newRight+'px'}">
+    <div class="statusIcon">
+      <status-icon ref="statusIcon" />
     </div>
-    <!--</template>-->
+    <template v-if="pause">
+      <span class="display-pause">{{ $t('display.systemTime.timePause') }}</span>
+    </template>
+    <template v-else>
+      <system-time
+        class="display-time"
+        :time="time"
+      />
+      <div v-if="isShowDate" style="width: 80px;height: 58px;float: right;box-shadow: 0 0 5px #eee;">
+        <div class="display-date-box">{{ dateString }}</div>
+        <div class="display-date-box">{{ dayString }}</div>
+      </div>
+    </template>
   </div>
 </template>
 <script>
 import SystemTime from '@/views/components/systemTime/index';
 import { timestampFormat } from '@/utils/date';
+import StatusIcon from '@/views/components/StatusIcon/statusIcon';
 
 // 顶部时间栏显示
 export default {
     name: 'MenuSystemTime',
     components: {
-        SystemTime
+        SystemTime,
+        StatusIcon
     },
     props: {
-        offset: {
-            type: Number,
-            required: true
-        }
     },
     data() {
         return {
@@ -39,25 +40,17 @@ export default {
         };
     },
     computed: {
-        isShowSystemTime() {
-            return this.$route.params.mode == 'demon' ||
-					this.$route.params.mode == 'dp' ||
-					this.$route.params.mode == 'plan' ||
-                    this.$route.params.mode == 'script' ||
-                    this.$route.params.mode == 'practice' ||
-					!this.$route.params.mode;
-        },
         pause() {
             return this.$store.state.scriptRecord.simulationPause;
         },
         isDisplay() {
-            return this.$route.path.includes('displayCity') || this.$route.path.includes('scriptdisplayCity');
+            return this.$route.path.includes('display') || this.$route.path.includes('scriptDisplayNew');
         },
         isShowDate() { // 西安一 三号线
             return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.isDisplay;
         },
         top() {
-            return this.isShowDate ? (this.$route.query.prdType == '05' ? 5 : this.offset - 10) : this.offset;
+            return 35;
         },
         newRight() {
             return this.isShowDate ? this.$store.state.config.width - 420 : this.$store.state.config.width / 2 - 55;
@@ -68,7 +61,7 @@ export default {
             this.initDate(timestamp);
         },
         '$store.state.socket.simulationTimeSync': function (timestamp) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', timestamp);
+            this.initDate(timestamp);
         }
     },
     mounted() {
@@ -76,12 +69,19 @@ export default {
         if (initTime > 0) {
             this.initDate(initTime);
         }
+        this.setTextStatusStyle();
     },
     methods: {
+        setTextStatusStyle() {
+            const textStatus = document.getElementById('textStatus');
+            if (textStatus) {
+                textStatus.style.top = '0px';
+            }
+        },
         initDate(timestamp) {
-            this.time = timestampFormat('HH:mmss', timestamp)
-            this.dateString = timestampFormat('YYYY/MM/DD', timestamp)
-            this.dayString = timestampFormat('dddd', timestamp).split('').join(' ')
+            this.time = timestampFormat('HH:mmss', timestamp);
+            this.dateString = timestampFormat('YYYY/MM/DD', timestamp);
+            this.dayString = timestampFormat('dddd', timestamp).split('').join(' ');
         }
     }
 };
@@ -93,15 +93,27 @@ export default {
         z-index: 9;
         display: inline;
         position: absolute;
+		width: 420px;
     }
-
+	.statusIcon {
+		width: 120px;
+		height: 58px;
+		position: absolute;
+		top: -2px;
+		left: 0px;
+	}
 	.display-pause {
 		font-size: 21px;
 		font-weight: bold;
 		color: yellow;
+		position: absolute;
+		right: 0px;
+		top: 0px;
 	}
 
 	.display-time{
+		margin-left: 120px;
+		height: 60px;
 		padding: 3px 5px;
 		border: 1px solid rgba(255,255,255,.2);
 		box-shadow: 0 2px 12px 0 rgba(255,255,255,.3);
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index a9e454299..8db4b35e4 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -31,7 +31,7 @@ import TrainSwitch from './dialog/trainSwitch';
 import TrainEditNumber from './dialog/trainEditNumber';
 import TrainDetail from './dialog/trainDetail';
 import SetTrainOperation from '@/jmapNew/theme/components/menus/dialog/setTrainOperation';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import SpeedLimit from '@/jmapNew/theme/components/menus/dialog/trainSpeedLimit';
 import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
@@ -57,61 +57,73 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [],
-                Center: [
-                    {
-                        label: '添加列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '删除列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '修改列车识别号',
-                        handler: this.editTrainId,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '修改车组号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '移动列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '交换列车识别号',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '标记ATP切除',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT
-                    },
-                    {
-                        label: '标记ATP激活',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER
-                    },
-                    {
-                        label: '查看列车详细运行信息',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_INFO
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '添加列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '删除列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '修改列车识别号',
+                    handler: this.editTrainId,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '修改车组号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '移动列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '交换列车识别号',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '标记ATP切除',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_CUT,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '标记ATP激活',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_TAG_ATP_RECOVER,
+                    isShow: (train, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '查看列车详细运行信息',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_INFO,
+                    isShow: (train, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -232,7 +244,13 @@ export default {
     methods: {
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             if (this.operatemode === OperateMode.ADMIN) {
                 this.menu = [...this.menu, ...this.menuForce];
             } else {
@@ -291,7 +309,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -317,7 +335,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainControl.doShow(step, this.selected);
@@ -333,7 +351,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainDelete.doShow(step, this.selected);
@@ -349,7 +367,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -365,7 +383,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -381,7 +399,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainMove.doShow(step, this.selected);
@@ -521,7 +539,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainSwitch.doShow(step, this.selected);
@@ -537,7 +555,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+        //     this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainDetail.doShow(step, this.selected);
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
index 6bdd57654..2106869af 100644
--- a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
@@ -31,7 +31,7 @@
       <el-row>
         <el-col :span="9">
           <el-form-item :label="$t('menu.passiveDialog.alarmDate')">
-            <el-date-picker v-model="model.alarmDate" type="datetime" :placeholder="$t('menu.passiveDialog.selectDate')" disabled />
+            <el-input v-model="model.alarmDate" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -84,7 +84,8 @@
 <script>
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-
+import { UserOperationType } from '@/scripts/ConstDic';
+import { parseTime } from '@/utils/index';
 export default {
     name: 'AlarmDetail',
     data() {
@@ -120,24 +121,20 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+            return this.dialogShow ? OperationEvent.StationControl.requestStationControl.awaitAlarm.domId : '';
         }
     },
     watch: {
         '$store.state.socket.msgHead': function (elem) {
-            if (elem && elem.type == 'resp' && elem.agree) {
-                if (elem.agree) {
-                    const operate = this.$store.state.training.operate;
-                    const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                    const newOperate = {
-                        type: operate.type,
-                        name: station.name,
-                        currentMode: elem.currentMode
-                    };
-
-                    this.doShow(newOperate);
-                }
+            if (elem && elem.success) {
+                const operate = this.$store.state.training.operate;
+                const station = this.$store.getters['map/getDeviceByCode'](elem.stationCodes[0]);
+                const newOperate = {
+                    type: operate.type,
+                    name: station.name,
+                    currentMode: elem.currentMode
+                };
+                this.doShow(newOperate);
             }
         }
     },
@@ -150,7 +147,7 @@ export default {
                 moduleName: this.$t('menu.passiveDialog.cmmControlModeConversionMode'),
                 level: this.$t('menu.passiveDialog.zeroLevelAlarm'),
                 confirm: this.$t('menu.passiveDialog.confirmStatus'),
-                alarmDate: new Date(),
+                alarmDate: parseTime(this.$store.state.training.initTime),
                 type: this.$t('menu.passiveDialog.systemEvent'),
                 childType: this.$t('menu.passiveDialog.childTypeTips'),
                 timeSummary: this.$t('menu.passiveDialog.controlModeSummary'),
@@ -169,23 +166,13 @@ export default {
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
         },
-        cancel() {
-            const operate = {
-                operation: OperationEvent.Command.close.alarm.operation
-            };
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                if (valid) {
-                    this.doClose();
-                }
-            });
-        },
         commit() {
             const operate = {
-                operation: OperationEvent.Command.close.alarm.operation
+                cancel: true,
+                userOperationType: UserOperationType.LEFTCLICK,
+                operation:OperationEvent.StationControl.requestStationControl.awaitAlarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
index 877f3a754..92727c988 100644
--- a/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/timeout.vue
@@ -77,7 +77,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -88,7 +88,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 ff88f2198..81c908516 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue
@@ -169,7 +169,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = true;
@@ -184,7 +184,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = false;
@@ -205,7 +205,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -225,7 +225,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm2.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -243,7 +243,7 @@ export default {
                 type: MapDeviceType.LimitControl.type,
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (!this.isOpenMessage) {
                     this.doClose();
@@ -264,7 +264,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.close.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/changeTID.vue b/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue
index 5e32f5fe7..803c85bef 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/changeTID.vue
@@ -141,7 +141,7 @@ export default {
                     serviceNumber: this.newTid
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     // this.$store.dispatch('menuOperation/pushRequestList', {
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 ef1334cee..fbfecb4e3 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue
@@ -115,7 +115,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 2b47bb2e6..e192211a9 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -83,7 +83,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -102,7 +102,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 405e67bc9..4a5f9914d 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue
@@ -64,6 +64,7 @@ import { mapGetters } from 'vuex';
 import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
 export default {
     name: 'RouteDetail',
@@ -127,11 +128,12 @@ export default {
         commit() {
             const operate = {
                 over: true,
-                operation: OperationEvent.Signal.detail.menu.operation
+                operation: OperationEvent.Signal.detail.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -148,7 +150,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/xian_02/menus/dialog/sectionAlxeReset.vue
index 1f798a315..33d5611f0 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/sectionAlxeReset.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/sectionAlxeReset.vue
@@ -105,7 +105,7 @@ export default {
                 val: this.sectionCode
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             });
         },
@@ -123,7 +123,7 @@ export default {
         },
         sendCommand(operate) {
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -140,7 +140,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue b/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue
index 5b2a6b341..aa4c5cb1e 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/sectionUnLock.vue
@@ -113,7 +113,7 @@ export default {
 				name = '区段故障解锁';
 			}
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -136,7 +136,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue
index 97d9fda8d..6ac6ac675 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue
@@ -261,7 +261,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -288,7 +288,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -318,7 +318,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -349,7 +349,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -367,7 +367,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue
index 57e68acf1..702449b0e 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue
@@ -206,7 +206,7 @@ export default {
                     operation: OperationEvent.Signal.arrangementRoute.choose.operation
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -238,7 +238,7 @@ export default {
                 }
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -256,7 +256,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue b/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue
index 93e6679eb..0b0f4c8e5 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/stopProfile.vue
@@ -172,7 +172,7 @@ export default {
                 //         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
                 //     };
                 //     this.loading = true;
-                //     this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                //     this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 //         this.loading = false;
                 //         if (valid) {
                 //             this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainAlertor.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainAlertor.vue
index c0c1adcf9..df07203cb 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainAlertor.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainAlertor.vue
@@ -124,7 +124,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -140,7 +140,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue
index efbefa948..56b15f785 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDelDestination.vue
@@ -97,7 +97,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -113,7 +113,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 2ea806b71..679b56129 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
@@ -188,7 +188,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -204,7 +204,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainRunLevel.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainRunLevel.vue
index 600c8f69a..faa070684 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainRunLevel.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainRunLevel.vue
@@ -122,7 +122,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -137,7 +137,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainUpdatePlan.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainUpdatePlan.vue
index febb25cdb..a0f8cf197 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainUpdatePlan.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainUpdatePlan.vue
@@ -140,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
index 866711211..7170cf0d0 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
@@ -155,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/updateStandPlan.vue b/src/jmapNew/theme/xian_02/menus/dialog/updateStandPlan.vue
index d3fcbced1..b67d62173 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/updateStandPlan.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/updateStandPlan.vue
@@ -185,7 +185,7 @@ export default {
                 //         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
                 //     };
                 //     this.loading = true;
-                //     this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                //     this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 //         this.loading = false;
                 //         if (valid) {
                 //             this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue b/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
index 1766a2503..f72ae9d9c 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/warningConfirm.vue
@@ -174,7 +174,7 @@ export default {
                 //         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
                 //     };
                 //     this.loading = true;
-                //     this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+                //     this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 //         this.loading = false;
                 //         if (valid) {
                 //             this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/xian_02/menus/dispatchWorkMenu.vue
new file mode 100644
index 000000000..0b29ea11f
--- /dev/null
+++ b/src/jmapNew/theme/xian_02/menus/dispatchWorkMenu.vue
@@ -0,0 +1,550 @@
+<template>
+  <div class="xian-02__menus" :style="{width: width + 'px'}">
+    <!-- <menu-axle-reset ref="menuAxleReset" :selected="selected" /> -->
+    <menu-cancel ref="menuCancel" />
+    <!-- <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" /> -->
+    <!-- <menu-station-control ref="menuStationControl" :selected="selected" /> -->
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'dispatchWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'dispatchWork'" />
+    <!-- <menu-limit ref="menuLimit" :selected="selected" /> -->
+    <passive-contorl ref="passiveControl" :work="'dispatchWork'" />
+    <menu-request ref="menuRequest" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" @popMenuStationStand="popMenuStationStand" @totalMenuEvent="totalMenuEvent" />
+    <pop-station-stand ref="popStationStand" :selected="selected" :work="'dispatchWork'" @closeMenuStationStand="closeMenuStationStand" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import MenuSignal from './menuSignal';
+// import MenuAxleReset from './menuAxleReset';
+// import MenuAutoTrunRoute from './menuAutoTrunRoute';
+// import MenuStationControl from './menuStationControl';
+import MenuSwitch from './menuSwitch';
+import MenuSection from './menuSection';
+import MenuTrain from './menuTrain';
+import MenuStation from './menuStation';
+// import MenuLimit from './menuLimit';
+import MenuCancel from './menuCancel';
+import PassiveContorl from './passiveDialog/control';
+import MenuStationStand from './menuStationStand';
+import PopStationStand from './popStationStand';
+import MenuRequest from './menuRequest';
+
+export default {
+    name: 'Menus',
+    components: {
+        // MenuAxleReset,
+        // MenuAutoTrunRoute,
+        MenuSignal,
+        MenuSwitch,
+        MenuSection,
+        // MenuStationControl,
+        MenuStation,
+        MenuTrain,
+        // MenuLimit,
+        MenuStationStand,
+        MenuCancel,
+        PassiveContorl,
+        PopStationStand,
+        MenuRequest
+    },
+    props: {
+        selected: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    computed: {
+        ...mapGetters('config', [
+            'width'
+        ])
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('config/updateMenuBar');
+        });
+    },
+    methods: {
+        popMenuStationStand(param) {
+            this.$refs.popStationStand.doShow(param.position, param.type);
+        },
+        closeMenuStationStand() {
+            this.$refs.menuStationStand.doClose();
+        },
+        totalMenuEvent(param) {
+            this.$refs.menuCancel.doShow(param);
+        }
+    }
+};
+</script>
+
+<style>
+	.xian-02__menus .pop-menu {
+		background: #78e2ad;
+		padding: 0;
+	}
+	.xian-02__menus .pop-menu .el-popover{
+		background: #78e2ad;
+	}
+	.xian-02__menus .pop-menu span {
+		color: #000;
+	}
+
+	.xian-02__menus .pop-menu .is-disabled span {
+		color: #B4B3B8;
+	}
+
+	.xian-02__system {
+		overflow: hidden !important;
+	}
+
+	.xian-02__pop_tip_station{
+		padding: 0 !important;
+		margin-left: 1px !important;
+		background: #78e2ad !important;
+		border: 1px solid transparent;
+		border-radius: 0;
+
+	}
+	.xian-02__pop_tip_station:hover{
+		border: 1px solid #6B736A;
+	}
+
+	.xian-02__system .el-dialog {
+		background: #9da5ff;
+		box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+		border: 1px solid #9da5ff;
+		border-radius: 6px;
+		font-size: 13px !important;
+		color: #000;
+	}
+
+	.xian-02__system .el-dialog span {
+		font-size: 13px !important;
+		line-height: 22px;
+	}
+
+	.xian-02__system .el-dialog .el-dialog__footer {
+		background: #5F9EA0;
+		opacity: 1;
+	}
+
+	.xian-02__system .el-dialog .el-dialog__body {
+		padding: 20px;
+		margin: 0px 3px 3px;
+		border: 2px solid rgba(120, 121, 123, 0.5);
+		box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+		background: #5F9EA0;
+		opacity: 1;
+	}
+
+	.xian-02__system .station-stand .el-dialog__body {
+		background: #000;
+		color: #E8E8E8;
+	}
+	.xian-02__menus .stand-stop-time .el-dialog__body {
+		padding: 20px;
+		margin: 0px 3px 3px;
+		border: 2px solid rgba(120, 121, 123, 0.5);
+		box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+		background: #5F9EA0;
+		opacity: 1;
+	}
+	.xian-02__system .el-dialog .el-dialog__title {
+		font-size: 18px;
+		color: #fff;
+	}
+	.xian-02__system .el-dialog .el-dialog__header {
+		padding: 2px 1px;
+	}
+	.xian-02__system .el-dialog .el-dialog__headerbtn {
+		background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+		border: 1px solid #fff;
+		border-radius: 4px;
+		top: 2px;
+		right: 3px;
+		line-height: 16px;
+	}
+
+	.xian-02__system .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+		font-size: 16px;
+	}
+
+	.xian-02__system .el-dialog .el-dialog__headerbtn .el-dialog__close {
+		color: #fff;
+	}
+
+	.xian-02__system .el-dialog .el-button {
+		height: 24px;
+		line-height: 22px;
+		padding: 0px;
+		width: 80px;
+		border: 2px outset #B7D4D5;
+		border-radius: 0 !important;
+		color: #000;
+		background: #5F9EA0;
+	}
+
+	.xian-02__system .el-dialog .expand {
+		width: 120px;
+	}
+
+	.xian-02__system .el-dialog .el-button:focus span {
+		border: 1px dashed #315253;
+	}
+
+	.xian-02__system .el-dialog .el-button:active {
+		border: 2px inset #B7D4D5;
+	}
+
+	.xian-02__system .el-dialog .el-button:disabled {
+		border: 2px inset #B7D4D5;
+	}
+
+	.xian-02__system .el-dialog .el-button:disabled span {
+		border: 0px;
+	}
+	.xian-02__system .el-select-dropdown__item {
+		background: #5F9EA0;
+	}
+	.xian-02__system .el-select-dropdown__list {
+		background: #5F9EA0;
+	}
+	.xian-02__select-option .el-select-dropdown__item{
+		background: #5F9EA0;
+	}
+	.xian-02__select-option .el-scrollbar__wrap {
+		background-color: #5F9EA0;
+		overflow: hidden;
+		overflow-y: scroll;
+	}
+	.xian-02__select-option{
+		border-style: solid;
+		border-width: 1px;
+		border-color: #335658 #99C1C3 #99C1C3 #335658;
+		border-radius: 0;
+		background:#5F9EA0;
+	}
+	.xian-02__select-option .el-scrollbar{
+		border-style: solid;
+		border-width: 1px;
+		border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+		border-radius: 0;
+	}
+	.xian-02__select-option .el-select-dropdown__item.selected{
+		color: #fff;
+	}
+	.xian-02__select-option .el-select-dropdown__item{
+		color: #000;
+	}
+	.xian-02__system .el-dialog .el-transfer-panel{
+		border-style: solid;
+		border-width: 1px;
+		border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+		border-radius: 0;
+		background: #5F9EA0;
+	}
+	.xian-02__system .el-dialog .el-transfer .el-button{
+		width: 40px;
+	}
+	.xian-02__system .el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label span {
+		color: #000;
+	}
+	.xian-02__system .el-dialog .el-transfer-panel .el-transfer-panel__header {
+		background: #5F9EA0;
+		border-bottom: 1px solid #467576;
+	}
+	.xian-02__system .el-dialog .el-transfer-panel .el-transfer-panel__empty {
+		color: #5F9EA0;
+	}
+	.xian-02__system .el-dialog .el-input {
+		border-style:solid;
+		border-width: 1px;
+		border-color: #335658 #99C1C3 #99C1C3 #335658;
+		height: 22px !important;
+		line-height: 22px !important;
+		background: #5F9EA0;
+	}
+
+	.xian-02__system .el-dialog .el-input__inner {
+		color: #000;
+		background: #5F9EA0 !important;
+		border-style:solid;
+		border-width: 1px;
+		border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+		border-radius: 0px !important;
+		box-sizing: border-box;
+		height: 22px !important;
+		line-height: 22px !important;
+	}
+
+	/*.xian-02__system .el-dialog .el-input.is-disabled .el-input__inner {*/
+		/*background: #F0F0F0 !important;*/
+	/*}*/
+
+	.xian-02__system .el-dialog .el-textarea {
+		border-style:solid;
+		border-width: 1px;
+		border-color: #335658 #99C1C3 #99C1C3 #335658;
+		border-radius: 0;
+	}
+
+	.xian-02__system .el-dialog .el-textarea .el-textarea__inner {
+		color: #000;
+		background: #5F9EA0 !important;
+		border-style:solid;
+		border-width: 1px;
+		border-color: #467576 #A0C6C7 #A0C6C7 #467576;
+		border-radius: 0px !important;
+		box-sizing: border-box;
+	}
+
+	.xian-02__system .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+		background: #F0F0F0 !important;
+	}
+
+	.xian-02__system .el-dialog .el-table--border th.gutter {
+		background: #EBEADB !important;
+	}
+
+	.xian-02__system .el-dialog .el-table {
+		border: 2px inset #E9E9E9;
+		color: #000 !important;
+	}
+
+	.xian-02__system .el-dialog .el-table .cell {
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.xian-02__system .el-dialog .el-table th.is-leaf {
+		background: #F0F0F0 !important;
+		border-right: 1px solid #BDBDBD !important;
+		border-bottom: 1px solid #BDBDBD !important;
+		color: #000 !important;
+		height: 20px !important;
+		padding: 0px;
+	}
+
+	.xian-02__system .el-dialog .el-table tr td {
+		height: 20px !important;
+		padding: 0px;
+	}
+
+	.xian-02__system .el-dialog .el-table .el-table__empty-text {
+		top: 15px !important;
+	}
+
+	.xian-02__system .el-dialog .current-row>td {
+		background: #3399FF !important;
+		color: #fff !important;
+	}
+
+	.xian-02__system .el-dialog .el-checkbox__inner {
+		border: 1px inset #dcdfe6 !important;
+	}
+
+	.xian-02__system .el-dialog .el-checkbox__label {
+		color: #000 !important;
+	}
+
+	.xian-02__system .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+		background: #E6E6E6 !important;
+	}
+
+	.xian-02__system .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+		color: #C5C9CC !important;
+	}
+
+	.xian-02__system .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+		background: #fff !important;
+		border: 1px inset #dcdfe6 !important;
+	}
+
+	.xian-02__system .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+		position: absolute;
+		-webkit-box-sizing: content-box;
+		box-sizing: content-box;
+		content: "";
+		border: 1px solid #000;
+		border-left: 0;
+		border-top: 0;
+		height: 7px;
+		left: 4px;
+		top: 1px;
+	}
+
+	.xian-02__system .el-dialog .el-radio__inner {
+		border: 1px inset #dcdfe6 !important;
+	}
+
+	.xian-02__system .el-dialog .el-radio__label {
+		color: #000 !important;
+	}
+
+	.xian-02__system .el-dialog .el-radio__input.is-checked .el-radio__inner {
+		background: #fff !important;
+		border: 1px inset #dcdfe6 !important;
+	}
+
+	.xian-02__system .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+		width: 4px;
+		height: 4px;
+		border-radius: 100%;
+		background-color: #000 !important;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+	}
+
+	.xian-02__system .el-dialog .el-radio.is-disabled .el-radio__inner {
+		background: #E6E6E6 !important;
+	}
+
+	.xian-02__system .el-dialog .el-radio.is-disabled .el-radio__label {
+		color: #C5C9CC !important;
+	}
+
+	.xian-02__system .el-dialog .base-label {
+		background: #5F9EA0;
+		position: relative;
+		left: -15px;
+		top: -18px;
+	}
+
+	.xian-02__system .el-dialog .el-form-item label {
+		font-weight: normal !important;
+		color: #000 !important;
+	}
+
+	.xian-02__system .el-dialog .context {
+		height: 100px;
+		border: 2px inset #E2E2E2;
+		overflow-y: scroll;
+	}
+
+	.xian-02__system .el-dialog .table {
+		margin-top: 10px;
+	}
+
+	.xian-02__system .el-dialog .notice {
+		margin-left: 62px;
+		line-height: 30px;
+	}
+
+	.xian-02__system .el-dialog .button-group {
+		margin-top: 20px;
+	}
+
+	.xian-02__system.request_box .content-box .el-table__body-wrapper .el-table__row{
+		background: #000;
+		height: 30px;
+		color: #518E86;
+	}
+	.xian-02__system.request_box .content-box .el-table__body-wrapper .el-table__row.hover-row td{
+		background: #d5ecf7;
+	}
+	.xian-02__system.request_box .content-box .el-table__body-wrapper .el-table__row.current-row td{
+		background: #d5ecf7;
+	}
+	.xian-02__system .el-select .el-input__suffix {
+		display: flex;
+		justify-self: center;
+		align-items: center;
+	}
+	.xian-02__system .el-select .is-focus .el-input__suffix {
+		display: flex;
+		justify-self: center;
+		align-items: center;
+	}
+	.xian-02__system .el-scrollbar__thumb {
+		border-style:solid;
+		border-width: 1px;
+		border-color: #335658 #99C1C3 #99C1C3 #335658;
+		background: #518E86;
+	}
+	.xian-02__system.train-updatePlan .el-dialog__body,
+	.xian-02__system.train-alertor .el-dialog__body,
+	.xian-02__system.train-runLevel .el-dialog__body {
+		color: #000!important;
+	}
+	.xian-02__system.train-runLevel .train-run-level-radio_box .el-radio__inner{
+		border-radius: 0;
+		transform: rotate(45deg);
+		width: 12px;
+		border: none!important;
+		height: 12px;
+		background: #508F86;
+		border-color: #9ABFB2  #284743 #284743 #9ABFB2 !important;
+		border-width: 2px!important;
+		border-style: solid!important;
+	}
+	.xian-02__system.train-runLevel .train-run-level-radio_box .is-checked .el-radio__inner{
+		background: #DEF003!important;
+		border-color:  #284743 #9ABFB2  #9ABFB2 #284743 !important;
+		border-width: 2px!important;
+		border-style: solid!important;
+	}
+	.xian-02__system.train-runLevel .train-run-level-radio_box .is-checked .el-radio__inner::after{
+		width: 0px!important;
+		height: 0px!important;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel {
+		width: 45%;
+		float: left;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer{
+		overflow: hidden;
+		height: 190px;
+		padding: 10px;
+		padding-top: 0;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer__buttons {
+		width: 10%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		float: left;
+		padding: 0;
+		height: 100%;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer__buttons .el-button {
+		margin: 0;
+		margin-bottom: 10px;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel .el-transfer-panel__header {
+		height: 0;
+		overflow: hidden;
+		border: 0;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel__item .el-checkbox__input {
+		display: none;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel .el-transfer-panel__list,
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel .el-transfer-panel__body{
+		height: 165px;
+		overflow: auto;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel__item.is-checked {
+		background: gray;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel__list {
+		overflow: auto;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel__item{
+		width: 100%;
+		margin: 0;
+		padding-left: 3px;
+		height: 22px;
+	}
+	.xian-02__system.train-updatePlan .el-dialog .el-transfer-panel__item .el-checkbox__label {
+		padding: 0;
+	}
+</style>
diff --git a/src/jmapNew/theme/xian_02/menus/index.vue b/src/jmapNew/theme/xian_02/menus/localWorkMenu.vue
similarity index 95%
rename from src/jmapNew/theme/xian_02/menus/index.vue
rename to src/jmapNew/theme/xian_02/menus/localWorkMenu.vue
index c8e375af3..6702eb404 100644
--- a/src/jmapNew/theme/xian_02/menus/index.vue
+++ b/src/jmapNew/theme/xian_02/menus/localWorkMenu.vue
@@ -4,16 +4,16 @@
     <menu-cancel ref="menuCancel" />
     <!-- <menu-auto-trun-route ref="menuAutoTrunRoute" :selected="selected" /> -->
     <!-- <menu-station-control ref="menuStationControl" :selected="selected" /> -->
-    <menu-switch ref="menuSwitch" :selected="selected" />
-    <menu-signal ref="menuSignal" :selected="selected" />
-    <menu-section ref="menuSection" :selected="selected" />
-    <menu-train ref="menuTrain" :selected="selected" />
-    <menu-station ref="menuStation" :selected="selected" />
+    <menu-switch ref="menuSwitch" :selected="selected" :work="'localWork'" />
+    <menu-signal ref="menuSignal" :selected="selected" :work="'localWork'" />
+    <menu-section ref="menuSection" :selected="selected" :work="'localWork'" />
+    <menu-train ref="menuTrain" :selected="selected" :work="'localWork'" />
+    <menu-station ref="menuStation" :selected="selected" :work="'localWork'" />
     <!-- <menu-limit ref="menuLimit" :selected="selected" /> -->
-    <passive-contorl ref="passiveControl" />
+    <passive-contorl ref="passiveControl" :work="'localWork'" />
     <menu-request ref="menuRequest" />
-    <menu-station-stand ref="menuStationStand" :selected="selected" @popMenuStationStand="popMenuStationStand" @totalMenuEvent="totalMenuEvent" />
-    <pop-station-stand ref="popStationStand" :selected="selected" @closeMenuStationStand="closeMenuStationStand" />
+    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'localWork'" @popMenuStationStand="popMenuStationStand" @totalMenuEvent="totalMenuEvent" />
+    <pop-station-stand ref="popStationStand" :selected="selected" :work="'localWork'" @closeMenuStationStand="closeMenuStationStand" />
   </div>
 </template>
 
diff --git a/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue b/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
index 69da5143c..e200ee1ec 100644
--- a/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuAutoTrunRoute.vue
@@ -12,7 +12,7 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
@@ -86,7 +86,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue b/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
index 38d3d7214..26e269064 100644
--- a/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuAxleReset.vue
@@ -13,7 +13,6 @@ import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'MenuLimit',
@@ -72,7 +71,7 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
@@ -96,7 +95,7 @@ export default {
                 start: true,
                 operation: OperationEvent.AxleReset.SetAxleReset.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.sectionAlxeReset.doShow(operate);
diff --git a/src/jmapNew/theme/xian_02/menus/menuCancel.vue b/src/jmapNew/theme/xian_02/menus/menuCancel.vue
index 8dd4e8f77..39f1a3d57 100644
--- a/src/jmapNew/theme/xian_02/menus/menuCancel.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuCancel.vue
@@ -240,7 +240,7 @@ export default {
                 this.$store.dispatch('training/updateMapState', [deviceStatus]);
             }
             this.$store.dispatch('menuOperation/spliceRequestList', {deviceCode:eachCmd.device.code, operateCode:eachCmd.operation.code});
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     if (requestList.length) {
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/twoConfirmation.vue
index 15924e7da..0568edcb6 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -94,7 +94,7 @@ export default {
                 operation: OperationEvent.Command.close.confirm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -115,7 +115,7 @@ export default {
             }
 
             this.doClose();
-            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid, response }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
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 e4e4d169d..96d635dd2 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userAdd.vue
@@ -124,7 +124,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -146,7 +146,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
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 48c93b4e9..4a9aaefbd 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userDelete.vue
@@ -101,7 +101,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -118,7 +118,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     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 161e28529..f963830c0 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userEdit.vue
@@ -137,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -163,7 +163,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     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 699bb46db..aff8ea37a 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorl.vue
@@ -109,7 +109,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -137,7 +137,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -161,7 +161,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 36cb322f2..54ae3df0d 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -109,7 +109,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -137,7 +137,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -161,7 +161,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 87d03c4a4..d96238dcc 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/helpAbout.vue
@@ -100,7 +100,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -116,7 +116,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 e45385763..86177caf4 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/manageUser.vue
@@ -148,7 +148,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -166,7 +166,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -188,7 +188,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -208,7 +208,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -222,7 +222,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -252,7 +252,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue
index c55821f66..955979b5c 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue
@@ -133,7 +133,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -156,7 +156,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose1.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -176,7 +176,7 @@ export default {
             //     operate.operation = OperationEvent.StationControl.emergencyStationControl.choose.operation
             // }
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue
index 2945bb373..e443541e3 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -148,7 +148,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 ee0a4e8f1..57b7781e2 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/trainDelete.vue
@@ -109,7 +109,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 62fb4b3e9..ad8210f0b 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/trainTranstalet.vue
@@ -126,7 +126,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -148,7 +148,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 dc1625889..b0e8e4310 100644
--- a/src/jmapNew/theme/xian_02/menus/menuLimit.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuLimit.vue
@@ -109,7 +109,7 @@ export default {
                 label: MapDeviceType.LimitControl.label,
                 operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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/menuRequest.vue b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
index 8e2ab604c..939f55d74 100644
--- a/src/jmapNew/theme/xian_02/menus/menuRequest.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
@@ -99,6 +99,11 @@ export default {
                     }
                 });
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            if (val && !this.unfold) {
+                this.unfold = true;
+            }
         }
     },
     mounted() {
@@ -167,7 +172,7 @@ export default {
                 this.$store.dispatch('training/updateMapState', [deviceStatus]);
             }
             this.$store.dispatch('menuOperation/spliceRequestList', {deviceCode:eachCmd.device.code, operateCode:eachCmd.operation.code});
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     if (requestList.length) {
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index c95e91111..4be17f28f 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabledColor="#aaa"/>
+    <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabled-color="#aaa" />
     <section-control ref="sectionControl" pop-class="xian-02__system" />
     <section-un-lock ref="sectionUnLock" />
     <speed-limit-control ref="speedLimitControl" pop-class="xian-02__system" />
@@ -24,12 +24,13 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import SpeedLimit from './menuDialog/speedLimit';
 import SpeedLimitConfirm from './menuDialog/speedLimitConfirm';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SectionMenu',
@@ -51,90 +52,126 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             topTip: '',
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '区段故障解锁',
-                        handler: this.fault,
-                        cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
-                    }
-                    // {
-                    //     label: '区段跟踪激活',
-                    //     handler: this.active,
-                    //     cmdType: CMD.Section.CMD_SECTION_ACTIVE
-                    // },
-                    // {
-                    //     label: '区段跟踪切除',
-                    //     handler: this.split,
-                    //     cmdType: CMD.Section.CMD_SECTION_CUT_OFF
-                    // }
-                    // {
-                    //     label: '区段封锁',
-                    //     handler: this.lock,
-                    //     cmdType: CMD.Section.CMD_SECTION_BLOCK
-                    // },
-                    // {
-                    //     label: '区段解封',
-                    //     handler: this.unlock,
-                    //     cmdType: CMD.Section.CMD_SECTION_UNBLOCK
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '区段封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Section.CMD_SECTION_BLOCK
+            menuNormal: [
+                {
+                    label: '区段故障解锁',
+                    handler: this.fault,
+                    cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK,
+                    isDisabled: (section, work) => {
+                        return false;
                     },
-                    {
-                        label: '区段解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'localWork'
+                },
+                // {
+                //     label: '区段跟踪激活',
+                //     handler: this.active,
+                //     cmdType: CMD.Section.CMD_SECTION_ACTIVE
+                // },
+                // {
+                //     label: '区段跟踪切除',
+                //     handler: this.split,
+                //     cmdType: CMD.Section.CMD_SECTION_CUT_OFF
+                // }
+                // {
+                //     label: '区段封锁',
+                //     handler: this.lock,
+                //     cmdType: CMD.Section.CMD_SECTION_BLOCK
+                // },
+                // {
+                //     label: '区段解封',
+                //     handler: this.unlock,
+                //     cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+                // }
+                // ],
+                // Center: [
+                {
+                    label: '区段封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Section.CMD_SECTION_BLOCK,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return section.blockade === 1;
+                        } else {
+                            return section.blockade === 1;
+                        }
                     },
-                    {
-						// 暂无功能，先disabled掉
-                        label: '设备标签',
-						disabled: true,
-                        children: [
-                            {
-                                label: '创建设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '查看设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '更改设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '删除设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                },
+                {
+                    label: '区段解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Section.CMD_SECTION_UNBLOCK,
+                    isDisabled: (section, work) => {
+                        if (work === 'localWork') {
+                            return section.blockade !== 1;
+                        } else {
+                            return section.blockade !== 1;
+                        }
                     },
-                    {
-                        label: '设置临时限速',
-                        handler: this.setSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                },
+                {
+                    // 暂无功能，先disabled掉
+                    label: '设备标签',
+                    disabled: true,
+                    children: [
+                        {
+                            label: '创建设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '查看设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '更改设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '删除设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        }
+                    ],
+                    isDisabled: (section, work) => {
+                        return true;
                     },
-                    {
-                        label: '帮助',
-						disabled: true,
-                        handler: this.undeveloped
-                    }
-                ]
-            },
+                    isShow: (section, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设置临时限速',
+                    handler: this.setSpeed,
+                    cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
+                    isDisabled: (section, work) => {
+                        return false;
+                    },
+                    isShow: (section, work) => ['01', '02', '03'].includes(section.type) && work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    disabled: true,
+                    handler: this.undeveloped,
+                    isDisabled: (section, work) => {
+                        return true;
+                    },
+                    isShow: (section, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -180,7 +217,7 @@ export default {
     mounted() {
         const isDev = process.env.NODE_ENV === 'development';
         if (isDev) {
-            this.menuNormal.Center.push({
+            this.menuNormal.push({
                 label: '新建计划车',
                 handler: this.addPlanTrain,
                 cmdType: CMD.Section.CMD_Train_Init_Plan
@@ -198,7 +235,14 @@ export default {
             // 编辑模式菜单列表
             if (this.selected.type != '04') {
                 // this.menu = this.menuNormal.Center;
-                this.menu = MenuContextHandler.covert2(this.menuNormal);
+                // this.menu = MenuContextHandler.covert2(this.menuNormal);
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    const status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
             } else {
                 this.menu = [];
             }
@@ -231,7 +275,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainAddPlan.doShow(step);
@@ -310,9 +354,9 @@ export default {
         setSpeed() {
             commitOperate(menuOperate.Section.setSpeed, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-					// 先使用老版本的临时限速
+                    // 先使用老版本的临时限速
                     // this.$refs.speedLimit.doShow(operate, this.selected);
-					this.$refs.speedLimitControl.doShow(operate, this.selected);
+                    this.$refs.speedLimitControl.doShow(operate, this.selected);
                 }
             });
         },
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index dda3c4340..807fcc29a 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" disabledColor="#aaa" pop-class="xian-02__pop_tip_station" />
+    <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" disabled-color="#aaa" pop-class="xian-02__pop_tip_station" />
     <route-detail ref="routeDetail" />
     <notice-info ref="noticeInfo" pop-class="xian-02__system" />
     <set-fault ref="setFault" pop-class="xian-02__system" />
@@ -17,7 +17,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SignalMenu',
@@ -33,152 +33,136 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             topTip: '',
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '始端/终端选择',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '开放自动进路',
-                        handler: this.setAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '关闭自动进路',
-                        handler: this.cancelAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '终端信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '终端信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '引导信号',
-                        handler: this.guideSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-					// 暂无功能，先disabled掉
-                    {
-                        label: '设备标签',
-						disabled: true,
-                        children: [
-                            {
-                                label: '创建设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '查看设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '更改设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '删除设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        label: '帮助',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+            menuNormal: [
+                {
+                    label: '始端/终端选择',
+                    handler: this.arrangementRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.lock === 1;
+                        } else {
+                            return signal.lock === 1;
+                        }
                     }
-                ],
-                Center: [
-                    {
-                        label: '始端/终端选择',
-                        handler: this.arrangementRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
-                    },
-                    {
-                        label: '取消进路',
-                        handler: this.cancelTrainRoute,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
-                    },
-                    {
-                        label: '开放自动进路',
-                        handler: this.setAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO
-                    },
-                    {
-                        label: '关闭自动进路',
-                        handler: this.cancelAutoInterlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO
-                    },
-                    {
-                        label: '终端信号封锁',
-                        handler: this.lock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
-                    },
-                    {
-                        label: '终端信号解封',
-                        handler: this.unlock,
-                        cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
-                    },
-                    {
-                        label: '引导信号',
-                        handler: this.guideSignal,
-                        cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
-                    },
-                    {
-						// 暂无功能，先disabled掉
-                        label: '设备标签',
-						disabled: true,
-                        children: [
-                            {
-                                label: '创建设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '查看设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '更改设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '删除设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        label: '帮助',
-                        handler: this.detail,
-                        cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
+                },
+                {
+                    label: '取消进路',
+                    handler: this.cancelTrainRoute,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.lock !== 1;
+                        } else {
+                            return signal.lock !== 1;
+                        }
                     }
-                ]
-            },
+                },
+                {
+                    label: '开放自动进路',
+                    handler: this.setAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_SET_CI_AUTO,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.fleetMode === 1;
+                        } else {
+                            return signal.fleetMode === 1;
+                        }
+                    }
+                },
+                {
+                    label: '关闭自动进路',
+                    handler: this.cancelAutoInterlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_CI_AUTO,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.fleetMode !== 1;
+                        } else {
+                            return signal.fleetMode !== 1;
+                        }
+                    }
+                },
+                {
+                    label: '终端信号封锁',
+                    handler: this.lock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_BLOCK,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.blockade === 1;
+                        } else {
+                            return signal.blockade === 1;
+                        }
+                    }
+                },
+                {
+                    label: '终端信号解封',
+                    handler: this.unlock,
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
+                    isDisabled: (signal, work) => {
+                        if (work === 'localWork') {
+                            return signal.blockade !== 1;
+                        } else {
+                            return signal.blockade !== 1;
+                        }
+                    }
+                },
+                {
+                    label: '引导信号',
+                    handler: this.guideSignal,
+                    cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                },
+                // 暂无功能，先disabled掉
+                {
+                    label: '设备标签',
+                    disabled: true,
+                    isDisabled: (signal, work) => true,
+                    children: [
+                        {
+                            label: '创建设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '查看设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '更改设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '删除设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        }
+                    ]
+                },
+                {
+                    label: '帮助',
+                    handler: this.detail,
+                    cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
+                    isDisabled: (signal, work) => {
+                        return false;
+                    }
+                }
+            ],
             menuEnabled: [
                 {
                     label: '使能',
@@ -209,11 +193,7 @@ export default {
                     handler: this.triggerFaultManagement,
                     cmdType: CMD.Fault.CMD_TRIGGER_FAULT
                 }
-            ],
-			prdType2ControlModeMap: {
-				'01': 'Local',
-				'02': 'Center'
-			}
+            ]
         };
     },
     computed: {
@@ -228,9 +208,6 @@ export default {
             'routeList',
             'routeData'
         ]),
-		prdType() {
-			return this.$store.state.training.prdType;
-		},
         group() {
             return this.$route.query.group;
         }
@@ -238,18 +215,31 @@ export default {
     watch: {
         '$store.state.menuOperation.menuCount': function (val) {
             if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
+                const operate = {
+                    code: `${this.selected.code}`,
+                    userOperationType: 'rightClick',
+                    operation: OperationEvent.Command.commandRight.right.operation
+                };
+                this.$store.dispatch('trainingNew/next', operate);
                 this.doShow(this.$store.state.menuOperation.menuPosition);
             } else if (this.selected && this.selected._type === 'Signal' && this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Enabled) && !this.buttonOperation) {
+                const operate = {
+                    code: `${this.selected.code}`,
+                    userOperationType: 'rightClick',
+                    operation: OperationEvent.Command.commandRight.right.operation
+                };
+                this.$store.dispatch('trainingNew/next', operate);
                 this.doEnabledShow(this.$store.state.menuOperation.menuPosition);
             } else {
                 this.doClose();
             }
         },
         '$store.state.menuOperation.leftClickCount': function (val) {
-			const control = MenuContextHandler.getStationControl(this.selected);
-			const controlMode = this.prdType2ControlModeMap[this.prdType];
-            if (this.selected._type === 'Signal' && control.controlMode == controlMode) {
-                this.arrangementRoute();
+            // const control = MenuContextHandler.getStationControl(this.selected);
+            // const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
+            if (this.selected._type === 'Signal') {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                status && this.arrangementRoute();
             }
         }
     },
@@ -261,7 +251,14 @@ export default {
             };
         },
         initMenu() {
-            this.menu = MenuContextHandler.covert2(this.menuNormal);
+            // this.menu = MenuContextHandler.covert2(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // this.menu = this.menuNormal.Center;
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -349,7 +346,7 @@ export default {
                 this.$store.dispatch('menuOperation/setRouteSelectStartSignal', {startSignalCode: this.selected.code, endSignalRouteList: endSignalRouteList});
                 this.$store.dispatch('training/updateMapState', updateDeviceList);
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     if (this.selected.isTerminalSignal) {
@@ -361,8 +358,6 @@ export default {
                             param: step.param
                         });
                     }
-                } else {
-                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -377,7 +372,7 @@ export default {
                     signalCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.resetRouteSignal();
@@ -403,7 +398,7 @@ export default {
                     signalCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -429,7 +424,7 @@ export default {
                     signalCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -456,7 +451,7 @@ export default {
                     signalCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -480,7 +475,7 @@ export default {
                     signalCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -505,7 +500,7 @@ export default {
                     signalCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -551,7 +546,7 @@ export default {
                 params: {signalCode:this.selected.code}
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue
index e409a5c39..6e786f079 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue
@@ -17,7 +17,6 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'StationMenu',
@@ -33,165 +32,188 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             topTip: '车站 (CP)',
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '本地控制许可',
-                        children: [
-                            {
-                                label: '请求',
-                                handler: this.setStationControl,
-                                cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                            },
-                            // {
-                            //     label: '授权',
-                            //     handler: this.undeveloped
-                            // },
-                            {
-                                label: '取消',
-                                handler: this.setCenterControl,
-                                cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                            },
-                            // /** 紧急站控 */
-                            // CMD_CM_EMERGENCY_STATION_CONTROL: {value:'CM_Emergency_Station_Control', label: '紧急站控'},
-                            {
-                                label: '紧急本地控制',
-                                handler: this.setEmergencyControl,
-                                cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
+            menuNormal: [
+                {
+                    label: '本地控制许可',
+                    children: [
+                        {
+                            label: '请求',
+                            handler: this.setStationControl,
+                            cmdType: this.work === 'localWork' ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
+                            isDisabled: (station, work) => {
+                                if (work === 'localWork') {
+                                    return station.controlMode !== 'Center';
+                                } else {
+                                    return station.controlMode === 'Center';
+                                }
                             }
-                        ]
+                        },
+                        {
+                        // 暂无功能，先disabled
+                            label: '授权',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isShow: (station, work) => false
+                        },
+                        {
+                            label: '取消',
+                            handler: this.setCenterControl,
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL,
+                            isDisabled: (station, work) => {
+                                if (work === 'localWork') {
+                                    return station.controlMode === 'Center';
+                                } else {
+                                    return station.controlMode !== 'Center';
+                                }
+                            },
+                            isShow: (station, work) => {
+                                return work === 'localWork';
+                            }
+                        },
+                        // /** 紧急站控 */
+                        // CMD_CM_EMERGENCY_STATION_CONTROL: {value:'CM_Emergency_Station_Control', label: '紧急站控'},
+                        {
+                            label: '紧急本地控制',
+                            handler: this.setEmergencyControl,
+                            cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL,
+                            isDisabled: (station, work) => {
+                                return station.controlMode === 'Emergency';
+                            },
+                            isShow: (station, work) => {
+                                return work === 'localWork';
+                            }
+                        }
+                    ]
+                },
+                {
+                    label: '进路模式',
+                    children: [
+                        {
+                            label: '自动',
+                            handler: this.atsAutoControlALL,
+                            cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                            isDisabled: (station, work) => {
+                                return false;
+                            }
+                        },
+                        {
+                            label: '人工',
+                            handler: this.humanControlALL,
+                            cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                            isDisabled: (station, work) => {
+                                return false;
+                            }
+                        }
+                    ],
+                    isShow: (station, work) => {
+                        return work === 'dispatchWork';
                     }
-                ],
-                Center: [
-                    {
-                        label: '本地控制许可',
-                        children: [
-                            {
-                                label: '请求',
-                                handler: this.setStationControl,
-                                cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                            },
-                            {
-                                // 暂无功能，先disabled
-                                label: '授权',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                // 暂无功能，先disabled
-                                label: '取消',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                // 暂无功能，先disabled
-                                label: '紧急本地控制',
-                                disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        label: '进路模式',
-                        children: [
-                            {
-                                label: '自动',
-                                handler: this.atsAutoControlALL,
-                                cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING
-                            },
-                            {
-                                label: '人工',
-                                handler: this.humanControlALL,
-                                cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING
-                            }
-                        ]
-                    },
-                    {
-                        // 暂无功能，先disabled掉
-                        label: '通信',
-                        disabled: true,
-                        children: [
-                            {
-                                label: '本地',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '重新连接',
-                                disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    // {
-                    //     label: '折返模式',
-                    //     children: [
-                    //         {
-                    //             label: '侧线优先',
-                    //             handler: this.setPriorityStrategy
-                    //         },
-                    //         {
-                    //             label: '直线折返',
-                    //             handler: this.setLineStrategy
-                    //         },
-                    //         {
-                    //             label: '侧线折返',
-                    //             handler: this.setLateralStrategy
-                    //         }
-                    //     ]
-                    // },
-                    {
-                        // 暂无功能，先disabled掉
-                        label: '设备标签',
-                        disabled: true,
-                        children: [
-                            {
-                                label: '创建设备标签',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '查看设备标签',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '更改设备标签',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '删除设备标签',
-                                disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        // 暂无功能，先disabled掉
-                        label: '取消验证',
-                        disabled: true,
-                        children: [
-                            {
-                                label: '取消验证',
-                                disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '恢复验证',
-                                disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    }
-                ]
-            },
+                },
+                {
+                    // 暂无功能，先disabled掉
+                    label: '通信',
+                    disabled: true,
+                    children: [
+                        {
+                            label: '本地',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        },
+                        {
+                            label: '重新连接',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        }
+                    ],
+                    isDisabled: (station, work) => true,
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                // {
+                //     label: '折返模式',
+                //     children: [
+                //         {
+                //             label: '侧线优先',
+                //             handler: this.setPriorityStrategy
+                //         },
+                //         {
+                //             label: '直线折返',
+                //             handler: this.setLineStrategy
+                //         },
+                //         {
+                //             label: '侧线折返',
+                //             handler: this.setLateralStrategy
+                //         }
+                //     ]
+                // },
+                {
+                    // 暂无功能，先disabled掉
+                    label: '设备标签',
+                    disabled: true,
+                    children: [
+                        {
+                            label: '创建设备标签',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        },
+                        {
+                            label: '查看设备标签',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        },
+                        {
+                            label: '更改设备标签',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        },
+                        {
+                            label: '删除设备标签',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        }
+                    ],
+                    isDisabled: (station, work) => true,
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    // 暂无功能，先disabled掉
+                    label: '取消验证',
+                    disabled: true,
+                    children: [
+                        {
+                            label: '取消验证',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        },
+                        {
+                            label: '恢复验证',
+                            disabled: true,
+                            handler: this.undeveloped,
+                            isDisabled: (station, work) => true
+                        }
+                    ],
+                    isDisabled: (station, work) => true,
+                    isShow: (station, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置ZC故障',
@@ -246,7 +268,23 @@ export default {
             this.menu = [];
             // this.menu = [...this.menuNormal.Center];
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            const selected = this.selected;
+            const work = this.work;
+            function setDisabledShow(item) {
+                if (item.children) {
+                    item.children.forEach(ii => {
+                        setDisabledShow(ii);
+                    });
+                }
+                item.disabled = item.isDisabled ? item.isDisabled(selected, work) : false;
+                item.show = item.isShow ? item.isShow(selected, work) : true;
+            }
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                setDisabledShow(menuItem);
+                this.menu.push(menuItem);
+            });
             if (this.selected.reentry) {
                 const menuAdd = {
                     label: '折返模式',
@@ -323,7 +361,7 @@ export default {
                     stationCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -349,7 +387,7 @@ export default {
                     stationCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
diff --git a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
index bac37ff5f..3b03b509d 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" disabledColor="#aaa"/>
+    <pop-menu ref="popMenu" :menu="menu" disabled-color="#aaa" />
     <station-control ref="stationControl" />
   </div>
 </template>
@@ -12,7 +12,6 @@ import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 // import CMD from '@/scripts/cmdPlugin/CommandEnum';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
     name: 'StationControlMenu',
@@ -26,15 +25,18 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
-            menuNormal: {
-                Local: [],
-                Center: []
-            },
+            menuNormal: [],
             menuForce: [
             ]
         };
@@ -66,7 +68,13 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert(this.menuNormal);
+            // this.menu = MenuContextHandler.covert(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
diff --git a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue
index afb98dd98..9ca57fa94 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStationStand.vue
@@ -218,7 +218,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     const requestList = this.$store.state.menuOperation.requestList;
@@ -253,7 +253,7 @@ export default {
             const step = {
                 operation: OperationEvent.StationStand.tableMenu.cancelTableMenu.operation
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.loading = false;
@@ -293,7 +293,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.platformDwell.doShow(step, this.selected);
@@ -315,7 +315,7 @@ export default {
             //         };
             //
             //         this.loading = true;
-            //         this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            //         this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
             //             this.loading = false;
             //             if (valid) {
             //                 this.doClose();
@@ -355,7 +355,7 @@ export default {
             //         standCode: `${this.selected.code}`
             //     }
             // };
-            // this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            // this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
             //     if (valid) {
             //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             //         this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: OperationEvent.StationStand.setJumpStop.menu.operation});
@@ -369,7 +369,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index bbc5ef7db..5033c3aa8 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabledColor="#aaa" />
+    <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" disabled-color="#aaa" />
     <switch-control ref="switchControl" pop-class="xian-02__system" />
     <section-un-lock ref="sectionUnLock" pop-class="xian-02__system" />
     <speed-limit-control ref="speedLimitControl" pop-class="xian-02__system" />
@@ -24,7 +24,7 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'SwitchMenu',
@@ -43,100 +43,108 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             topTip: '',
             menu: [],
-            menuNormal: {
-                Local: [
-                    {
-                        label: '道岔定位',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '道岔反位',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
+            menuNormal: [
+                {
+                    label: '道岔定位',
+                    handler: this.locate,
+                    cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.normalPosition === 1;
+                        } else {
+                            return station.normalPosition === 1;
+                        }
                     }
-                    // {
-                    //     label: '道岔封锁',
-                    //     handler: this.block,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_BLOCK
-                    // },
-                    // {
-                    //     label: '道岔解封',
-                    //     handler: this.unblock,
-                    //     cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK
-                    // }
-                ],
-                Center: [
-                    {
-                        label: '道岔定位',
-                        handler: this.locate,
-                        cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION
-                    },
-                    {
-                        label: '道岔反位',
-                        handler: this.reverse,
-                        cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
-                    },
-                    {
-                        label: '道岔单锁',
-                        handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
-                    {
-                        label: '道岔单解',
-                        handler: this.unlock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK
-                    },
-                    {
-						// 暂无功能，先disabled掉
-                        label: '设备标签',
-						disabled: true,
-                        children: [
-                            {
-                                label: '创建设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '查看设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '更改设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            },
-                            {
-                                label: '删除设备标签',
-								disabled: true,
-                                handler: this.undeveloped
-                            }
-                        ]
-                    },
-                    {
-                        label: '帮助',
-						disabled: true,
-                        handler: this.undeveloped
+                },
+                {
+                    label: '道岔反位',
+                    handler: this.reverse,
+                    cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.reversePosition === 1;
+                        } else {
+                            return station.reversePosition === 1;
+                        }
                     }
-                ]
-            },
+                },
+                {
+                    label: '道岔单锁',
+                    handler: this.lock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.singleLock === 1;
+                        } else {
+                            return station.singleLock === 1;
+                        }
+                    }
+                },
+                {
+                    label: '道岔单解',
+                    handler: this.unlock,
+                    cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
+                    isDisabled: (station, work) => {
+                        if (work === 'localWork') {
+                            return station.singleLock !== 1;
+                        } else {
+                            return station.singleLock !== 1;
+                        }
+                    }
+                },
+                {
+                    // 暂无功能，先disabled掉
+                    label: '设备标签',
+                    disabled: true,
+                    children: [
+                        {
+                            label: '创建设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '查看设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '更改设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        },
+                        {
+                            label: '删除设备标签',
+                            disabled: true,
+                            handler: this.undeveloped
+                        }
+                    ],
+                    isDisabled: (station, work) => {
+                        return true;
+                    },
+                    isShow: (station, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    disabled: true,
+                    handler: this.undeveloped,
+                    isDisabled: (station, work) => {
+                        return true;
+                    },
+                    isShow: (station, work) => work === 'dispatchWork'
+                }
+            ],
             menuEnabled: [
                 {
                     label: '使能',
@@ -199,7 +207,14 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            this.menu = MenuContextHandler.covert2(this.menuNormal);
+            // this.menu = MenuContextHandler.covert2(this.menuNormal);
+            this.menu = [];
+            this.menuNormal.forEach(menuItem => {
+                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 if (!this.$store.state.scriptRecord.bgSet) {
@@ -339,7 +354,7 @@ export default {
                 params: {switchCode:this.selected.code}
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index a045c6ea1..066ac4d8b 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -60,172 +60,181 @@ export default {
             default() {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             topTip: '',
             menu: [],
-            menuNormal: {
-                Local: [
-                ],
-                Center: [
-                    {
-                        label: '追踪号',
-                        children: [
-                            {
-                                label: '目的地ID',
-                                handler: this.updateDestination,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '删除ID',
-                                handler: this.deletDestionation,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '更改追踪号',
-                                handler: this.updateTid,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '交换追踪号',
-                                handler: this.switchTid,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '运行等级',
-                                handler: this.handleRunLevel,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '列车模式',
-                                handler: this.setTrainMode,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '惰性模式',
-                                handler: this.setIdleRunningMode,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '旁路模式',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            }
-                        ]
-                    },
-                    {
-                        label: '列车明细',
-                        handler: this.getTrainDetail,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '请求',
-                        children: [
-                            {
-                                label: '扣车/放行',
-                                children:[
-                                    {
-                                        label: '扣车',
-                                        handler: this.setDetainTrain,
-                                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                                    },
-                                    {
-                                        label: '发车 ',
-                                        handler: this.setTrainDeparture,
-                                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                                    }
-                                ]
-                            },
-                            {
-                                label: '停车/放行',
-                                children:[
-                                    {
-                                        label: '停车',
-                                        handler: this.trainOrderStop
-                                    },
-                                    {
-                                        label: '放行 ',
-                                        handler: this.trainCancleOrderStop
-                                    }
-                                ]
-                                // cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '就绪状态',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '测试',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '救援列车',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '开车门',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '关车门',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            }
-                        ]
-                    },
-                    {
-                        label: '设备标签',
-                        children: [
-                            {
-                                label: '创建设备标签',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '查看设备标签',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '更改设备标签',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            },
-                            {
-                                label: '删除设备标签',
-                                handler: this.undeveloped,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            }
-                        ]
-                    },
-                    {
-                        label: '列车报警确认',
-                        children: [
-                            {
-                                label: '完整性报警确认',
-                                handler: this.trainAlertor,
-                                cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                            }
-                        ]
-                    },
-                    {
-                        label: '更新列车计划',
-                        handler: this.updateTrainPlan,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    },
-                    {
-                        label: '帮助',
-                        handler: this.undeveloped,
-                        cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
-                    }
-                ]
-            },
+            menuNormal: [
+                {
+                    label: '追踪号',
+                    children: [
+                        {
+                            label: '目的地ID',
+                            handler: this.updateDestination,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '删除ID',
+                            handler: this.deletDestionation,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '更改追踪号',
+                            handler: this.updateTid,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '交换追踪号',
+                            handler: this.switchTid,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '运行等级',
+                            handler: this.handleRunLevel,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '列车模式',
+                            handler: this.setTrainMode,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '惰性模式',
+                            handler: this.setIdleRunningMode,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '旁路模式',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        }
+                    ],
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '列车明细',
+                    handler: this.getTrainDetail,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '请求',
+                    children: [
+                        {
+                            label: '扣车/放行',
+                            children:[
+                                {
+                                    label: '扣车',
+                                    handler: this.setDetainTrain,
+                                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                                },
+                                {
+                                    label: '发车 ',
+                                    handler: this.setTrainDeparture,
+                                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                                }
+                            ]
+                        },
+                        {
+                            label: '停车/放行',
+                            children:[
+                                {
+                                    label: '停车',
+                                    handler: this.trainOrderStop
+                                },
+                                {
+                                    label: '放行 ',
+                                    handler: this.trainCancleOrderStop
+                                }
+                            ]
+                            // cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '就绪状态',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '测试',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '救援列车',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '开车门',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '关车门',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        }
+                    ],
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '设备标签',
+                    children: [
+                        {
+                            label: '创建设备标签',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '查看设备标签',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '更改设备标签',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        },
+                        {
+                            label: '删除设备标签',
+                            handler: this.undeveloped,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        }
+                    ],
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '列车报警确认',
+                    children: [
+                        {
+                            label: '完整性报警确认',
+                            handler: this.trainAlertor,
+                            cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+                        }
+                    ],
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '更新列车计划',
+                    handler: this.updateTrainPlan,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.undeveloped,
+                    cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -331,8 +340,15 @@ export default {
         },
         initMenu() {
             // 编辑模式菜单列表
-            if (this.$store.state.training.prdType === '02') {
-                this.menu = this.menuNormal.Center;
+            if (this.work === 'dispatchWork') {
+            // if (this.$store.state.training.prdType === '02') {
+                // this.menu = this.menuNormal.Center;
+                this.menu = [];
+                this.menuNormal.forEach(menuItem => {
+                    menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
+                    menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                    this.menu.push(menuItem);
+                });
             }
             // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
@@ -497,7 +513,7 @@ export default {
                 cmdType = CMD.Train.CMD_TRAIN_ORDER_STOP;
                 operate.operation = OperationEvent.Train.trainOrderStop.menu.operation;
             }
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -522,7 +538,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -556,7 +572,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.changeTid.doShow(operate, this.selected);
@@ -569,7 +585,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.switchTrainId.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.changeTid.doShow(operate, this.selected);
@@ -587,7 +603,7 @@ export default {
                     groupNumber: this.selected.groupNumber
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
 
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -604,7 +620,7 @@ export default {
                     groupNumber: this.selected.groupNumber
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
 
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();
@@ -629,7 +645,7 @@ export default {
                     trainCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) =>{
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) =>{
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainRunLevel.doShow(operate, this.selected);
@@ -647,7 +663,7 @@ export default {
                     trainCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) =>{
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) =>{
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainAlertor.doShow(operate, this.selected);
@@ -665,7 +681,7 @@ export default {
                     trainCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) =>{
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) =>{
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
                     this.$refs.trainUpdatePlan.doShow(operate, this.selected);
@@ -682,7 +698,7 @@ export default {
                     trainCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.idleRunningMode.doShow(operate, this.selected);
@@ -699,7 +715,7 @@ export default {
                     trainCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMode.doShow(operate, this.selected);
@@ -716,7 +732,7 @@ export default {
                     trainCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({valid}) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetail.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 971308015..56f966fe0 100644
--- a/src/jmapNew/theme/xian_02/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/xian_02/menus/passiveDialog/alarm.vue
@@ -174,7 +174,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -186,7 +186,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 de9138095..76d564577 100644
--- a/src/jmapNew/theme/xian_02/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/xian_02/menus/passiveDialog/control.vue
@@ -69,6 +69,14 @@ export default {
     components: {
         NoticeInfo
     },
+    props: {
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
     data() {
         return {
             dialogShow: false,
@@ -88,10 +96,10 @@ export default {
     },
     computed: {
         targetStatus() {
-            if (this.$store.state.training.prdType == '01') {
+            if (this.work == 'localWork') {
                 return '01';
             }
-            if (this.$store.state.training.prdType == '02') {
+            if (this.work == 'dispatchWork') {
                 return '02';
             }
             return '';
@@ -199,7 +207,7 @@ export default {
             };
 
             this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -236,7 +244,7 @@ export default {
                     val: this.serializeCodeListWithSeparator('::')
                 };
 
-                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -252,12 +260,12 @@ export default {
                 type: MapDeviceType.StationControl.type,
                 operation: OperationEvent.StationControl.controlResponse.agree.operation,
                 val: this.selection[0].code,
-                prdType: this.$store.state.training.prdType
+                prdType: this.targetStatus
             };
 
             this.clearTimer();
             this.disabledAgree = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -273,12 +281,12 @@ export default {
                 type: MapDeviceType.StationControl.type,
                 operation: OperationEvent.StationControl.controlResponse.refuse.operation,
                 val: this.tableData[0].code,
-                prdType: this.$store.state.training.prdType
+                prdType: this.targetStatus
             };
 
             this.clearTimer();
             this.disabledAgree = true;
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', 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 229197290..9c222be28 100644
--- a/src/jmapNew/theme/xian_02/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/xian_02/menus/passiveDialog/timeout.vue
@@ -81,7 +81,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -93,7 +93,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
index b058ead31..da6c80368 100644
--- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <pop-menu ref="popMenu" :menu="menu" trigger="click" :tip-msg="topTip" text-align="left" pop-class="xian-02__pop_tip_station" disabledColor="#aaa" />
+    <pop-menu ref="popMenu" :menu="menu" trigger="click" :tip-msg="topTip" text-align="left" pop-class="xian-02__pop_tip_station" disabled-color="#aaa" />
     <notice-info ref="noticeInfo" pop-class="xian-02__system" />
     <update-stand-plan ref="updateStandPlan" :selected="selected" />
     <warning-confirm ref="warningConfirm" :selected="selected" />
@@ -20,8 +20,9 @@ import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
+// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
 
 export default {
     name: 'StationStandMenu',
@@ -39,154 +40,205 @@ export default {
             default: () => {
                 return null;
             }
+        },
+        work: {
+            type: String,
+            default() {
+                return '';
+            }
         }
     },
     data() {
         return {
             menu: [],
             topTip: '',
-            updateStandPlan: {
-                Local: [],
-                Center: [
-                    {
-                        label: '更新站台计划',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+            updateStandPlan: [
+                {
+                    label: '更新站台计划',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
-                    }
-                ]
-            },
-            stopJumping: {
-                Local: [],
-                Center: [
-                    {
-                        label: '列车跳停本站',
-                        handler: this.setJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
-						checkDisabled: (selected) => { return selected && (selected.centerHoldTrain||selected.stationHoldTrain) }
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            stopJumping: [
+                {
+                    label: '列车跳停本站',
+                    handler: this.setJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP,
+                    checkDisabled: (selected) => { return selected && (selected.centerHoldTrain || selected.stationHoldTrain); },
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '取消列车跳停本站',
-                        handler: this.cancelJumpStop,
-                        cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '取消列车跳停本站',
+                    handler: this.cancelJumpStop,
+                    cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
-            allTrainStopJump: {
-                Local: [],
-                Center: [
-                    {
-                        label: '设备标签',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS
-                    }
-                ]
-            },
-            standDetain: {
-                Local: [],
-                Center: [
-                    {
-                        label: '扣车',
-                        handler: this.setStandDetain,
-                        cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
-                        checkDisabled: (selected) => { return selected && selected.allSkip }
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            allTrainStopJump: [
+                {
+                    label: '设备标签',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '发车',
-                        handler: this.cancelStandDetain,
-                        cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART
-                    }
-                ]
-            },
-            stoppingProfile: {
-                Local: [],
-                Center: [
-                    {
-                        label: '站台停站调整', // 设置停站时间
-                        handler: this.setStopTime,
-                        cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '站台停站',
-                        handler: this.setStopTime,
-                        cmdType: ''
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            standDetain: [
+                {
+                    label: '扣车',
+                    handler: this.setStandDetain,
+                    cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN,
+                    checkDisabled: (selected) => { return selected && selected.allSkip; },
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setStopTime,
-                        cmdType: ''
-                    }
-                ]
-            },
-            psdInfoConfirm: {
-                Local: [],
-                Center: [
-                    {
-                        label: '站台屏蔽门报警确认',
-                        handler: this.confirmPsdWarning,
-                        cmdType: ''
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '发车',
+                    handler: this.cancelStandDetain,
+                    cmdType: CMD.Stand.CMD_STAND_EARLY_DEPART,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setStopTime,
-                        cmdType: ''
-                    }
-                ]
-            },
-            upStopProfile: {
-                Local: [],
-                Center: [
-                    // {
-                    //     label: '站台停站曲线',
-                    //     handler: this.setStopTime,
-                    //     cmdType: ''
-                    // },
-                    {
-                        label: '站台停站曲线',
-                        handler: this.setUpStopProfile,
-                        cmdType: ''
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            stoppingProfile: [
+                {
+                    label: '站台停站调整', // 设置停站时间
+                    handler: this.setStopTime,
+                    cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setUpStopProfile,
-                        cmdType: ''
-                    }
-                ]
-            },
-            downStopProfile: {
-                Local: [],
-                Center: [
-                    // {
-                    //     label: '站台停站曲线',
-                    //     handler: this.setDownStopProfile,
-                    //     cmdType: ''
-                    // },
-                    {
-                        label: '站台停站曲线',
-                        handler: this.setDownStopProfile,
-                        cmdType: ''
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '站台停站',
+                    handler: this.setStopTime,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
                     },
-                    {
-                        label: '帮助',
-                        handler: this.setDownStopProfile,
-                        cmdType: ''
-                    }
-                ]
-            },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setStopTime,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            psdInfoConfirm: [
+                {
+                    label: '站台屏蔽门报警确认',
+                    handler: this.confirmPsdWarning,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setStopTime,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            upStopProfile: [
+                // {
+                //     label: '站台停站曲线',
+                //     handler: this.setStopTime,
+                //     cmdType: ''
+                // },
+                {
+                    label: '站台停站曲线',
+                    handler: this.setUpStopProfile,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setUpStopProfile,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
+            downStopProfile: [
+                // {
+                //     label: '站台停站曲线',
+                //     handler: this.setDownStopProfile,
+                //     cmdType: ''
+                // },
+                {
+                    label: '站台停站曲线',
+                    handler: this.setDownStopProfile,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                },
+                {
+                    label: '帮助',
+                    handler: this.setDownStopProfile,
+                    cmdType: '',
+                    isDisabled: (station, work) => {
+                        return false;
+                    },
+                    isShow: (stand, work) => work === 'dispatchWork'
+                }
+            ],
             menuForce: [
                 {
                     label: '设置故障',
@@ -231,37 +283,49 @@ export default {
                 self.doClose();
             };
         },
+        getMenu(type) {
+            this.menu = [];
+            this[type].forEach(menuItem => {
+                const status = judgeStationControl(this.selected.stationCode, this.selected.deviceStationCode, this.work);
+                menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
+                menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
+                this.menu.push(menuItem);
+            });
+        },
         initMenu(type) {
             // 编辑模式菜单列表
             this.topTip = '';
             switch (type) {
             case 'updateStandPlan':
-                this.menu = this.updateStandPlan.Center;
+                this.menu = this.updateStandPlan;
                 break;
             case 'stopJumping':
-                this.menu = MenuContextHandler.covertList(this.stopJumping.Center);
+                // this.menu = MenuContextHandler.covertList(this.stopJumping.Center);
+                this.getMenu(type);
                 break;
             case 'allTrainStopJump':
                 this.topTip = '所有列车跳停本站';
-                this.menu = MenuContextHandler.covertList(this.allTrainStopJump.Center);
+                // this.menu = MenuContextHandler.covertList(this.allTrainStopJump.Center);
+                this.getMenu(type);
                 break;
             case 'standDetain':
                 this.topTip = '站台扣车 SET/CANCEL';
-                this.menu = MenuContextHandler.covertList(this.standDetain.Center);
+                // this.menu = MenuContextHandler.covertList(this.standDetain.Center);
+                this.getMenu(type);
                 break;
             case 'psdInfoConfirm':
                 this.topTip = '站台屏蔽门报警-站台屏蔽门信息确认';
-                this.menu = this.psdInfoConfirm.Center;
+                this.menu = this.psdInfoConfirm;
                 break;
             case 'upStopProfile':
-                this.menu = this.upStopProfile.Center;
+                this.menu = this.upStopProfile;
                 break;
             case 'downStopProfile':
-                this.menu = this.downStopProfile.Center;
+                this.menu = this.downStopProfile;
                 break;
             }
 
-			// 故障模式菜单列表
+            // 故障模式菜单列表
             if (this.operatemode === OperateMode.FAULT) {
                 this.menu = this.menuForce;
             }
@@ -309,7 +373,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -330,7 +394,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -352,7 +416,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.updateStandPlan.doShow(step, this.selected);
@@ -370,7 +434,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.warningConfirm.doShow(step, this.selected);
@@ -387,7 +451,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -409,7 +473,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
@@ -430,7 +494,7 @@ export default {
                     standCode: `${this.selected.code}`
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stopProfile.doShow(step, this.selected, 'up');
@@ -446,7 +510,7 @@ export default {
                     standCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', step).then(( {valid}) => {
+            this.$store.dispatch('trainingNew/next', step).then(( {valid}) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true});
                     this.$refs.stopProfile.doShow(step, this.selected, 'down');
diff --git a/src/jmapNew/transformHandle.js b/src/jmapNew/transformHandle.js
index 685ae6b66..bb6e25b8c 100644
--- a/src/jmapNew/transformHandle.js
+++ b/src/jmapNew/transformHandle.js
@@ -1,5 +1,5 @@
 import {createTransform, createBoundingRect} from './utils/parser';
-
+import store from '@/store/index';
 class TransformHandle {
     constructor(painter) {
         this.$painter = painter;
@@ -36,6 +36,15 @@ class TransformHandle {
             if (this.foldLines && this.foldLines.length) {
                 this.handleFoldShow(view);
             }
+            // getScaleRate
+            if (store.state.map.picture === 'emergency' && view._type === 'Train' && view.trainB && view.trainB.mouseEvent && view.trainB.mouseEvent.arrowText) {
+                // const scale = parseFloat((20 / this.scaleIndex).toFixed(2));
+                const scaleRate = this.$painter.$jmap.$options.getScaleRate();
+                if (scaleRate < 1) {
+                    view.trainB.mouseEvent.arrowText.setStyle({ textFont: (10 / scaleRate).ceil() + 'px consolas' });
+                }
+            }
+
             view.decomposeTransform();
             this.revisibleView(view);
         }
diff --git a/src/jmapNew/transformHandleScreen.js b/src/jmapNew/transformHandleScreen.js
index c8714fec0..59ad31181 100644
--- a/src/jmapNew/transformHandleScreen.js
+++ b/src/jmapNew/transformHandleScreen.js
@@ -101,9 +101,7 @@ class TransformHandle {
     // 更新偏移量
     updateTransform(list, rectList) {
         this.rectList = rectList;
-        // this.scale = list[0].scaleRateX;
         this.transform = [];
-        console.log(list, '------------');
         list.forEach(item => {
             this.transform.push(createTransform1(item));
         });
diff --git a/src/layout/components/Logout.vue b/src/layout/components/Logout.vue
deleted file mode 100644
index d3f4d65b8..000000000
--- a/src/layout/components/Logout.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-  <el-dropdown class="avatar-container" trigger="hover" :show-timeout="100" style="height:58px">
-    <div class="avatar-wrapper">
-      <span style="color: white;">
-        {{ username }}
-      </span>
-      <i class="el-icon-caret-bottom" style="color: #909399;" />
-    </div>
-    <el-dropdown-menu slot="dropdown" class="user-dropdown">
-      <el-dropdown-item>
-        <span style="display:block;" @click="handleDetail">{{ $t('global.personalDetails') }}</span>
-      </el-dropdown-item>
-      <el-dropdown-item v-if="companyAdmin && isSameProject">
-        <span style="display:block;" @click="handleOrganization">教学管理</span>
-      </el-dropdown-item>
-      <el-dropdown-item v-if="isNotCompanyAdmin && isCGY && isSameProject">
-        <span style="display:block;" @click="handleStatistics">数据统计</span>
-      </el-dropdown-item>
-      <el-dropdown-item>
-        <span style="display:block;" @click="logout">{{ $t('global.exit') }}</span>
-      </el-dropdown-item>
-    </el-dropdown-menu>
-    <user-info ref="userInfo" />
-  </el-dropdown>
-</template>
-
-<script>
-import userInfo from './userInfo';
-import { UrlConfig } from '@/scripts/ConstDic';
-import { getSessionStorage } from '@/utils/auth';
-
-export default {
-    name: 'Logout',
-    components: {
-        userInfo
-    },
-    data() {
-        return {
-        };
-    },
-    computed: {
-        username() {
-            return this.$store.state.user.nickname;
-        },
-        companyAdmin() {
-            return this.$store.state.user.companyAdmin;
-        },
-        isNotCompanyAdmin(){
-            return this.$store.state.user.companyAdmin==false;
-        },
-        isSameProject() {
-            return this.$store.state.user.companyProjectList.includes(getSessionStorage('project').toUpperCase());
-        },
-        isCGY() {
-            return getSessionStorage('project') === 'cgy';
-            // gzb
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        logout() {
-            this.$store.dispatch('LogOut').then(() => {
-                location.reload(); // 为了重新实例化vue-router对象 避免bug
-            });
-        },
-        selfPermission() {
-            this.$router.push({ path: `${UrlConfig.permission.prefix}/manage`});
-        },
-        handleDetail() {
-            this.$refs.userInfo.doShow();
-        },
-        handleOrganization() {
-            this.$router.push({ path: `/info/organization` });
-        },
-        handleStatistics(){
-            this.$router.push({ path: `/info/studentStatistics` });
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-    $height: 58px;
-
-    .navbar {
-        height: $height;
-        line-height: $height;
-        padding-left: 30px;
-        border-radius: 0px !important;
-
-        .hamburger-container {
-            line-height: $height;
-            height: $height;
-            float: left;
-            padding: 0 10px;
-        }
-
-        .screenfull {
-            position: absolute;
-            right: 90px;
-            top: 16px;
-            color: red;
-        }
-
-        .avatar-container {
-            height: $height;
-            display: inline-block;
-            // position: absolute;
-            position: relative;
-            right: 0px;
-            // right: 35px;
-
-            .avatar-wrapper {
-                cursor: pointer;
-                position: relative;
-                height: $height;
-
-                .user-avatar {
-                    width: 40px;
-                    height: 40px;
-                    border-radius: 10px;
-                }
-
-                .el-icon-caret-bottom {
-                    position: absolute;
-                    right: -20px;
-                    top: 25px;
-                    font-size: 12px;
-                }
-            }
-        }
-    }
-</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 45bfa2ca9..38d4f248b 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -11,6 +11,7 @@
     @select="handleSelect"
   >
     <system-title />
+    <div class="centerNullMenu" />
     <template v-for="(item, idx) in routers">
       <template v-if="!item.hidden&&item.children">
         <template v-if="hasOneScreenShowingChildren(item.children) &&!item.alwaysShow">
@@ -41,26 +42,47 @@
           <template v-for="(child,cdx) in item.children">
             <template v-if="!child.hidden">
               <template v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)">
-                <el-submenu :key="cdx" :index="child.path" :show-timeout="100">
+                <el-submenu :key="cdx" :index="item.path+'/'+child.path" :show-timeout="100" :hide-timeout="100" popper-class="grandChildClass">
                   <template slot="title">
                     <span v-if="child.meta" slot="title">{{ $t(child.meta.i18n) }}</span>
                   </template>
                   <template v-for="(grandchild,gdx) in child.children">
                     <template v-if="!grandchild.hidden">
-                      <template :to="child.path+'/'+grandchild.path">
-                        <el-menu-item :key="gdx" :index="item.redirect ? item.redirect : (child.path+'/'+grandchild.path)">
+                      <template v-if="!grandchild.children" :to="child.path+'/'+grandchild.path">
+                        <el-menu-item :key="gdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path)">
                           <span
                             v-if="grandchild.meta"
                             slot="title"
                           >{{ $t(grandchild.meta.i18n) }}</span>
                         </el-menu-item>
                       </template>
+                      <template v-else :to="child.path+'/'+grandchild.path">
+                        <el-submenu v-for="(mgChild,mgdx) in grandchild.children" :key="mgdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path+'/'+mgChild.path)" :show-timeout="100" :hide-timeout="100">
+                          <template slot="title">
+                            <span v-if="mgChild.meta" slot="title">{{ $t(mgChild.meta.i18n) }}</span>
+                          </template>
+                          <el-menu-item :key="mgdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path+'/'+grandchild.path + '/' + mgChild.path)">
+                            <span
+                              v-if="mgChild.meta"
+                              slot="title"
+                            >{{ $t(mgChild.meta.i18n) }}</span>
+                          </el-menu-item>
+                        </el-submenu>
+                      </template>
                     </template>
                   </template>
                 </el-submenu>
               </template>
-              <template v-else :to="item.path+'/'+child.path">
-                <el-menu-item :key="cdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path)">
+              <template v-else>
+                <div v-if="child.target" :key="child.target + cdx" class="targetDiv">
+                  <!-- 案例跳转 -->
+                  <a
+                    :href="child.target"
+                    target="_blank"
+                    style="width: 100%; height: 100%; padding: 0 10px; display: block;"
+                  >{{ $t(child.meta.i18n) }}</a>
+                </div>
+                <el-menu-item v-else :key="cdx" :index="item.redirect ? item.redirect : (item.path+'/'+child.path)">
                   <span v-if="child.meta" slot="title">{{ $t(child.meta.i18n) }}</span>
                 </el-menu-item>
               </template>
@@ -69,25 +91,30 @@
         </el-submenu>
       </template>
     </template>
+    <!--    <div v-if="helpShow" class="helpDiv" @click="goToHelp">-->
+    <!--      <span>帮助</span>-->
+    <!--    </div>-->
+    <el-submenu v-if="!thirdLogin" :key="99" index="/info" :show-timeout="100">
+      <span slot="title">{{ username }}</span>
+      <el-menu-item :key="991" index="/info/personalInfo">个人信息</el-menu-item>
+      <el-menu-item v-if="isNotCompanyAdmin && isCGY && isSameProject" :key="992" index="/info/studentStatistics">数据统计</el-menu-item>
+    </el-submenu>
     <div v-if="!thirdLogin" class="rightGroup">
-      <quick-entry ref="quickEntry" />
-      <user-logout ref="userLogout" />
+      <el-tooltip class="item" effect="dark" content="退出" placement="bottom-end">
+        <i class="el-icon-switch-button" style="color: #fff;font-weight: bolder;cursor: pointer;" @click="logout" />
+      </el-tooltip>
     </div>
   </el-menu>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-import UserLogout from './Logout';
-import QuickEntry from './Entry';
 import SystemTitle from './Title';
 import {getSessionStorage } from '@/utils/auth';
 import { ThirdLoginList } from '@/scripts/ProjectConfig';
 
 export default {
     components: {
-        UserLogout,
-        QuickEntry,
         SystemTitle
     },
     data() {
@@ -105,8 +132,22 @@ export default {
         ]),
         thirdLogin() {
             return ThirdLoginList.includes(getSessionStorage('project'));
+        },
+        username() {
+            return this.$store.state.user.nickname;
+        },
+        isNotCompanyAdmin() {
+            return this.$store.state.user.companyAdmin == false;
+        },
+        isSameProject() {
+            return this.$store.state.user.companyProjectList.includes(getSessionStorage('project').toUpperCase());
+        },
+        isCGY() {
+            return getSessionStorage('project') === 'cgy';
+        },
+        helpShow() {
+            return this.$store.state.projectConfig.helpShow;
         }
-
     },
     watch: {
         $route(val) {
@@ -119,7 +160,9 @@ export default {
     },
     mounted() {
         this.routes = this.$router.options.routes;
-        if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
+        if (this.$route.fullPath.includes('/trainingPlatform/simulation')) {
+            this.activePath = '/simulation/simulationIndex';
+        } else if (this.$route.fullPath.indexOf('design/usermap') >= 0) {
             this.activePath = '/design/usermap/home';
         } else if (this.$route.fullPath.includes('design/lesson') || this.$route.fullPath.includes('design/script') || this.$route.fullPath.includes('design/runPlan') || this.$route.fullPath.includes('design/mapPreview')) {
             this.activePath = '/design/home';
@@ -128,6 +171,11 @@ export default {
         }
     },
     methods: {
+        goToHelp() {
+            let href = '';
+            href = this.$store.state.user.baseSite + '/docs/';
+            window.open(href, '_blank');
+        },
         toggleSideBar() {
             this.$store.dispatch('ToggleSideBar');
         },
@@ -162,6 +210,11 @@ export default {
             setTimeout(() => { // 路由跳转
                 this.$refs.keMenu.activeIndex = index;
             }, 100);
+        },
+        logout() {
+            this.$store.dispatch('LogOut').then(() => {
+                location.reload(); // 为了重新实例化vue-router对象 避免bug
+            });
         }
     }
 };
@@ -171,9 +224,8 @@ export default {
     $height: 61px;
 
     .rightGroup{
-        position: absolute;
-        right: 35px;
         display: inline-block;
+		padding: 0 20px;
     }
 
     .navbar {
@@ -181,7 +233,11 @@ export default {
         line-height: $height;
         padding-left: 30px;
         border-radius: 0px !important;
-
+		display: flex;
+		.centerNullMenu {
+			display: flex;
+			flex: 1;
+		}
         .image-container {
             line-height: $height;
             height: $height;
@@ -214,4 +270,27 @@ export default {
       margin-right:20px;
       font-size:14px;
     }
+	/deep/ .grandChildClass {
+		left: -210px !important;
+	}
+	.targetDiv {
+		height: 36px;
+		line-height: 36px;
+		color: #fff;
+		font-size: 14px;
+	}
+	.targetDiv :hover {
+		background-color: #434A50;
+	}
+	.helpDiv {
+		height: 60px;
+		line-height: 60px;
+		color: #fff;
+		font-size: 14px;
+		cursor: pointer;
+		padding: 0 20px;
+		&:hover {
+			background-color: #434A50;
+		}
+	}
 </style>
diff --git a/src/layout/components/Title.vue b/src/layout/components/Title.vue
index 3daa10390..b4309a69c 100644
--- a/src/layout/components/Title.vue
+++ b/src/layout/components/Title.vue
@@ -6,8 +6,8 @@
   </div>
 </template>
 <script>
-import { getSessionStorage } from '@/utils/auth';
-import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
+// import { getSessionStorage } from '@/utils/auth';
+// import { loginInfo, ProjectIcon } from '@/scripts/ProjectConfig';
 
 export default {
     data() {
@@ -19,11 +19,15 @@ export default {
         };
     },
     mounted() {
-        const project = getSessionStorage('project');
-        this.systemTitle = loginInfo[project].homeTitle || loginInfo[project].title;
-        this.logoImg = loginInfo[project].titleIcon || ProjectIcon[project];
-        this.navigationLogoWidth = loginInfo[project].navigationLogoWidth;
-        this.navigationMarginLeft = loginInfo[project].navigationMarginLeft;
+        // const project = getSessionStorage('project');
+        // this.systemTitle = loginInfo[project].homeTitle || loginInfo[project].title;
+        // this.logoImg = loginInfo[project].titleIcon || ProjectIcon[project];
+        // this.navigationLogoWidth = loginInfo[project].navigationLogoWidth;
+        // this.navigationMarginLeft = loginInfo[project].navigationMarginLeft;
+        this.systemTitle = this.$store.state.projectConfig.homeTitle;
+        this.logoImg = this.$store.state.projectConfig.loginProLogo;
+        this.navigationLogoWidth = this.$store.state.projectConfig.homeProLogoWidth + 'px';
+        this.navigationMarginLeft = '10px';
     },
     methods: {
         goToMain() {
@@ -43,12 +47,13 @@ export default {
     color: #fff;
     font-size:24px;
     font-weight:bold;
+    vertical-align: top;
 }
 .logo{
-    position: absolute;
+    // position: absolute;
     width: 40px;
     height: 40px;
-    top: 10px;
+    margin-top: 10px;
 }
     .logo_heb {
         position: absolute;
diff --git a/src/permission.js b/src/permission.js
index 3791279cf..60aa9e58a 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,34 +1,36 @@
 import Vue from 'vue';
 import store from '@/store/index';
 import router from './router/index';
-import {loginInfo, ProjectCode, localPackageProject} from '@/scripts/ProjectConfig';
+// import {loginInfo, ProjectCode, localPackageProject} from '@/scripts/ProjectConfig';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import { setToken, getToken, removeToken, getSessionStorage, setSessionStorage } from '@/utils/auth';
-import { getBaseUrlByProject } from '@/api/projectServer';
+// import { getBaseUrlByProject } from '@/api/projectServer';
 import localStore from 'storejs';
 import { handlerUrl } from '@/utils/baseUrl';
+import { getFrontProjectConfigByLogin} from '@/api/projectConfig';
 
-const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool', '/demo', '/thirdLogin']; // 不重定向白名单
+const whiteList = ['/login', '/design/login', '/loginNew', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool', '/demo', '/thirdLogin']; // 不重定向白名单
 
-const loginList = ['/login', '/design/login']; // 登陆页面
+const loginList = ['/login', '/design/login', '/loginNew']; // 登陆页面
 
-for (const val in loginInfo) {
-    if (loginInfo[val].loginPath && !whiteList.includes(loginInfo[val].loginPath)) {
-        whiteList.push(loginInfo[val].loginPath);
-    }
-}
+// for (const val in loginInfo) {
+//     if (loginInfo[val].loginPath && !whiteList.includes(loginInfo[val].loginPath)) {
+//         whiteList.push(loginInfo[val].loginPath);
+//     }
+// }
 
 // 登录路径判断获取
-function getRouteInfo(to) {
+function getRouteInfo(to, markKey) {
     let loginPath = '';
     const toRoutePath = to.redirectedFrom || to.path;
-    const current_session = getSessionStorage('project');
+    // const current_session = getSessionStorage('project');
     if (loginList.includes(toRoutePath)) { // 登陆页面清空 token
         removeToken();
     }
-    const localLogin = process.env.VUE_APP_PRO == 'local' || process.env.VUE_APP_PRO == 'ntyl';
-    loginPath = loginInfo[current_session] && !localLogin ? loginInfo[current_session].loginPath : whiteList[0];
+    //     const localLogin = process.env.VUE_APP_PRO == 'local' || process.env.VUE_APP_PRO == 'ntyl';
+    //     loginPath = loginInfo[current_session] && !localLogin ? loginInfo[current_session].loginPath : whiteList[0];
+    loginPath = markKey == 'login' ? '/login' : '/login?project=' + markKey;
     if (to.query.projectDevice && to.query.type && loginPath.includes('?')) {
         loginPath = `${loginPath}&projectDevice=${to.query.projectDevice}&type=${to.query.type}`;
     } else if (to.query.projectDevice && to.query.type) {
@@ -41,8 +43,8 @@ function handleRoute(to, next, loginPath) {
     if (store.getters.roles.length == 0) {
         store.dispatch('GetInfo', getToken()).then(res => {
             // 根据roles权限生成可访问的路由表
-            const roles = res.roles;
-            store.dispatch('GenerateRoutes', { roles }).then(() => {
+            // const roles = res.roles;
+            store.dispatch('GenerateRoutes', res).then(() => {
                 router.addRoutes(store.getters.addRouters); // 动态添加可访问路由表
                 if (to.redirectedFrom) {
                     next({ path: to.redirectedFrom, replace: true });
@@ -76,71 +78,84 @@ function subscribe() {
     }
 }
 router.beforeEach( async (to, from, next) => {
+    // 判断第三方登陆
     if (to.query.thirdJump) {
         setToken(to.query.key);
         setSessionStorage('project', to.query.project);
     }
-    let project = '';
+    let project;
+    // 登陆页面
     if (to.path.includes('login')) {
-        project = to.query.project;
-        const split = to.path.split('/')[1];
-        if (process.env.VUE_APP_PRO && process.env.VUE_APP_PRO !== 'local-test') {
-            project = localPackageProject[process.env.VUE_APP_PRO + split];
-        } else if (split == 'design') {
-            project = project ? split + project : split;
-        } else if (split == 'login') {
-            project = project || 'login';
-        } else {
-            project = split;
-        }
+        project = to.query.project || 'login';
     } else if (to.path.includes('thirdLogin')) {
+        // 第三方登陆页面
         project = to.query.project;
     } else {
-        project = getSessionStorage('project');
+        // 登陆成功页面
+        project = getSessionStorage('project') || 'login';
     }
-    if (!store.state.user.baseUrl && project && loginInfo[project]) {
-        try {
-            const resp = await getBaseUrlByProject(ProjectCode[project]);
-            const urlData = handlerUrl(resp.data);
-            store.dispatch('setBaseUrl', urlData.BASE_API);
-            store.dispatch('setResourcesUrl', urlData.VOICE_API);
-            store.dispatch('setUploadUrl', urlData.UPLOAD_API);
-            store.dispatch('setBaseSite', urlData.BASE_SITE);
-            subscribe();
-        } catch (e) {
+    // if (to.path.includes('login')) {
+    //     project = to.query.project;
+    //     const split = to.path.split('/')[1];
+    //     if (process.env.VUE_APP_PRO && process.env.VUE_APP_PRO !== 'local-test') {
+    //         project = localPackageProject[process.env.VUE_APP_PRO + split];
+    //     } else if (split == 'design') {
+    //         project = project ? split + project : split;
+    //     } else if (split == 'login') {
+    //         project = project || 'login';
+    //     } else {
+    //         project = split;
+    //     }
+    // } else if (to.path.includes('thirdLogin')) {
+    //     project = to.query.project;
+    // } else {
+    //     project = getSessionStorage('project');
+    // }
+    const response = await getFrontProjectConfigByLogin(project);
+    if (response.data) {
+        const {browserTitle, loginProLogo, baseApiUrl, baseSite, caseShow, helpShow, ossUrl, homeTitle, homeProLogoWidth} = response.data.viewSetting;
+        if (!store.state.user.baseUrl && project) {
             const urlData = handlerUrl();
-            store.dispatch('setBaseUrl', urlData.BASE_API);
-            console.error(e);
+            store.dispatch('setBaseUrl', baseApiUrl || urlData.BASE_API);
+            store.dispatch('setBaseSite', baseSite || urlData.BASE_SITE);
+            store.dispatch('setOssUrl', ossUrl || urlData.OSS_URL);
+            subscribe();
         }
-    }
-    document.title = loginInfo[project || 'login'] ? loginInfo[project || 'login'].browserTitle || loginInfo[project || 'login'].title : '';
-    NProgress.start();
-    const loginPath = getRouteInfo(to);
-    const token = to.query.token;
-
-    if (/demoTraining/.test(to.path) && token) {
-        const header = { group: to.query.group, 'X-Token': token };
-        setToken(token);
-        store.commit('SET_TOKEN', token);
-        store.commit('SUBSCRIBE', { header, type: '' });
-        next();
-    } else if (getToken()) {
-        if (to.path === loginPath) {
-            // 登录页面不拦截
+        document.title = browserTitle;
+        const url = loginProLogo ? store.state.user.ossUrl + '/logo/' + loginProLogo : '';
+        document.querySelector("link[rel*='icon']").href = url;
+        store.commit('setCaseShow', caseShow);
+        store.commit('setHelpShow', helpShow);
+        store.dispatch('setHomeProLogoWidth', homeProLogoWidth);
+        store.dispatch('setLoginProLogo', url);
+        store.dispatch('setHomeTitle', homeTitle);
+        NProgress.start();
+        const loginPath = getRouteInfo(to, response.data.markKey);
+        const token = to.query.token;
+        if (/demoTraining/.test(to.path) && token) {
+            const header = { group: to.query.group, 'X-Token': token };
+            setToken(token);
+            store.commit('SET_TOKEN', token);
+            store.commit('SUBSCRIBE', { header, type: '' });
             next();
+        } else if (getToken()) {
+            if (to.path === loginPath) {
+                // 登录页面不拦截
+                next();
+            } else {
+                // 进入系统重新计算路由
+                handleRoute(to, next, loginPath);
+            }
         } else {
-            // 进入系统重新计算路由
-            handleRoute(to, next, loginPath);
-        }
-    } else {
-        if (whiteList.indexOf(to.path) !== -1) {
-            // 在免登录白名单，直接进入
-            next();
-        } else if (to.path.substr(0, 13) == whiteList[2]) {
-            next();
-        } else {
-            // 否则全部重定向到登录页
-            next(loginPath);
+            if (whiteList.indexOf(to.path) !== -1) {
+                // 在免登录白名单，直接进入
+                next();
+            } else if (to.path.substr(0, 13) == whiteList[2]) {
+                next();
+            } else {
+                // 否则全部重定向到登录页
+                next(loginPath);
+            }
         }
     }
 });
diff --git a/src/router/index.js b/src/router/index.js
index bf24f13a2..9cfad9c8c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,6 +7,7 @@ Vue.use(Router);
 /* Layout */
 const Layout = () => import('@/layout');
 const Login = () => import('@/views/login/index');
+
 const Authorization = () => import('@/views/authorization/index');
 const AuthorApply = () => import('@/views/authorization/apply');
 const AuthorList = () => import('@/views/authorization/list');
@@ -38,15 +39,25 @@ const Jl3dTrainRescueVr = () => import('@/views/jlmap3d/maintainer/jl3dTrainResc
 const Jlmap3dOtherVR = () => import('@/views/jlmap3d/maintainer/jl3dothervr');
 // const Jl3dMaintainer = () => import('@/views/jlmap3d/maintainer/jl3dmaintainer');
 
-const DisplayNew = () => import('@/views/newMap/displayNew/index');
-const DisplayCity = () => import('@/views/newMap/displayCity/index');
-const DisplayBaSiDi = () => import('@/views/newMap/displayBaSiDi/index');
-const DesignDisplayNew = () => import('@/views/newMap/displayNew/scriptDisplay/scriptPreview/index');
+// const DesignDisplayNew = () => import('@/views/newMap/displayNew/scriptDisplay/scriptPreview/index');
+// const DisplayNew = () => import('@/views/newMap/displayNew/index');
+
+const Display = () => import('@/views/newMap/display/index');
+
+// const TrainingDesign = () => import('@/views/designPlatform/trainingDesign');
+// const TrainingPreview = () => import('@/views/designPlatform/trainingPreview');
+const TrainingDesign = () => import('@/views/organization/trainingDesign/index');
+const TrainingManage = () => import('@/views/organization/trainingManage/index');
+const TestRunplan = () => import('@/views/designPlatform/testRunplan');
+
 const PracticeDisplay = () => import('@/views/newMap/displayNew/practiceDisplay');
 const BigLPFStrategy = () => import('@/views/newMap/displayNew/bigLPFStrategy');
-const BigTrainRunplanManage = () => import('@/views/bigTrainRunplanManage/index');
 
-const JointTrainingNew = () => import('@/views/newMap/jointTrainingNew/index');
+const RunPlanViewWindow = () => import('@/views/newMap/displayNew/demon/runPlanViewWindow');
+const PlanScheduleWicket = () => import('@/views/newMap/displayNew/demon/planSchedule');
+// const DemoTraining = () => import('@/views/newMap/displayNew/demoTraining');
+
+const BigTrainRunplanManage = () => import('@/views/bigTrainRunplanManage/index');
 const jointTrainingNewCCTV = () => import('@/views/newMap/jointTrainingNew/realCCTV');
 
 const Errpr404 = () => import('@/views/error-page/404');
@@ -82,7 +93,7 @@ const NewDesignPlatformUser = () => import('@/views/newMap/newDesignUser/index')
 const Taskmanage = () => import('@/views/lesson/taskmanage/list');
 const TrainingRuleList = () => import('@/views/lesson/trainingRule/list');
 const TrainingRuleEdit = () => import('@/views/lesson/trainingRule/detail/index');
-const Trainingmanage = () => import('@/views/lesson/trainingmanage/index');
+const TrainingmanageOld = () => import('@/views/lesson/trainingmanage/index');
 const LessonEdit = () => import('@/views/lesson/lessoncategory/index');
 const LessonHome = () => import('@/views/lesson/home');
 const Lesson3d = () => import('@/views/lesson/lesson3d');
@@ -117,13 +128,13 @@ 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 TrainingDesign = () => import('@/views/designPlatform/trainingDesign');
-const TrainingPreview = () => import('@/views/designPlatform/trainingPreview');
-const TestRunplan = () => import('@/views/designPlatform/testRunplan');
 
-const Package = () => import('@/views/package/index');
+const SimulationPlatform = () => import('@/views/trainingPlatform/simulation');
 
 const PublishMap = () => import('@/views/publish/publishMap/index');
+const SubsystemManage = () => import('@/views/publish/publishMap/subsystem');
+const SystemSubsetManage = () => import('@/views/publish/publishMap/systemSubset');
+const IscsDataManage = () => import('@/views/publish/publishMap/iscsDataManage/index');
 const PublishMapDetail = () => import('@/views/publish/publishMap/list'); // 发布历史
 const PublishLesson = () => import('@/views/publish/publishLesson/index');
 const RunPlanTemplate = () => import('@/views/publish/runPlanTemplate/index');
@@ -161,10 +172,11 @@ const Approval = () => import('@/views/approval/index');
 const CompanyManage = () => import('@/views/system/companyManage/index');
 const QuestionsRuleManage = () => import('@/views/system/questionsRuleManage/index');
 const PreTheoryImport = () => import('@/views/competitionManage/bankList/preImport');
-const PlanScheduleWicket = () => import('@/views/newMap/displayNew/demon/planSchedule');
+
 const MessageBoard = () => import('@/views/messageBoard/index');
 const BoardManage = () => import('@/views/messageBoard/manage');
 const OrganizationManage = () => import('@/views/organization/index');
+const PersonalInfo = () => import('@/views/info/personalInfo');
 const OrgClassManage = () => import('@/views/organization/classManage/index');
 const OrgDraftLessonManage = () => import('@/views/organization/draftLessonManage/index');
 const OrgLessonManage = () => import('@/views/organization/lessonManage/index');
@@ -181,11 +193,10 @@ const StudentStatistics = () => import('@/views/organization/studentStatistics/i
 const CreateRule = () => import('@/views/organization/ruleManage/createRule');
 const TotalGrade = () => import('@/views/organization/ruleManage/totalGrade');
 const InfoLessonDetail = () => import('@/views/organization/lessonManage/lessonDetail');
-const RunPlanViewWindow = () => import('@/views/newMap/displayNew/demon/runPlanViewWindow');
+
 const SecondaryHome = () => import('@/views/trainingPlatform/secondaryHome');
 const Demo = () => import('@/views/demo');
 const MapGroup = () => import('@/views/publish/mapGroup/index');
-const DemoTraining = () => import('@/views/newMap/displayNew/demoTraining');
 const OrgDetail = () => import('@/views/system/companyManage/orgDetail');
 const VoiceTraining = () => import('@/views/system/voiceTraining/index');
 const SceneTrainingResult = () => import('@/views/drts/scene/trainingResult');
@@ -200,10 +211,25 @@ const UploadPdfList = () => import('@/views/uploadPdf/list');
 const ThirdLogin = () => import('@/views/thirdLogin');
 const ProjectServer = () => import('@/views/system/serverManage');
 const VoiceManage = () => import('@/views/fileManage/voiceManage');
+const ProjectManage = () => import('@/views/system/projectManage');
+const FrontProjectConfigManage = () => import('@/views/system/frontProjectConfigManage');
+const FrontResourceManage = () => import('@/views/system/frontResourceManage');
+
 const IscsDeviceManage = () => import('@/views/system/iscsDeviceManage');
 const IscsResourcesManage = () => import('@/views/system/iscsResourcesManage');
 
-const PisScreen = () => import('@/views/pis/index')
+const PisScreen = () => import('@/views/pis/index');
+
+const TransitionIndex = () => import('@/views/temporary/transitionIndex');
+const Temporary = () => import('@/views/temporary/index');
+const ThirdPartyAccounts = () => import('@/views/thirdPartyAccounts/index');
+
+const FunctionManage = () => import('@/views/functionManage/index');
+const PermissionManage = () => import('@/views/permissionManage/index');
+const UserRulesManage = () => import('@/views/userRulesManage/index');
+const AuthorityTransfer = () => import('@/views/authorityTransfer/index');
+const CreateDistribute = () => import('@/views/authorityTransfer/create/index');
+const ThirdJumpSim = () => import('@/views/newMap/display/thirdJump');
 
 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
@@ -266,11 +292,11 @@ export const constantRoutes = [
         component: ThirdLogin,
         hidden: true
     },
-    {
-        path: '/demoTraining/:mode',
-        component: DemoTraining,
-        hidden: true
-    },
+    // {
+    //     path: '/demoTraining/:mode',
+    //     component: DemoTraining,
+    //     hidden: true
+    // },
     // 实训平台登录
     {
         path: '/login',
@@ -421,6 +447,11 @@ export const constantRoutes = [
         hidden: true
 
     },
+    {
+        path: '/thirdJumpSim',
+        component: ThirdJumpSim,
+        hidden: true
+    },
     {
         path: '/404',
         component: Errpr404,
@@ -448,31 +479,27 @@ export const publicAsyncRoute = [
         component: IbpShow,
         hidden: true
     },
+
     {
-        path: '/displayNew/:mode',
-        component: DisplayNew,
-        hidden: true
-    },
-    {
-        path: '/displayCity/:mode',
-        component: DisplayCity,
-        hidden: true
-    },
-    {
-        path: '/displayBaSiDi/:mode',
-        component: DisplayBaSiDi,
-        hidden: true
-    },
-    {
-        path: '/design/displayNew/:mode',
-        component: DesignDisplayNew,
-        hidden: true
-    },
-    { // 剧本编辑 战场图
-        path: '/scriptDisplayNew/:mode',
-        component: DisplayNew,
+        path: '/display/:mode',
+        component: Display,
         hidden: true
     },
+    // {
+    //     path: '/displayNew/:mode',
+    //     component: DisplayNew,
+    //     hidden: true
+    // },
+    // {
+    //     path: '/design/displayNew/:mode',
+    //     component: DesignDisplayNew,
+    //     hidden: true
+    // },
+    // { // 剧本编辑 战场图
+    //     path: '/scriptDisplayNew/:mode',
+    //     component: DisplayNew,
+    //     hidden: true
+    // },
     {
         path: '/displayBigScreen/:mapId',
         component: BigScreen,
@@ -483,21 +510,6 @@ export const publicAsyncRoute = [
         component: BigSplitScreen,
         hidden: true
     },
-    { // 实训设计
-        path: '/trainingDesign',
-        component: TrainingDesign,
-        hidden: true
-    },
-    {
-        path: '/trainingPreview',
-        component: TrainingPreview,
-        hidden: true
-    },
-    {
-        path: '/jointTrainingNew',
-        component: JointTrainingNew,
-        hidden: true
-    },
     {
         path: '/jointTrainingNewCCTV',
         component: jointTrainingNewCCTV,
@@ -556,11 +568,11 @@ export const publicAsyncRoute = [
         component: PublishExamRule,
         hidden: true
     },
-    {
-        path: '/device/examRule/draft/:mode/:ruleId/:lessonId',
-        component: PublishExamRuleDraft,
-        hidden: true
-    },
+    // {
+    //     path: '/device/examRule/draft/:mode/:ruleId/:lessonId',
+    //     component: PublishExamRuleDraft,
+    //     hidden: true
+    // },
     { // 试卷详情
         path: '/device/exam/:examId',
         component: ExamDetail,
@@ -604,6 +616,11 @@ export const publicAsyncRoute = [
         component: Layout,
         hidden: true,
         children: [
+            {
+                path: 'personalInfo',
+                component: PersonalInfo,
+                hidden: true
+            },
             {	// 单位组织管理
                 path: 'organization',
                 component: OrganizationManage,
@@ -664,7 +681,7 @@ export const publicAsyncRoute = [
                 hidden: true
             },
             {
-                path: 'examRule/draft/:mode/:ruleId/:lessonId',
+                path: 'examRule/draft/:mode/:paperId',
                 component: PublishExamRuleDraft,
                 hidden: true
             },
@@ -722,6 +739,7 @@ export const asyncRouter = [
         meta: {
             roles: [admin, user]
         },
+        hidden: true,
         children: [
             {
                 path: '',
@@ -778,7 +796,7 @@ export const asyncRouter = [
                     },
                     { // 实训管理
                         path: 'lesson/trainingManage',
-                        component: Trainingmanage,
+                        component: TrainingmanageOld,
                         hidden: true
                     },
                     { // 创建课程
@@ -876,11 +894,11 @@ export const asyncRouter = [
                         component: PublishExamRule,
                         hidden: true
                     },
-                    { // 创建试卷
-                        path: 'examRule/draft/:mode/:ruleId/:lessonId',
-                        component: PublishExamRuleDraft,
-                        hidden: true
-                    },
+                    // { // 创建试卷
+                    //     path: 'examRule/draft/:mode/:ruleId/:lessonId',
+                    //     component: PublishExamRuleDraft,
+                    //     hidden: true
+                    // },
                     { // 购买
                         path: 'pay/:lessonId',
                         component: Pay,
@@ -891,9 +909,9 @@ export const asyncRouter = [
                         component: ExamResult,
                         hidden: true
                     },
-                    { // 线路权限列表
-                        path: 'permission/:mapId',
-                        component: Package,
+                    {
+                        path: 'simulation/:mapId',
+                        component: SimulationPlatform,
                         hidden: true
                     },
                     { // 二级home页面
@@ -912,6 +930,7 @@ export const asyncRouter = [
             i18n: 'router.pulishManage',
             roles: [admin]
         },
+        hidden: true,
         children: [
             { // 发布地图
                 path: 'map',
@@ -970,11 +989,11 @@ export const asyncRouter = [
                     i18n: 'router.examRuleManage'
                 }
             },
-            {
-                path: 'examRule/draft/:mode/:ruleId/:lessonId',
-                component: PublishExamRuleDraft,
-                hidden: true
-            },
+            // {
+            //     path: 'examRule/draft/:mode/:ruleId/:lessonId',
+            //     component: PublishExamRuleDraft,
+            //     hidden: true
+            // },
             { // 发布ibp盘
                 path: 'ibp',
                 component: PublishIBP,
@@ -1012,6 +1031,7 @@ export const asyncRouter = [
             i18n: 'router.orderAuthorityManage',
             roles: [admin]
         },
+        hidden: true,
         children: [
             {
                 path: 'author/manage',
@@ -1083,6 +1103,7 @@ export const asyncRouter = [
             i18n: 'router.systemManage',
             roles: [admin]
         },
+        hidden: true,
         children: [
             {
                 path: 'dictionary',
@@ -1294,6 +1315,7 @@ export const asyncRouter = [
             i18n: 'router.fileManage',
             roles: [admin]
         },
+        hidden: true,
         children: [
             {
                 path: 'list',
@@ -1329,6 +1351,20 @@ export const asyncRouter = [
                 meta: {
                     i18n: 'router.audioResourcesManage'
                 }
+            },
+            {
+                path:'projectManage',
+                component: ProjectManage,
+                meta: {
+                    i18n: 'router.projectManage'
+                }
+            },
+            {
+                path:'frontProjectConfigManage',
+                component: FrontProjectConfigManage,
+                meta: {
+                    i18n: 'router.frontProjectConfigManage'
+                }
             }
         ]
     },
@@ -1356,6 +1392,7 @@ export const asyncRouter = [
             i18n: 'router.newDesignUserPage',
             roles: [admin, user]
         },
+        hidden: true,
         children: [
             {
                 path: 'usermap',
@@ -1462,6 +1499,7 @@ export const asyncRouter = [
             i18n: 'router.raceManage',
             roles: [admin]
         },
+        hidden: true,
         children: [
             {
                 path: 'bank',
@@ -1500,6 +1538,643 @@ export const asyncRouter = [
                 hidden: true
             }
         ]
+    },
+    { // 新路由-仿真菜单
+        path: '/simulation',
+        component: Layout,
+        meta: {
+            i18n: 'newRouter.simulation',
+            roles: [user]
+        },
+        children: [
+            { // 仿真
+                path: 'simulationIndex',
+                component: TrainingPlatform,
+                // route: { path: '/simulation/trainingPlatform/detail' },
+                meta: {
+                    i18n: 'newRouter.simulation'
+                },
+                children: [
+                    {
+                        path: 'detail/:subSystem',
+                        component: DemonstrationDetail,
+                        meta: {},
+                        hidden: true
+                    }
+                ]
+            },
+            // { // 多人仿真
+            //     path: 'multiplayerSimulation',
+            //     // component: multiplayerSimulation,
+            //     meta: {
+            //         i18n: 'newRouter.multiplayerSimulation'
+            //     }
+            // },
+            { // 监管仿真
+                path: 'regulationSimulation',
+                component: ExistingSimulation,
+                companyAdmin: true,
+                meta: {
+                    i18n: 'newRouter.regulationSimulation'
+                }
+            }
+        ]
+    },
+    { // 新路由-教学管理菜单
+        path: '/teaching',
+        component: Layout,
+        companyAdmin: true,
+        meta: {
+            i18n: 'newRouter.teachingManagement',
+            roles: [admin, user]
+        },
+        children: [
+            {
+                path: 'organization',
+                component: OrganizationManage,
+                redirect: '/teaching/organization/classManage',
+                meta: {
+                    i18n: 'newRouter.teachingManagement'
+                },
+                children: [
+                    { // 班级管理
+                        path:'classManage',
+                        component: OrgClassManage,
+                        hidden: true
+                    },
+                    { // 学生管理
+                        path: 'studentManage',
+                        component: Temporary,
+                        hidden: true
+                    },
+                    // { // 实训教学管理
+                    //     path: 'trainingManage',
+                    //     component: Temporary,
+                    //     hidden: true
+                    // },
+                    { // 实训设计
+                        path: 'trainingDesign',
+                        component: TrainingDesign,
+                        hidden: true
+                    },
+                    { // 实训管理
+                        path: 'trainingManage',
+                        component: TrainingManage,
+                        hidden: true
+                    },
+                    { // 理论题目管理
+                        path: 'theoryManage',
+                        component: BankManage,
+                        hidden: true
+                    },
+                    { // 考试管理
+                        path: 'examManage',
+                        component: OrgExamManage,
+                        hidden: true
+                    }
+                ]
+            },
+            { // 理论题目管理-添加
+                path: 'questionCreate',
+                component: QuestionCreatePage,
+                hidden: true
+            },
+            { // 理论题目管理-编辑
+                path: 'questionUpdate/:questionId',
+                component: QuestionUpdatePage,
+                hidden: true
+            },
+            { // 理论题目管理-导入
+                path: 'preTheoryImport',
+                component: PreTheoryImport,
+                hidden: true
+            },
+            { // 出题规则管理
+                path: 'questionsRuleManage',
+                hidden: true,
+                component: QuestionsRuleManage
+            },
+            { // 用于实训教学管理部分
+                path: 'design',
+                component: DesignPlatform,
+                hidden: true,
+                meta: {
+                    i18n: 'router.designhomePage'
+                },
+                children: [
+                    {
+                        path: 'home',
+                        component: DesignPlatformHome,
+                        hidden: true
+                    },
+                    { // 运行图设计
+                        path: 'runPlan/detail/:mapId',
+                        component: PlanMonitorDetail,
+                        hidden: true
+                    },
+                    { // 剧本
+                        path: 'script/home/:mapId',
+                        component: ScriptmanageHome,
+                        hidden: true
+                    },
+                    { // 课程列表
+                        path: 'lesson/home/:mapId',
+                        component: LessonHome,
+                        hidden: true
+                    },
+                    { // 三维课程列表
+                        path: 'lesson/lesson3d',
+                        component: Lesson3d,
+                        hidden: true
+                    },
+                    { // 操作定义
+                        path: 'lesson/trainingRule',
+                        component: TrainingRuleList,
+                        hidden: true
+                    },
+                    { // 操作定义步骤
+                        path: 'lesson/trainingRule/detail',
+                        hidden: true,
+                        component: TrainingRuleEdit
+                    },
+                    { // 任务管理
+                        path: 'lesson/taskManage',
+                        component: Taskmanage,
+                        hidden: true
+                    },
+                    { // 实训管理
+                        path: 'lesson/trainingManage',
+                        component: TrainingmanageOld,
+                        hidden: true
+                    },
+                    { // 创建课程
+                        path: 'lesson/edit/:type',
+                        component: LessonEdit,
+                        hidden: true
+                    },
+                    { // 课程详情
+                        path: 'lesson/details',
+                        component: LessonDetail,
+                        hidden: true,
+                        children: [
+                            {
+                                path: 'edit/:type',
+                                component: LessonEdit,
+                                hidden: true
+                            }
+                        ]
+                    },
+                    { // 新版地图预览
+                        path: 'mapPreviewNew/:mapId',
+                        component: MapPreviewNew,
+                        hidden: true
+                    },
+                    {
+                        path: 'bigScreen/:mapId',
+                        component: BigScreen,
+                        hidden: true
+                    },
+                    { // ibp列表
+                        path: 'ibp/home/:mapId',
+                        component: IbpHome,
+                        hidden: true
+                    },
+                    {
+                        path: 'ibp/edit',
+                        component: IbpDraw,
+                        hidden: true
+                    }
+                ]
+            }
+        ]
+    },
+    { // 新路由-线路设计
+        path: '/lineDesign',
+        component: Layout,
+        meta: {
+            i18n: 'newRouter.lineDesign',
+            roles: [admin, mapCreater]
+        },
+        children: [
+            {
+                path: 'usermap',
+                redirect: '/lineDesign/usermap/home',
+                component: NewDesignPlatformUser,
+                meta: {
+                    i18n: 'newRouter.lineDesign'
+                },
+                children: [
+                    {
+                        path: 'home',
+                        component: DesignPlatformHome,
+                        hidden: true,
+                        meta: {
+                        }
+                    }
+                ]
+            },
+            { // 新地图绘制
+                path: 'usermap/map/draw/:mapId/:view',
+                component: NewMapDraft,
+                hidden: true
+            },
+            {
+                path: 'usermap/map/pictureDraw/:mapId/draft',
+                component: MapDraftPicture,
+                hidden: true
+            }
+        ]
+    },
+    { // 新路由-案例
+        path: '/case',
+        component: Layout,
+        meta: {
+            i18n: 'newRouter.case',
+            roles: [admin, user]
+        },
+        children: [
+            {
+                path: 'XRVTI',
+                target: 'https://joylink.club/oss/portal/cases/西安铁路职业技术学院.pdf',
+                // component: Case,
+                meta: {
+                    i18n: 'newRouter.XRVTI'
+                }
+            },
+            {
+                path: 'GEMVC',
+                target: 'https://joylink.club/oss/portal/cases/贵州装备制造职业学院机电技术专业实训室建设.pdf',
+                // component: Case,
+                meta: {
+                    i18n: 'newRouter.GEMVC'
+                }
+            },
+            {
+                path: 'JVCOEAI',
+                target: 'https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf',
+                // component: Case,
+                meta: {
+                    i18n: 'newRouter.JVCOEAI'
+                }
+            }
+        ]
+    },
+    { // 新路由-系统管理
+        path: '/systemManagement',
+        component: Layout,
+        meta: {
+            i18n: 'newRouter.SystemManagement',
+            roles: [admin]
+        },
+        children: [
+            { // 系统数据管理
+                path: 'systemDataManagement',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.SystemDataManagement'
+                },
+                children: [
+                    { // 数据字典
+                        path: 'dictionary',
+                        component: Dictionary,
+                        meta: {
+                            i18n: 'newRouter.dataDictionary'
+                        }
+                    },
+                    { // 系统账户管理
+                        path: 'userManage',
+                        component: UserControl,
+                        meta: {
+                            i18n: 'newRouter.SystemAccountManagement'
+                        }
+                    },
+                    { // 第三方账户配置
+                        path: 'ThirdPartyAccounts',
+                        component: ThirdPartyAccounts,
+                        meta: {
+                            i18n: 'newRouter.ThirdPartyAccounts'
+                        }
+                    },
+                    {
+                        // 组织管理
+                        path: 'companyManage',
+                        component: CompanyManage,
+                        meta: {
+                            i18n: 'newRouter.companyManage'
+                        }
+                    },
+                    { // 组织管理-组织结构
+                        path: 'orgDetail',
+                        component: OrgDetail,
+                        hidden: true
+                    }
+                ]
+            },
+            { // 在线信息管理
+                path: 'OnlineInformationManagement',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.OnlineInformationManagement'
+                },
+                children: [
+                    { // 在线用户
+                        path: 'loginUserManage',
+                        component: LoginUserControl,
+                        meta: {
+                            i18n: 'newRouter.loginUser'
+                        }
+                    },
+                    { // 缓存数据管理
+                        path: 'CacheControl',
+                        component: CacheControl,
+                        meta: {
+                            i18n: 'newRouter.cacheDataManage'
+                        }
+                    },
+                    { // 仿真管理
+                        path: 'existingSimulation',
+                        component: ExistingSimulation,
+                        meta: {
+                            i18n: 'newRouter.simulationManage'
+                        }
+                    }
+                ]
+            },
+            // { // 组织用户管理
+            //     path: 'companyUserManage',
+            //     component: TransitionIndex,
+            //     meta: {
+            //         i18n: 'newRouter.companyUserManage'
+            //     },
+            //     children: [
+            //         {
+            //             // 组织管理
+            //             path: 'companyManage',
+            //             component: CompanyManage,
+            //             meta: {
+            //                 i18n: 'newRouter.companyManage'
+            //             }
+            //         },
+            //         {
+            //             // 用户管理
+            //             path: 'userManage',
+            //             component: UserControl,
+            //             meta: {
+            //                 i18n: 'newRouter.companyUserManage'
+            //             }
+            //         },
+            //         { // 组织管理-组织结构
+            //             path: 'orgDetail',
+            //             component: OrgDetail,
+            //             hidden: true
+            //         }
+            //     ]
+            // },
+            { // 线路数据管理
+                path: 'lineDataManage',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.lineDataManage'
+                },
+                children: [
+                    {
+                        // 线路类型管理
+                        path: 'lineTypeManage',
+                        component: configLine,
+                        meta: {
+                            i18n: 'newRouter.lineTypeManage'
+                        }
+                    },
+                    {
+                        // 线路数据管理
+                        path: 'lineDataManage',
+                        component: PublishMap,
+                        meta: {
+                            i18n: 'newRouter.lineDataManage'
+                        }
+                    },
+                    {
+                        // 线路分组管理
+                        path: 'userManage',
+                        component: MapGroup,
+                        meta: {
+                            i18n: 'newRouter.linePacketManage'
+                        }
+                    },
+                    {
+                        path: 'subsystem',
+                        component: SubsystemManage,
+                        hidden: true
+                    },
+                    {
+                        path: 'systemSubset',
+                        component: SystemSubsetManage,
+                        hidden: true
+                    },
+                    {
+                        path: 'PublishMapDetail',
+                        component: PublishMapDetail,
+                        hidden: true
+                    },
+                    {
+                        path: 'iscsData',
+                        component: IscsDataManage,
+                        hidden: true
+                    },
+                    { // 加载计划运行图管理
+                        path: 'runPlanCommon',
+                        component: RunPlanCommon,
+                        hidden: true
+                    },
+                    { // 新增加载运行图
+                        path: 'runPlanCommon/:mode',
+                        component: RunPlanCommonDraft,
+                        hidden: true
+                    },
+                    { // 模板运行图管理
+                        path: 'runPlanTemplate',
+                        component: RunPlanTemplate,
+                        hidden: true
+                    },
+                    { // 每日运行图管理
+                        path: 'runPlanEveryDay',
+                        component: RunPlanEveryDay,
+                        hidden: true
+                    },
+                    { // 运行图预览
+                        path: 'runPlanView/:mode',
+                        component: RunplanView,
+                        hidden: true
+                    },
+                    { // 发布IBP数据
+                        path: 'publishIbp',
+                        component: PublishIBP,
+                        hidden: true
+                    },
+                    { // 发布ISCS数据
+                        path: 'publishIscs',
+                        component: PublishISCS,
+                        hidden: true
+                    }
+                ]
+            },
+            { // 教学数据管理
+                path: 'teachingDataManage',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.teachingDataManage'
+                },
+                children: [
+                    {
+                        // 理论题数据管理
+                        path: 'theoryData',
+                        component: BankManage,
+                        meta: {
+                            i18n: 'newRouter.theoryData'
+                        }
+                    },
+                    {
+                        // 实训数据管理
+                        path: 'trainingDataManage',
+                        component: TrainingManage,
+                        meta: {
+                            i18n: 'newRouter.trainingDataManage'
+                        }
+                    },
+                    {
+                        // 考试数据管理
+                        path: 'examData',
+                        component: OrgExamManage,
+                        meta: {
+                            i18n: 'newRouter.examData'
+                        }
+                    },
+                    {
+                        // 用户实训数据管理
+                        path: 'userTrainingDataManage',
+                        component: UserTraining,
+                        meta: {
+                            i18n: 'newRouter.userTrainingDataManage'
+                        }
+                    },
+                    {
+                        // 用户考试数据管理
+                        path: 'userExamData',
+                        component: UserExam,
+                        meta: {
+                            i18n: 'newRouter.userExamData'
+                        }
+                    }
+                ]
+            },
+            { // 项目数据管理
+                path: 'projectDataManage',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.projectDataManage'
+                },
+                children: [
+                    {
+                        // 项目管理
+                        path: 'projectManage',
+                        component: ProjectManage,
+                        meta: {
+                            i18n: 'newRouter.projectManage'
+                        }
+                    },
+                    {
+                        // 项目客户端配置
+                        path: 'projectConfig',
+                        component: FrontProjectConfigManage,
+                        meta: {
+                            i18n: 'newRouter.projectConfig'
+                        }
+                    },
+                    {
+                        // 项目设备管理
+                        path: 'projectDeviceManage',
+                        component: DeviceManage,
+                        meta: {
+                            i18n: 'newRouter.projectDeviceManage'
+                        }
+                    }
+                ]
+            },
+            { // 权限数据管理
+                path: 'permissionDataManage',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.permissionDataManage'
+                },
+                children: [
+                    {
+                        // 功能管理
+                        path: 'functionManage',
+                        component: FunctionManage,
+                        meta: {
+                            i18n: 'newRouter.functionManage'
+                        }
+                    },
+                    {
+                        // 权限管理
+                        path: 'permissionManage',
+                        component: PermissionManage,
+                        meta: {
+                            i18n: 'newRouter.permissionManage'
+                        }
+                    },
+                    {
+                        // 权限分发管理
+                        path: 'authorityTransferManage',
+                        component: AuthorityTransfer,
+                        // component: Permission,
+                        meta: {
+                            i18n: 'newRouter.authorityTransferManage'
+                        }
+                    },
+                    {
+                        // 用户权限管理
+                        path: 'userRulesManage',
+                        component: UserRulesManage,
+                        // component: UserRules,
+                        meta: {
+                            i18n: 'newRouter.userRulesManage'
+                        }
+                    },
+                    {
+                        // 权限分发管理-创建
+                        path: 'createDistribute',
+                        component: CreateDistribute,
+                        hidden: true
+                    }
+                ]
+            },
+            { // 文件管理
+                path: 'fileManage',
+                component: TransitionIndex,
+                meta: {
+                    i18n: 'newRouter.fileManage'
+                },
+                children: [
+                    {
+                        // 前端资源管理
+                        path: 'frontResourceManage',
+                        component: FrontResourceManage,
+                        meta: {
+                            i18n: 'newRouter.frontResourceManage'
+                        }
+                    },
+                    {
+                        // ISCS预录管理
+                        path: 'iscsPrerecordManage',
+                        component: IscsResourcesManage,
+                        meta: {
+                            i18n: 'newRouter.iscsPrerecordManage'
+                        }
+                    }
+                ]
+            }
+        ]
     }
 ];
 /* merge 是否再路由处理中与asyncRouter进行合并 mergeIndex合并进入asyncRouter【mergeIndex】  慎重调整asyncRouter顺序 */
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index c54106158..97b050e6e 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -1,277 +1,463 @@
 export default {
-  ConstSelect: {
-    Status: [{ label: '无效', value: '0' }, { label: '有效', value: '1' }],
+    ConstSelect: {
+        Status: [{ label: '无效', value: '0' }, { label: '有效', value: '1' }],
 
-    Whether: [{ label: '否', value: false }, { label: '是', value: true }],
+        Whether: [{ label: '否', value: false }, { label: '是', value: true }],
 
-    DirectionCodeList: [{ value: '2', label: '上行' }, { value: '1', label: '下行' }],
+        DirectionCodeList: [{ value: '2', label: '上行' }, { value: '1', label: '下行' }],
 
-    SignalLeftOrRightList: [{ label: '左侧', value: 'L' }, { label: '右侧', value: 'R' }],
+        SignalLeftOrRightList: [{ label: '左侧', value: 'L' }, { label: '右侧', value: 'R' }],
 
-    roleList: [
-      { label: '实训用户', value: '01' },
-      { label: '地图生产者', value: '02' },
-      { label: '课程生成者', value: '03' },
-      { label: '系统管理员', value: '04' },
-      { label: '超级管理员', value: '05' },
-      { label: '销售用户', value: '06' },
-    ],
+        roleList: [
+            { label: '实训用户', value: '01' },
+            { label: '地图生产者', value: '02' },
+            { label: '课程生成者', value: '03' },
+            { label: '系统管理员', value: '04' },
+            { label: '超级管理员', value: '05' },
+            { label: '销售用户', value: '06' }
+        ],
 
-    examResultList: [
-      { label: '未计算', value: '01' },
-      { label: '通过', value: '02' },
-      { label: '未通过', value: '03' },
-      { label: '已放弃', value: '04' },
-    ],
+        schoolRoleList: [
+            { label: '管理员', value: 'Admin' },
+            { label: '教师', value: 'Teacher' },
+            { label: '学生', value: 'Student' }
+        ],
 
-    PermissionUseList: [{ label: '公用', value: true }, { label: '专用', value: false }],
+        examResultList: [
+            { label: '未计算', value: '01' },
+            { label: '通过', value: '02' },
+            { label: '未通过', value: '03' },
+            { label: '已放弃', value: '04' }
+        ],
 
-    RegionTypeList: [
-      { label: '零点西上行', value: '01' },
-      { label: '零点西下行', value: '02' },
-      { label: '零西渡线/', value: '03' },
-      { label: '零西渡线\\', value: '04' },
-      { label: 'PGY一联段线', value: '05' },
-      { label: '零点东上行', value: '06' },
-      { label: '零点东下行', value: '07' },
-      { label: '零东渡线/', value: '08' },
-      { label: '零东渡线\\', value: '09' },
-      { label: '库线1', value: '10' },
-      { label: '库线2', value: '11' },
-      { label: '库线渡线/', value: '12' },
-      { label: '库线渡线\\', value: '13' },
-      { label: '联络线1', value: '14' },
-      { label: '联络线2', value: '15' },
-      { label: 'SHZ一联段线', value: '16' },
-      { label: 'SHZ二联段线', value: '17' },
-      { label: 'SHD三联段线', value: '18' },
-      { label: 'SHD四联段线', value: '19' },
-    ],
-    roleTypeNew: [
-      { label: '管理员', value: 'ADMIN', enLabel: 'Admin ' },
-      { label: '教员', value: 'Instructor', enLabel: 'Instructor ' },
-      { label: '行值', value: 'STATION_SUPERVISOR', enLabel: 'Attendant ' },
-      { label: '观众', value: 'AUDIENCE', enLabel: 'Audience ' },
-      { label: '司机', value: 'DRIVER', enLabel: 'Driver ' },
-      { label: '通号', value: 'MAINTAINER', enLabel: 'Repairman ' },
-      { label: '车辆段信号楼', value: 'DEPOT_DISPATCHER', enLabel: 'Depot dispatcher ' },
-      { label: '电力调度', value: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher' },
-      { label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher ' },
-      { label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department' },
-      { label: '停车场信号楼', value: 'PARKING_LOT_SIGNAL_BUILDING', enLabel: 'Parking Signal Building' },
-      { label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant' },
-      { label: '车站站长', value: 'STATION_MASTER', enLabel: 'StationMaster' },
-      { label: '车站信号员', value: 'STATION_SIGNALER', enLabel: 'StationSignaler' },
-      { label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger' },
-      { label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan' },
-      { label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator' },
-      { label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker' },
-      { label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager' },
-      { label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master' },
-    ],
+        PermissionUseList: [{ label: '公用', value: true }, { label: '专用', value: false }],
 
-    releaseReview: [
-      { enlabel: 'Unpublished', label: '未发布', value: '0' },
-      { enlabel: 'Pending review', label: '待审核', value: '1' },
-      { enlabel: 'Successfully released', label: '发布成功', value: '2' },
-      { enlabel: 'Overrule', label: '被驳回', value: '3' },
-    ],
-    productType: [
-      { enlabel: 'Lesson System', label: '教学系统', value: 'Lesson' },
-      { enlabel: 'Exam System', label: '考试系统', value: 'Exam' },
-      { enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation' },
-      { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan' },
-    ],
-    customeredProductType: [{ enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan' }],
+        RegionTypeList: [
+            { label: '零点西上行', value: '01' },
+            { label: '零点西下行', value: '02' },
+            { label: '零西渡线/', value: '03' },
+            { label: '零西渡线\\', value: '04' },
+            { label: 'PGY一联段线', value: '05' },
+            { label: '零点东上行', value: '06' },
+            { label: '零点东下行', value: '07' },
+            { label: '零东渡线/', value: '08' },
+            { label: '零东渡线\\', value: '09' },
+            { label: '库线1', value: '10' },
+            { label: '库线2', value: '11' },
+            { label: '库线渡线/', value: '12' },
+            { label: '库线渡线\\', value: '13' },
+            { label: '联络线1', value: '14' },
+            { label: '联络线2', value: '15' },
+            { label: 'SHZ一联段线', value: '16' },
+            { label: 'SHZ二联段线', value: '17' },
+            { label: 'SHD三联段线', value: '18' },
+            { label: 'SHD四联段线', value: '19' }
+        ],
+        roleTypeNew: [
+            { label: '管理员', value: 'ADMIN', enLabel: 'Admin ' },
+            { label: '教员', value: 'Instructor', enLabel: 'Instructor ' },
+            { label: '行值', value: 'STATION_SUPERVISOR', enLabel: 'Attendant ' },
+            { label: '观众', value: 'AUDIENCE', enLabel: 'Audience ' },
+            { label: '司机', value: 'DRIVER', enLabel: 'Driver ' },
+            { label: '通号', value: 'MAINTAINER', enLabel: 'Repairman ' },
+            { label: '车辆段/停车场调度', value: 'DEPOT_DISPATCHER', enLabel: 'Depot dispatcher ' },
+            { label: '电力调度', value: 'ELECTRIC_DISPATCHER', enLabel: 'Electric dispatcher' },
+            { label: '行调', value: 'DISPATCHER', enLabel: 'Dispatcher ' },
+            { label: '上级部门', value: 'PARENT_DEPARTMENT', enLabel: 'Parent department' },
+            { label: '车辆段/停车场信号楼', value: 'SIGNAL_BUILDING', enLabel: 'Signal Building' },
+            { label: '车站助理', value: 'STATION_ASSISTANT', enLabel: 'StationAssistant' },
+            { label: '车站站长', value: 'STATION_MASTER', enLabel: 'StationMaster' },
+            { label: '车站信号员', value: 'STATION_SIGNALER', enLabel: 'StationSignaler' },
+            { label: '车站客运员', value: 'STATION_PASSENGER', enLabel: 'StationPassenger' },
+            { label: '车站扳道员', value: 'STATION_SWITCH_MAN', enLabel: 'StationSwitchMan' },
+            { label: '车站引导员', value: 'STATION_FACILITATOR', enLabel: 'StationFacilitator' },
+            { label: '车站工务工', value: 'STATION_WORKER', enLabel: 'StationWorker' },
+            { label: '设备管理员', value: 'DEVICE_MANAGER', enLabel: 'DeviceManager' },
+            { label: '车务段段长', value: 'TRAIN_MASTER', enLabel: 'Train_Master' }
+        ],
+        roleTypeList: [
+            {label: '行调', value: 'DISPATCHER'},
+            {label: '行值', value: 'STATION_SUPERVISOR'},
+            {label: '司机', value: 'DRIVER'},
+            {label: '通号', value: 'MAINTAINER'},
+            {label: '车辆段/停车场调度', value: 'DEPOT_DISPATCHER'},
+            {label: '车辆段/停车场信号楼', value: 'SIGNAL_BUILDING'},
+            {label: '车站助理', value: 'STATION_ASSISTANT'},
+            {label: '车站站长', value: 'STATION_MASTER'},
+            {label: '车站信号员', value: 'STATION_SIGNALER'},
+            {label: '车站客运员', value: 'STATION_PASSENGER'},
+            {label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
+            {label: '车站引导员', value: 'STATION_FACILITATOR'},
+            {label: '车站工务工', value: 'STATION_WORKER'},
+            {label: '车务段段长', value: 'TRAIN_MASTER'},
+            {label: '工电调度', value: 'ELECTRIC_DISPATCHER'},
+            {label: '上级部分', value: 'PARENT_DEPARTMENT'},
+            {label: '派班员', value: 'SCHEDULING'},
+            {label: '设备管理员', value: 'DEVICE_MANAGER'},
+            {label: '值班主任', value: 'SHIFT_MANAGER'},
+            {label: '环控调度', value: 'ENVIRONMENT_DISPATCHER'}
+        ],
+        releaseReview: [
+            { enlabel: 'Unpublished', label: '未发布', value: '0' },
+            { enlabel: 'Pending review', label: '待审核', value: '1' },
+            { enlabel: 'Successfully released', label: '发布成功', value: '2' },
+            { enlabel: 'Overrule', label: '被驳回', value: '3' }
+        ],
+        productType: [
+            { enlabel: 'Lesson System', label: '教学系统', value: 'Lesson' },
+            { enlabel: 'Exam System', label: '考试系统', value: 'Exam' },
+            { enlabel: 'Simulation System', label: '仿真系统', value: 'Simulation' },
+            { enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan' }
+        ],
+        customeredProductType: [{ enlabel: 'Plan Draw', label: '运行图编制', value: 'Plan' }],
 
-    controlMode: [
-      { label: '中控', value: 'OperateCenterControl' },
-      { label: '站控', value: 'LocalStationControl' },
-      { label: '紧急站控', value: 'EmergencyStationControl' },
-      { label: '联锁控', value: 'InterlockStationControl' },
-    ],
+        controlMode: [
+            { label: '中控', value: 'OperateCenterControl' },
+            { label: '站控', value: 'LocalStationControl' },
+            { label: '紧急站控', value: 'EmergencyStationControl' },
+            { label: '联锁控', value: 'InterlockStationControl' }
+        ],
 
-    simulationRole: [
-      { label: '行调操作', value: 'Center' },
-      { label: '现地操作', value: 'Local' },
-      { label: '车辆段操作', value: 'Depot_IL' },
-    ],
+        simulationRole: [
+            { label: '行调操作', value: 'Center' },
+            { label: '现地操作', value: 'Local' },
+            { label: '车辆段操作', value: 'Depot_IL' }
+        ],
 
-    deviceTypeList: [
-      { label: '区段', value: 'Section' },
-      { label: '道岔', value: 'Switch' },
-      { label: '信号机', value: 'Signal' },
-      { label: '站台', value: 'Stand' },
-      { label: '车站', value: 'Station' },
-      { label: '控制模式', value: 'ControlConvertMenu' },
-      { label: '车次窗', value: 'TrainWindow' },
-      { label: '全线限速', value: 'LimitControl' },
-      { label: '司机', value: 'Driver' },
-      { label: '列车', value: 'Train' },
-      { label: '方向杆', value: 'DirectionRod' },
-      { label: 'CTC', value: 'CTC' },
-      { label: '路票', value: 'RAIL' },
-      { label: '会话', value: 'Conversation' },
-    ],
+        deviceTypeList: [
+            { label: '区段', value: 'Section' },
+            { label: '道岔', value: 'Switch' },
+            { label: '信号机', value: 'Signal' },
+            { label: '站台', value: 'Stand' },
+            { label: '车站', value: 'Station' },
+            { label: '控制模式', value: 'ControlConvertMenu' },
+            { label: '车次窗', value: 'TrainWindow' },
+            { label: '全线限速', value: 'LimitControl' },
+            { label: '司机', value: 'Driver' },
+            { label: '列车', value: 'Train' },
+            { label: '方向杆', value: 'DirectionRod' },
+            { label: 'CTC', value: 'CTC' },
+            { label: '路票', value: 'RAIL' },
+            { label: '会话', value: 'Conversation' }
+        ],
 
-    simulationDeviceList: [
-      { label: '区段', value: 'SECTION' },
-      { label: '计轴器', value: 'AXLE_COUNTER' },
-      { label: '道岔', value: 'SWITCH' },
-      { label: '信号机', value: 'SIGNAL' },
-      { label: '车站', value: 'STATION' },
-      { label: '站台', value: 'STAND' },
-      { label: '屏蔽门', value: 'PSD' },
-      { label: '紧急停车按钮', value: 'ESP' },
-      { label: '区域控制器', value: 'ZC' },
-      { label: '线路控制器', value: 'LC' },
-      { label: '进路', value: 'ROUTE' },
-      { label: '进路延续保护', value: 'OVERLAP' },
-      { label: '自动信号', value: 'AUTO_SIGNAL' },
-      { label: '自动折返', value: 'CYCLE' },
-      { label: '列车', value: 'TRAIN' },
-      { label: '列车门', value: 'TRAIN_DOOR' },
-      { label: '交路', value: 'ROUTING' },
-      { label: '站间运行等级', value: 'RUN_LEVEL' },
-    ],
-    QuestionTypeList: [
-      { label: '选择题', value: 'select' },
-      { label: '判断题', value: 'judge' },
-      { label: '多选题', value: 'multi' },
-      { label: '填空题', value: 'fill' },
-      { label: '问答题', value: 'answer' },
-    ],
-    // 新版的产品类型枚举
-    prdType: [
-      { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: '01' },
-      { enlabel: 'ATS Traffic dispatching workstation', label: 'ATS行调工作站', value: '02' },
-      { enlabel: 'Comprehensive exercise cloud platform', label: '综合演练云平台', value: '03' },
-      { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04' },
-      { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05' },
-      { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06' },
-      { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' },
-      { enlabel: 'Large screen vehicle real workstation', label: '应急调度指挥系统', value: '10' },
-    ],
-    trainingDeviceType: {
-      Switch: { enlabel: 'Switch training', label: '道岔实训' },
-      Section: { enlabel: 'Section training', label: '区段实训' },
-      Signal: { enlabel: 'Signal training', label: '信号机实训' },
-      Stand: { enlabel: 'Stand training', label: '站台实训' },
-      Station: { enlabel: 'Station training', label: '车站实训' },
-      Train: { enlabel: 'Train training', label: '列车实训' },
-      ControlConvertMenu: { enlabel: 'Control mode training', label: '控制模式实训' },
-      LimitControl: { enlabel: 'Control mode limit', label: '全线限速实训' },
-      TrainWindow: { enlabel: 'TrainWindow training', label: '车次窗实训' },
-      Driver: { enlabel: 'Driver training', label: '司机实训' },
-      DirectionRod: { enlabel: 'Direction rod training', label: '方向杆实训' },
-    },
-    interfaceErrorConfig: {
-      '500000': { type: '权限错误:', message: '您尚未有该操作权限！' },
-      '500004': { type: '权限错误:', message: '您剩余的权限数量不足！' },
-      '500005': { type: '权限错误:', message: '您的权限时间已过！' },
-      '500006': { type: '权限错误:', message: '您已经领取，不能重复领取！' },
-      '500007': { type: '权限错误:', message: '剩余分发权限数量不足！' },
-      '500010': { type: '支付错误:', message: '微信统一支付调用失败！' },
-    },
-    projectDeviceTypeList: [
-      { label: '道岔', value: 'SWITCH' },
-      { label: '信号机', value: 'SIGNAL' },
-      { label: '屏蔽门', value: 'PSD' },
-      { label: 'IBP盘', value: 'IBP' },
-      { label: '虚拟IBP盘', value: 'VR_IBP' },
-      { label: '教员机', value: 'IM' },
-      { label: '行调工作站', value: 'CW' },
-      { label: '现地工作站', value: 'LW' },
-      { label: '大屏工作站', value: 'LSW' },
-      { label: '列车驾驶终端', value: 'DRIVE' },
-      { label: '虚拟站台屏蔽门终端', value: 'VR_PSD' },
-      { label: '现地综合监控', value: 'ISCS_LW' },
-      { label: '中心综合监控', value: 'ISCS_CW' },
-      { label: '车辆段终端', value: 'DEPOT' },
-      { label: '派班工作站', value: 'SCHEDULING' },
-      { label: '虚拟CCTV', value: 'CCTV' },
-      { label: 'PLC网关', value: 'PLC_GATEWAY' },
-      { label: '端头控制盒', value: 'PSL' },
-      { label: 'PSC控制柜', value: 'PSC' },
-      { label: '虚拟电子沙盘', value: 'SANDBOX' },
-      { label: '联锁工作站', value: 'ILW' },
-      { label: 'UDP下位机', value: 'UDP_LOW' },
-      { label: '区段', value: 'SECTION' },
-      { label: '列车', value: 'TRAIN' },
-      { label: 'UDP客户端', value: 'UDP_CLIENT' },
-      { label: '站台PIS', value: 'PIS_STAND' },
-      { label: '列车PIS', value: 'PIS_TRAIN' },
-    ],
-    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' },
-    ],
-    responderTypeList: [{ name: '固定应答器', value: 'FB' }, { name: '可变应答器', value: 'VB' }, { name: '填充应答器', value: 'IB' }],
-    loadRuleList: [
-      { label: '每日加载', value: 'EVERY_DAY' },
-      { label: '周内加载', value: 'WITHIN_A_WEEK' },
-      { label: '周末加载', value: 'WEEKEND' },
-    ],
-    turnBackTypeList: [
-      { label: '无折返', value: 'NONE' },
-      { label: '默认', value: 'DEFAULT' },
-      { label: '自动换端', value: 'AUTO' },
-      { label: '无人折返', value: 'UNMANNED' },
-    ],
-    directionLabelList: [
-      { label: 'X', value: 'X' },
-      { label: 'XF', value: 'XF' },
-      { label: 'XD', value: 'XD' },
-      { label: 'S', value: 'S' },
-      { label: 'SF', value: 'SF' },
-      { label: 'SD', value: 'SD' },
-    ],
-    trainingType: [
-      // 实训类型
-      { enlabel: 'single operation', label: '单操', value: 'SINGLE' },
-      { enlabel: 'scene operation', label: '场景', value: 'SCENE' },
-    ],
-    ioDirectionList: [
-      // 出入口类型
-      { value: 'DOWN_IN_STATION', label: '下行进站' },
-      { value: 'UP_IN_STATION', label: '上行进站' },
-      { value: 'DOWN_OUT_STATION', label: '下行出站' },
-      { value: 'UP_OUT_STATION', label: '上行出站' },
-      { value: 'BOTH_WAY_STATION', label: '双向' },
-    ],
-    conditionList: [{ label: '标识状态', value: 'S' }, { label: '表达式', value: 'E' }, { label: '代表值', value: 'V' }],
-    operationList: [
-      { label: '且', value: 'AND' },
-      { label: '或', value: 'OR' },
-      { label: '非', value: 'NOT' },
-      { label: '是', value: 'IS' },
-      { label: '等于', value: 'EQ' },
-      { label: '不等于', value: 'NEQ' },
-      { label: '大于', value: 'GT' },
-      { label: '大于等于', value: 'GTOE' },
-      { label: '小于', value: 'LT' },
-      { label: '小于等于', value: 'LTOE' },
-    ],
-    operationDeviceList: [
-      { label: '区段', value: 'Section' },
-      { label: '道岔', value: 'Switch' },
-      { label: '信号机', value: 'Signal' },
-      { label: '站台', value: 'StationStand' }, // Stand
-      { label: '车站', value: 'Station' },
-      { label: '进路', value: 'Route' },
-      { label: '列车', value: 'Train' },
-      { label: '自动闭塞', value: 'StationDirectionAuto' },
-      { label: '半自动闭塞', value: 'StationDirectionSemi' },
-    ],
-  },
-}
+        simulationDeviceList: [
+            { label: '区段', value: 'SECTION' },
+            { label: '计轴器', value: 'AXLE_COUNTER' },
+            { label: '道岔', value: 'SWITCH' },
+            { label: '信号机', value: 'SIGNAL' },
+            { label: '车站', value: 'STATION' },
+            { label: '站台', value: 'STAND' },
+            { label: '屏蔽门', value: 'PSD' },
+            { label: '紧急停车按钮', value: 'ESP' },
+            { label: '区域控制器', value: 'ZC' },
+            { label: '线路控制器', value: 'LC' },
+            { label: '进路', value: 'ROUTE' },
+            { label: '进路延续保护', value: 'OVERLAP' },
+            { label: '自动信号', value: 'AUTO_SIGNAL' },
+            { label: '自动折返', value: 'CYCLE' },
+            { label: '列车', value: 'TRAIN' },
+            { label: '列车门', value: 'TRAIN_DOOR' },
+            { label: '交路', value: 'ROUTING' },
+            { label: '站间运行等级', value: 'RUN_LEVEL' }
+        ],
+        QuestionTypeList: [
+            { label: '选择题', value: 'select' },
+            { label: '判断题', value: 'judge' },
+            { label: '多选题', value: 'multi' },
+            { label: '填空题', value: 'fill' },
+            { label: '问答题', value: 'answer' }
+        ],
+        // 新版的产品类型枚举
+        prdType: [
+            { enlabel: 'ATS local workstation', label: 'ATS现地工作站', value: '01' },
+            { enlabel: 'ATS Traffic dispatching workstation', label: 'ATS行调工作站', value: '02' },
+            { enlabel: 'Comprehensive exercise cloud platform', label: '综合演练云平台', value: '03' },
+            { enlabel: 'Driver simulation driving system', label: '司机模拟驾驶系统', value: '04' },
+            { enlabel: 'Dispatch workstation', label: '派班工作站', value: '05' },
+            { enlabel: 'ISCS workstation', label: 'ISCS工作站', value: '06' },
+            { enlabel: 'Interlocking station at depot', label: '车辆段联锁工作站', value: '09' },
+            { enlabel: 'Large screen vehicle real workstation', label: '应急调度指挥系统', value: '10' }
+        ],
+        trainingDeviceType: {
+            Switch: { enlabel: 'Switch training', label: '道岔实训' },
+            Section: { enlabel: 'Section training', label: '区段实训' },
+            Signal: { enlabel: 'Signal training', label: '信号机实训' },
+            Stand: { enlabel: 'Stand training', label: '站台实训' },
+            Station: { enlabel: 'Station training', label: '车站实训' },
+            Train: { enlabel: 'Train training', label: '列车实训' },
+            ControlConvertMenu: { enlabel: 'Control mode training', label: '控制模式实训' },
+            LimitControl: { enlabel: 'Control mode limit', label: '全线限速实训' },
+            TrainWindow: { enlabel: 'TrainWindow training', label: '车次窗实训' },
+            Driver: { enlabel: 'Driver training', label: '司机实训' },
+            DirectionRod: { enlabel: 'Direction rod training', label: '方向杆实训' }
+        },
+        interfaceErrorConfig: {
+            '500000': { type: '权限错误:', message: '您尚未有该操作权限！' },
+            '500004': { type: '权限错误:', message: '您剩余的权限数量不足！' },
+            '500005': { type: '权限错误:', message: '您的权限时间已过！' },
+            '500006': { type: '权限错误:', message: '您已经领取，不能重复领取！' },
+            '500007': { type: '权限错误:', message: '剩余分发权限数量不足！' },
+            '500010': { type: '支付错误:', message: '微信统一支付调用失败！' }
+        },
+        projectDeviceTypeList: [
+            { label: '道岔', value: 'SWITCH' },
+            { label: '信号机', value: 'SIGNAL' },
+            { label: '屏蔽门', value: 'PSD' },
+            { label: 'IBP盘', value: 'IBP' },
+            { label: '虚拟IBP盘', value: 'VR_IBP' },
+            { label: '教员机', value: 'IM' },
+            { label: '行调工作站', value: 'CW' },
+            { label: '现地工作站', value: 'LW' },
+            { label: '大屏工作站', value: 'LSW' },
+            { label: '列车驾驶终端', value: 'DRIVE' },
+            { label: '虚拟站台屏蔽门终端', value: 'VR_PSD' },
+            { label: '现地综合监控', value: 'ISCS_LW' },
+            { label: '中心综合监控', value: 'ISCS_CW' },
+            { label: '车辆段终端', value: 'DEPOT' },
+            { label: '派班工作站', value: 'SCHEDULING' },
+            { label: '虚拟CCTV', value: 'CCTV' },
+            { label: 'PLC网关', value: 'PLC_GATEWAY' },
+            { label: '端头控制盒', value: 'PSL' },
+            { label: 'PSC控制柜', value: 'PSC' },
+            { label: '虚拟电子沙盘', value: 'SANDBOX' },
+            { label: '联锁工作站', value: 'ILW' },
+            { label: 'UDP下位机', value: 'UDP_LOW' },
+            { label: '区段', value: 'SECTION' },
+            { label: '列车', value: 'TRAIN' },
+            { label: 'UDP客户端', value: 'UDP_CLIENT' },
+            { label: '站台PIS', value: 'PIS_STAND' },
+            { label: '列车PIS', value: 'PIS_TRAIN' }
+        ],
+        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' }
+        ],
+        responderTypeList: [{ name: '固定应答器', value: 'FB' }, { name: '可变应答器', value: 'VB' }, { name: '填充应答器', value: 'IB' }],
+        loadRuleList: [
+            { label: '每日加载', value: 'EVERY_DAY' },
+            { label: '周内加载', value: 'WITHIN_A_WEEK' },
+            { label: '周末加载', value: 'WEEKEND' }
+        ],
+        turnBackTypeList: [
+            { label: '无折返', value: 'NONE' },
+            { label: '默认', value: 'DEFAULT' },
+            { label: '自动换端', value: 'AUTO' },
+            { label: '无人折返', value: 'UNMANNED' }
+        ],
+        directionLabelList: [
+            { label: 'X', value: 'X' },
+            { label: 'XF', value: 'XF' },
+            { label: 'XD', value: 'XD' },
+            { label: 'S', value: 'S' },
+            { label: 'SF', value: 'SF' },
+            { label: 'SD', value: 'SD' }
+        ],
+        permissionTypeList: [ // 权限类型
+            {label: '项目', value: 0},
+            {label: '线路', value: 1},
+            {label: '线路功能', value: 2}
+        ],
+        EffectiveTypeList: [ // 有效类型
+            { value: '1', label: '有效'},
+            { value: '2', label: '无效'}
+        ],
+        subTypeList: [ // 主体类型
+            { value: 'user', label: '个人'},
+            { value: 'org', label: '组织'}
+        ],
+        trainingType: [
+            // 实训类型
+            { enlabel: 'single operation', label: '单操', value: 'SINGLE' },
+            { enlabel: 'scene operation', label: '场景', value: 'SCENE' }
+        ],
+        ioDirectionList: [
+            // 出入口类型
+            { value: 'DOWN_IN_STATION', label: '下行进站' },
+            { value: 'UP_IN_STATION', label: '上行进站' },
+            { value: 'DOWN_OUT_STATION', label: '下行出站' },
+            { value: 'UP_OUT_STATION', label: '上行出站' },
+            { value: 'BOTH_WAY_STATION', label: '双向' }
+        ],
+        conditionList: [{ label: '标识状态', value: 'S' }, { label: '表达式', value: 'E' }, { label: '代表值', value: 'V' }],
+        operationList: [
+            { label: '且', value: 'AND' },
+            { label: '或', value: 'OR' },
+            { label: '非', value: 'NOT' },
+            { label: '是', value: 'IS' },
+            { label: '等于', value: 'EQ' },
+            { label: '不等于', value: 'NEQ' },
+            { label: '大于', value: 'GT' },
+            { label: '大于等于', value: 'GTOE' },
+            { label: '小于', value: 'LT' },
+            { label: '小于等于', value: 'LTOE' }
+        ],
+        operationDeviceList: [
+            { label: '区段', value: 'Section' },
+            { label: '道岔', value: 'Switch' },
+            { label: '信号机', value: 'Signal' },
+            { label: '站台', value: 'StationStand' }, // Stand
+            { label: '车站', value: 'Station' },
+            { label: '进路', value: 'Route' },
+            { label: '列车', value: 'Train' },
+            { label: '自动闭塞', value: 'StationDirectionAuto' },
+            { label: '半自动闭塞', value: 'StationDirectionSemi' }
+        ],
+        paperStateArr: ['正在编辑', '封存', '失效'], // 试卷定义状态
+        paperStateQueryMap: { '1': '所有', '2': '编辑', /* '3':'可生成试卷', */ '4': '封存', '5': '失效' }, // 试卷定义查询状态
+
+        projectList:[
+            {label:'西铁院', value: 'XTY'},
+            {label: '贵州装备', value:'GZB'},
+            {label: '哈尔滨', value:'HEB'},
+            {label: '苏电院', value:'SDY'},
+            {label: '中航锐创（实训室）', value: 'RICHOR_JOINT'},
+            {label: '上饶沙盘', value: 'SR_SANDBOX'},
+            {label: '江西工贸', value: 'JXGM'},
+            {label: '扬州工业', value: 'RICHOR_YGY'},
+            {label: '红河财经', value: 'RICHOR_HHCJ'},
+            {label: '苏安院', value: 'SAY'},
+            {label: '众合-陕铁院', value: 'UNITTEC_STY'},
+            {label: '教学通用', value: 'TEACHING'},
+            {label: '长兴技校', value: 'RICHOR_CXJS'},
+            {label: '京津冀联盟', value: 'JJJLM'}
+        ],
+        clientMap:{
+            'RAILWAY':{
+                'DISPATCHER':[
+                    { label: '中心ATS工作站', value: 'dispatchWork' },
+                    { label: '行调台', value: 'dispatcherManage' },
+                    { label: '调度计划', value: 'schedulingPlan' },
+                    { label: '调度命令', value: 'dispatchingCommand' }
+                ],
+                'STATION_SUPERVISOR':[
+                    { label: '现地ATS工作站', value: 'localWork' },
+                    { label: '车务管理终端', value: 'trafficManageTerminal' },
+                    { label: '车务终端', value: 'trafficTerminal' }
+                ],
+                'DEPOT_DISPATCHER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_ASSISTANT':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_MASTER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_SIGNALER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_PASSENGER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_SWITCH_MAN':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_FACILITATOR':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_WORKER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'DEVICE_MANAGER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'TRAIN_MASTER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'SIGNAL_BUILDING':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ]
+            },
+            'METRO':{
+                'DISPATCHER':[
+                    { label: '中心ATS工作站', value: 'dispatchWork' },
+                    { label: 'ISCS', value: 'iscsView' },
+                    { label: '中心ATS大屏', value: 'bigScreen' },
+                    { label: 'CCTV', value: 'cctvView' },
+                    { label: '数字沙盘', value: 'digitalStand' },
+                    { label: '大客流策略', value: 'largePassengerStrategy' },
+                    { label: '大客流视图', value: 'largePassengerView' }
+                ],
+                'STATION_SUPERVISOR':[
+                    { label: '现地ATS工作站', value: 'localWork' },
+                    { label: 'ISCS', value: 'iscsView' },
+                    { label: 'IBP', value: 'ibp' },
+                    { label: '数字沙盘', value: 'digitalStand' },
+                    { label: 'CCTV', value: 'cctvView' },
+                    { label: 'PSL', value: 'psl' }
+                ],
+                'DRIVER':[
+                    { label: '列车驾驶', value: 'drivingPlan' }
+                ],
+                'DEPOT_DISPATCHER':[
+                    { label: '派班工作站', value: 'scheduleWork' },
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_ASSISTANT':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_MASTER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_SIGNALER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_PASSENGER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_SWITCH_MAN':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_FACILITATOR':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'STATION_WORKER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'DEVICE_MANAGER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'TRAIN_MASTER':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ],
+                'SIGNAL_BUILDING':[
+                    { label: '现地ATS工作站', value: 'localWork' }
+                ]
+            }
+        }
+        // clientList: [
+        //     { label: '中心ATS工作站', value: 'dispatchWork' },
+        //     { label: '中心ATS大屏', value: 'bigScreen' },
+        //     { label: '现地ATS工作站', value: 'localWork' },
+        //     { label: 'ISCS', value: 'iscsView' },
+        //     { label: 'IBP', value: 'ibp' },
+        //     { label: 'PSL', value: 'psl' },
+        //     { label: 'PIS', value: 'pis' },------------
+        //     { label: '列车驾驶', value: 'drivingPlan' },
+        //     { label: 'CCTV', value: 'cctvView' },
+        //     { label: '数字沙盘', value: 'digitalStand' },
+        //     { label: '车务终端', value: 'trafficTerminal' },
+        //     { label: '车务管理终端', value: 'trafficManageTerminal' },
+        //     { label: '调度命令', value: 'dispatchingCommand' },
+        //     { label: '调度计划', value: 'schedulingPlan' },
+        //     { label: '行调台', value: 'dispatcherManage' },
+        //     { label: '大客流策略', value: 'largePassengerStrategy' },
+        //     { label: '大客流视图', value: 'largePassengerView' },
+
+        //     { label: '设备视图', value: 'jl3dModle' },
+        //     { label: '应急调度', value: 'emergency' },   ------
+        //     { label: '联锁工作站', value: 'interlockWork' }   ------
+        // ]
+    }
+};
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index c2c7ccb5d..0ac2dfb63 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -180,8 +180,8 @@ export const SimulationType = {
 
 };
 export const UrlConfig = {
-    displayNew: '/displayNew',
-    scriptDisplayNew:'/scriptDisplayNew',
+    display: '/display',
+    // scriptDisplayNew:'/scriptDisplayNew',
     examRuleDraft: '/examRule/draft',
     examRuleManage: '/examRule/manage',
     examDetail: '/exam',
@@ -201,13 +201,13 @@ export const UrlConfig = {
         runPlan: '/design/runPlan/detail',
         testRunPlan: '/design/runPlan/testRunplan',
         scriptHome: '/design/script/home',
-        displayNew: '/design/displayNew',
+        // displayNew: '/design/displayNew',
         mapPreviewNew: '/design/mapPreviewNew',
         ibpHome: '/design/ibp/home'
     },
     newDesignuser: {
         prefix: '/design/usermap/home',
-        mapDraw: '/design/usermap/map/draw'
+        mapDraw: '/lineDesign/usermap/map/draw'
     },
     publish: {
         runPlanEveryDay: '/publish/runPlan/everyDay',
@@ -231,7 +231,6 @@ export const UrlConfig = {
         examHome: '/trainingPlatform/examHome',
         course: '/trainingPlatform/course',
         practical: '/trainingPlatform/practical',
-        permission: '/trainingPlatform/permission',
         pay: '/trainingPlatform/pay',
         secondaryHome: '/trainingPlatform/secondaryHome'
     },
@@ -318,3 +317,97 @@ export const trainTypeList = [
     {name:'回送出入厂客车底列车', code:'BACK_FACTORY_PASSENGER_TRAIN' },
     {name:'因故折返旅客列车', code:'FAULT_TRUE_BACK_PASSENGER_TRAIN' }
 ];
+export const iscsPositionMap = {
+    LCD: '站厅',
+    UP_STAND: '上行站台',
+    DOWN_STAND: '下行站台',
+    GATE: '出入口',
+    OVERPASS1: '天桥1',
+    OVERPASS2: '天桥2',
+    PROPERTY: '物业',
+    LED: 'LED',
+    ADMINISTRATIVE_AREA: '办公区',
+    TRANSFER_CHANNEL: '换乘通道'
+};
+export const iscsTypeMap = {
+    AUDIO: '广播',
+    LED: 'LED',
+    LCD: 'LCD'
+};
+export const iscsPositionList = [
+    { label: '站厅', value: 'LCD' },
+    { label: '上行站台', value: 'UP_STAND' },
+    { label: '下行站台', value: 'DOWN_STAND' },
+    { label: '出入口', value: 'GATE' },
+    { label: '天桥1', value: 'OVERPASS1' },
+    { label: '天桥2', value: 'OVERPASS2' },
+    { label: '物业', value: 'PROPERTY' },
+    { label: 'LED', value: 'LED' },
+    { label: '办公区', value: 'ADMINISTRATIVE_AREA' },
+    { label: '换乘通道', value: 'TRANSFER_CHANNEL' }
+];
+export const iscsTypeList = [
+    { label: '广播', value: 'AUDIO' },
+    { label: 'LED', value: 'LED' },
+    { label: 'LCD', value: 'LCD' }
+];
+export const iscsSystemMap = {
+    PA: '广播系统',
+    PIS: '乘客信息'
+};
+export const iscsSystemList = [
+    { value: 'PA', label: '广播信息' },
+    { value: 'PIS', label: '乘客信息' }
+];
+export const iscsResourcesTypeMap = {
+    RECORDING: '预录',
+    EMERGENCY_RECORDING: '紧急预录',
+    BGM: '背景音乐',
+    ATS: 'ATS预录'
+};
+export const iscsResourcesTypeList = [
+    { value: 'RECORDING', label: '预录' },
+    { value: 'EMERGENCY_RECORDING', label: '紧急预录' },
+    { value: 'BGM', label: '背景音乐' },
+    { value: 'ATS', label: 'ATS预录' }
+];
+export const UserOperationType = {
+    RIGHTCLICK: '右键点击',
+    LEFTCLICK: '左键点击',
+    CHOOSEVALUE: '选择',
+    FILLVALUE: '填写'
+};
+export const SimulationUserType = {
+    TEACHER: 'TEACHER',
+    STUDENT: 'STUDENT'
+};
+/** 客户端list */
+export const ClientList = [
+    { label: '中心ATS工作站', value: 'dispatchWork' },
+    { label: '中心ATS大屏', value: 'bigScreen' },
+    { label: '现地ATS工作站', value: 'localWork' },
+    { label: 'ISCS', value: 'iscsView' },
+    { label: 'IBP', value: 'ibp' },
+    { label: 'PSL', value: 'psl' },
+    { label: '列车驾驶', value: 'drivingPlan' },
+    { label: 'CCTV', value: 'cctvView' },
+    { label: '设备视图', value: 'jl3dModle' },
+    { label: '数字沙盘', value: 'digitalStand' },
+    { label: '车务终端', value: 'trafficTerminal' },
+    { label: '车务管理终端', value: 'trafficManageTerminal' },
+    { label: '调度命令', value: 'dispatchingCommand' },
+    { label: '调度计划', value: 'schedulingPlan' },
+    { label: '大客流策略', value: 'largePassengerStrategy' },
+    { label: '大客流视图', value: 'largePassengerView' },
+    { label: '行调台', value: 'dispatcherManage' },
+    { label: '派班工作站', value: 'scheduleWork' },
+    { label: '应急调度', value: 'emergency' },
+    { label: '运行图加载', value: 'diagramLoad' },
+    { label: '运行图预览', value: 'diagramPreview' },
+    { label: '运行图编制', value: 'diagramEdit' }
+];
+/** 实训类型list */
+export const TrainingTypeList = [
+    {label: '场景', value: 'SCENE'},
+    {label: '单操', value: 'SINGLE'}
+];
diff --git a/src/scripts/MenuContextHandler.js b/src/scripts/MenuContextHandler.js
new file mode 100644
index 000000000..e6b9853de
--- /dev/null
+++ b/src/scripts/MenuContextHandler.js
@@ -0,0 +1,39 @@
+import { OperateMode } from '@/scripts/ConstDic';
+
+export function menuBarConvert(menu, mode) {
+    if (menu) {
+        if (mode === OperateMode.NORMAL) {
+            menu.forEach(item => {
+                if (item.type === 'separator') {
+                    item.show = true;
+                    return;
+                }
+
+                item.show = false;
+                if (!item.click) {
+                    item.click = () => { };
+                }
+
+                if (!item.force) {
+                    item.show = true;
+                    if (item.children && item.children.length > 0) {
+                        menuBarConvert(item.children, mode);
+                    }
+                }
+            });
+        } else if (mode === OperateMode.ADMIN) {
+            menu.forEach(item => {
+                item.show = true;
+                if (!item.click) {
+                    item.click = () => { };
+                }
+
+                if (item.children && item.children.length > 0) {
+                    menuBarConvert(item.children, mode);
+                }
+            });
+        }
+    }
+    return menu || [];
+}
+
diff --git a/src/scripts/cmdPlugin/Command.js b/src/scripts/cmdPlugin/Command.js
deleted file mode 100644
index d63721116..000000000
--- a/src/scripts/cmdPlugin/Command.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const P_OVER = `over`;
-export default class Command {
-    constructor() {
-        this.command = {};
-        this.id = '';
-        this.isError = false;
-        this.isOver = false;
-    }
-
-    toFound(definition, wholeParam) {
-        this.id = definition.operate;
-        (definition.paramList || []).forEach(param => {
-            if (wholeParam.hasOwnProperty(param.name)) {
-                this.command[param.name] = wholeParam[param.name];
-            } else {
-                this.isError = true;
-                return;
-            }
-        });
-
-        if (wholeParam.hasOwnProperty(P_OVER)) {
-            this.isOver = true;
-        }
-    }
-
-    toError() {
-        this.isError = true;
-    }
-
-    get() {
-        return this.command;
-    }
-}
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
deleted file mode 100644
index 332bcfea7..000000000
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ /dev/null
@@ -1,255 +0,0 @@
-import { sendCommandNew } from '@/api/jmap/training';
-import { sendSimulationCommand } from '@/api/rtSimulation';
-import router from '@/router/index';
-import store from '@/store/index';
-import Command from './Command';
-import Handler from './Handler';
-import { ScriptMode } from '@/scripts/ConstDic';
-import { objectIsEqual } from '@/utils/date';
-
-class CommandHandle {
-    constructor() {
-        this.data = [];
-        this.definitionMap = {
-        };
-        this.scriptDefinitionMap = {};
-    }
-
-    load(list) {
-        this.definitionMap = {
-            Center: {},
-            Local: {},
-            Depot_IL:{},
-            Common: {
-                Set_Fault:{operate: 'Set_Fault', paramList:[{name: 'code'}, {name: 'faultType'}]},
-                Cancel_Fault: {operate:'Cancel_Fault', paramList:[{name: 'code'}, {name: 'faultType'}]},
-                CMD_TRIGGER_FAULT: {operate: 'Trigger_Fault'},
-                Train_Init_Plan: {
-                    operate: 'Train_Init_Plan',
-                    paramList: [{name: 'sectionCode'}, {name: 'serviceNumber'}, {name: 'tripNumber'}],
-                    simulationRole: 'Center',
-                    controlMode: ['OperateCenterControl'],
-                    conditionList: []
-                },
-                Train_Load_Spare_Train:{
-                    operate: 'Train_Load_Spare_Train',
-                    paramList:[{name: 'groupNumber'}, {name: 'sectionCode'}, {name: 'right'}],
-                    simulationRole: 'Center',
-                    controlMode: ['OperateCenterControl'],
-                    conditionList: []
-                },
-                Train_Load_Trip_Number_Train:{
-                    operate: 'Train_Load_Trip_Number_Train',
-                    paramList:[{name: 'tripNumber'}, {name: 'sectionCode'}, {name: 'right'}]
-                },
-                // Train_Update_Trip_Number_Train:{
-                //     operate: 'Train_Update_Trip_Number_Train',
-                //     paramList:[{name: 'tripNumber'}, {name: 'groupNumber'}]
-                // },
-                Train_Trust: {
-                    operate: 'Train_Trust',
-                    paramList:[{name: 'groupNumber'}, {name: 'param'}],
-                    simulationRole: 'Center',
-                    controlMode: ['OperateCenterControl'],
-                    conditionList: []
-                },
-                Train_Link: {
-                    operate: 'Train_Link',
-                    paramList:[{name: 'groupNumber1'}, {name: 'groupNumber2'}],
-                    simulationRole: 'Center',
-                    controlMode: ['OperateCenterControl'],
-                    conditionList: []
-                },
-                Station_Restart_Interlock_Machine: {
-                    operate: 'Station_Restart_Interlock_Machine',
-                    paramList: [{name: 'stationCode'}]
-                },
-                Stand_Emergency_Close: {
-                    operate: 'Stand_Emergency_Close',
-                    paramList: [{name: 'standCode'}]
-                },
-                Stand_Cancel_Emergency_Close: {
-                    operate: 'Stand_Cancel_Emergency_Close',
-                    paramList: [{name: 'standCode'}]
-                },
-                Train_Calculate_Interval: {
-                    operate: 'Train_Calculate_Interval',
-                    paramList: [{name: 'calculateParam'}]
-                },
-                Driver_Stop: {
-                    operate: 'Driver_Stop',
-                    paramList: [{name: 'groupNumber'}, {name: 'eb'}]
-                },
-                Depart_Train: {
-                    operate: 'Depart_Train',
-                    paramList: [{name: 'groupNumber'}]
-                },
-                Drive_Ahead: {
-                    operate: 'Drive_Ahead',
-                    paramList: [{name: 'groupNumber'}]
-                },
-                Route_Block_Drive: {
-                    operate: 'Route_Block_Drive',
-                    paramList: [{name: 'groupNumber'}]
-                },
-                Open_Or_Close_Door: {
-                    operate: 'Open_Or_Close_Door',
-                    paramList: [{name: 'groupNumber'}]
-                },
-                Change_Preselection_Mode: {
-                    operate: 'Change_Preselection_Mode',
-                    paramList: [{name: 'groupNumber'}, {name: 'preselectionMode'}]
-                },
-                Apply_NRM: {
-                    operate: 'Apply_NRM',
-                    paramList: [{name: 'groupNumber'}]
-                },
-                Inbound: {
-                    operate: 'Inbound',
-                    paramList: [{name: 'groupNumber'}]
-                },
-                RAIL_QUERY_REGISTER: {
-                    operate: 'RAIL_QUERY_REGISTER',
-                    paramList: [{name: 'stationCode'}]
-                },
-                RAIL_FILL_IN_REGISTER: {
-                    operate: 'RAIL_FILL_IN_REGISTER',
-                    paramList: [{name: 'stationCode'}, {name: 'line'}]
-                },
-                Conversation_Chat_Text: {
-                    operate: 'Conversation_Chat_Text',
-                    paramList: [{name: 'content'}]
-                }
-            }
-        };
-        (list || []).forEach(definition => {
-            this.definitionMap[definition.simulationRole][definition.operate] = definition;
-            this.scriptDefinitionMap[definition.operate] = definition;
-        });
-    }
-
-    getDefinition(cmdType) {
-        if (cmdType) {
-            const simulationRole = Handler.getSimulationRole();
-            if (simulationRole) {
-                return this.definitionMap[simulationRole][cmdType.value] || this.definitionMap.Common[cmdType.value] || null;
-            } else {
-                return this.definitionMap.Common[cmdType.value] || null;
-            }
-
-        } else {
-            return null;
-        }
-    }
-
-    getScriptDefinition(operationType) {
-        if (operationType) {
-            return this.scriptDefinitionMap[operationType] || null;
-        } else {
-            return null;
-        }
-    }
-
-    getCommand(cmdType, wholeParam) {
-        if (cmdType) {
-            const command = new Command();
-            const definition = this.getDefinition(cmdType);
-            if (definition) {
-                command.toFound(definition, wholeParam);
-                return command;
-            } else {
-                command.toError();
-                return command;
-            }
-        }
-
-        return null;
-    }
-
-    execute(id, command) {
-        return new Promise((resolve, reject) => {
-            const group = router.currentRoute.query.group;
-            const newApi = router.currentRoute.query.newApi + '';
-            // if (router.currentRoute.path.includes('trainingDesign')) {
-            store.dispatch('trainingNew/setSceneOperate', {id, command});
-            // }
-            if (store.state.trainingNew.trainingSwitch && store.state.trainingNew.trainingDetail.type === 'SCENE') {
-                const stepList = JSON.parse(store.state.trainingNew.trainingDetail.stepJson);
-                const step = stepList[store.state.trainingNew.stepOrder - 1];
-                const stepOperation = step.operations[store.state.trainingNew.operateOrder];
-                let flag = true;
-                if (stepOperation.operationType !== id) {
-                    flag = false;
-                }
-                if (!objectIsEqual(stepOperation.params, command)) {
-                    flag = false;
-                }
-                store.dispatch('trainingNew/handleCheckNewTrainingResult', flag);
-                if (flag) {
-                    if (newApi === 'true') {
-                        const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id);
-                        sendSimulationCommand(group, userInfo.memberId, id, command).then((response) => {
-                            resolve(response);
-                        }).catch(error => {
-                            reject(error);
-                        });
-                    } else {
-                        sendCommandNew(group, id, command).then((response) => {
-                            resolve(response);
-                        }).catch(error => {
-                            reject(error);
-                        });
-                    }
-                } else if (store.state.trainingNew.teachMode === ScriptMode.TEACH || store.state.trainingNew.teachMode === ScriptMode.PRACTICE) {
-                    store.dispatch('training/setOperateErrMsg');
-                }
-            } else {
-                if (newApi === 'true') {
-                    const userInfo = store.state.training.simulationUserList.find(el => el.id == store.state.user.id);
-                    sendSimulationCommand(group, userInfo.memberId, id, command).then((response) => {
-                        resolve(response);
-                    }).catch(error => {
-                        reject(error);
-                    });
-                } else {
-                    sendCommandNew(group, id, command).then((response) => {
-                        resolve(response);
-                    }).catch(error => {
-                        reject(error);
-                    });
-                }
-            }
-        });
-    }
-
-    checkDisabled(menu, selected) {
-        const data = this.getDefinition(menu.cmdType);
-        if (!data) {
-            return false;
-        } else {
-            let result = false;
-            if (data.conditionList.length > 0) {
-                data.conditionList.forEach(val=>{
-                    switch (val.expression) {
-                    case 'eq': {
-                        result = result || (selected[val.name].toString() == val.value);
-                        break;
-                    }
-                    case 'neq': {
-                        result = result || (selected[val.name].toString() != val.value);
-                        break;
-                    }
-                    default: {
-                        result = result || (selected[val.name].toString() == val.value);
-                        break;
-                    }
-                    }
-                });
-                return !result;
-            }
-            return result;
-        }
-    }
-}
-
-export default new CommandHandle();
diff --git a/src/scripts/cmdPlugin/Handler.js b/src/scripts/cmdPlugin/Handler.js
deleted file mode 100644
index ebae000d2..000000000
--- a/src/scripts/cmdPlugin/Handler.js
+++ /dev/null
@@ -1,214 +0,0 @@
-import store from '@/store/index';
-import router from '@/router/index';
-import CommandHandler from './CommandHandler.js';
-import ValidateHandler from './ValidateHandler.js';
-import { State2SimulationMap } from './Config.js';
-import { sendTrainingNextStepNew } from '@/api/jmap/training';
-import { getCmdList } from '@/api/management/dictionary';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import { getLocalStorage } from '@/utils/auth';
-
-class Handler {
-    constructor() {
-        this.operations = [];
-    }
-
-    undo(num) {
-        this.operations = this.operations.slice(0, num);
-    }
-
-    pop() {
-        this.operations.pop();
-    }
-
-    clear() {
-        this.operations.splice(0, this.operations.length);
-    }
-
-    storeOperation(operation) {
-        if (operation.start === true) {
-            this.clear();
-        }
-
-        this.operations.push(operation);
-    }
-
-    afterValid(operation, valid) {
-        return new Promise((resolve, reject) => {
-            const basicInfo = store.getters['training/basicInfo'];
-            const trainingDetail = store.getters['trainingNew/trainingDetail'];
-            if (basicInfo.id && valid) {
-                const group = router.currentRoute.query.group;
-                sendTrainingNextStepNew(basicInfo.id, operation, group).then(res=>{
-                    if (!valid) {
-                        this.pop();
-                    } else if (operation.cancel === true) {
-                        this.clear();
-                    }
-                    resolve();
-                }).catch(error => {
-                    if (!valid) {
-                        this.pop();
-                    } else if (operation.cancel === true) {
-                        this.clear();
-                    }
-                    reject(error);
-                });
-            } else if (trainingDetail && trainingDetail.id) {
-                if (!valid) {
-                    this.pop();
-                    reject();
-                } else {
-                    if (operation.cancel === true) {
-                        this.clear();
-                    }
-                    resolve();
-                }
-            } else {
-                resolve();
-            }
-        });
-    }
-
-    getWholeParam() {
-        const whole = {};
-        (this.operations || {}).forEach(elem => { Object.assign(whole, elem.param || {}); });
-        return whole;
-    }
-
-    getCommand(operation) {
-        let command = null;
-        if (operation.cmdType) {
-            const cmdType = operation.cmdType;
-            const wholeParam = this.getWholeParam();
-            command = CommandHandler.getCommand(cmdType, wholeParam);
-            if (command && command.isError) {
-                this.operations.pop();
-                command = null;
-            } else if (command && command.isOver) {
-                this.clear();
-                store.dispatch('menuOperation/setButtonOperation', null);
-            }
-        } else {
-            if (operation.operation === OperationEvent.Command.cancel.menu.operation || operation.over) {
-                this.clear();
-            }
-        }
-
-        return command;
-    }
-
-    execute(cmdType, wholeParam) {
-        return new Promise((resolve, reject) => {
-            const command = CommandHandler.getCommand(cmdType, wholeParam);
-            if (command.isError) {
-                reject(command);
-            } else {
-                CommandHandler.execute(command.id, command.get()).then(response => {
-                    resolve(response);
-                }).catch(error => {
-                    reject(error);
-                });
-            }
-        });
-    }
-
-    handle(operation) {
-        return new Promise((resolve, reject) => {
-            this.storeOperation(operation);
-            const rtn = { valid: false, response: null };
-            const valid = ValidateHandler.vaildate(this.getTrainingMode(), operation);
-            this.afterValid(operation, valid).then(()=>{
-                rtn.valid = valid;
-                if (operation.cmdType && valid) {
-                    const command = this.getCommand(operation);
-                    if (command) {
-                        CommandHandler.execute(command.id, command.get()).then(response => {
-                            rtn.response = response;
-                            resolve(rtn);
-                        }).catch(error => {
-                            console.error(error);
-                            reject(error);
-                        });
-                    } else {
-                        rtn.response = '获取指令失败，暂无指令或参数传值不正确，请检查指令字典';
-                        reject(rtn);
-                    }
-                } else {
-                    resolve(rtn);
-                }
-            }).catch(()=>{
-                rtn.valid = valid;
-                resolve(rtn);
-            });
-        });
-    }
-
-    notify(lineCode) {
-        getCmdList(lineCode).then(resp => {
-            CommandHandler.load(resp.data || []);
-        }).catch(err => {
-            CommandHandler.load([]);
-            console.error(err);
-        });
-    }
-
-    getSteps() {
-        return store.state.training.steps;
-    }
-
-    getOrder() {
-        return store.state.training.order;
-    }
-
-    getSimulationRole() {
-        return State2SimulationMap[store.state.training.prdType];
-    }
-
-    getTrainingMode () {
-        if (store.state.trainingNew.trainingSwitch && store.state.trainingNew.trainingDetail.type === 'SINGLE') {
-            return store.state.trainingNew.teachMode;
-        } else {
-            return store.state.training.mode;
-        }
-    }
-
-    getTrainingStart() {
-        return store.state.training.trainingStart;
-    }
-
-    getOperateBreakStatus () {
-        return store.state.menuOperation.break;
-    }
-
-    getNewTrainingStart() {
-        return store.state.trainingNew.trainingSwitch;
-    }
-    getNewTrainingOperation() {
-        try {
-            let trainingDetail = getLocalStorage('trainingDetail') || `{}`;
-            trainingDetail = JSON.parse(trainingDetail);
-            const stepList = JSON.parse(trainingDetail.stepJson || `[]`);
-            let stepOrder = getLocalStorage('stepOrder') || `1`;
-            stepOrder = JSON.parse(stepOrder);
-            let operateOrder = getLocalStorage('operateOrder') || `1`;
-            operateOrder = JSON.parse(operateOrder);
-            const step = stepList[stepOrder - 1];
-            // const index = stepOrder - 1 >= 0 ? stepOrder - 1 : 0;
-            // const step = stepList[index];
-            const stepOperation = step.operations[operateOrder];
-            return stepOperation;
-        } catch (e) {
-            console.error(e);
-            return {};
-        }
-    }
-    getNewTrainingType() {
-        return store.state.trainingNew.trainingDetail.type;
-    }
-    handleCheckNewTrainingResult(valid) {
-        store.dispatch('trainingNew/handleCheckNewTrainingResult', valid);
-    }
-}
-
-export default new Handler();
diff --git a/src/scripts/cmdPlugin/MenuContextHandler.js b/src/scripts/cmdPlugin/MenuContextHandler.js
deleted file mode 100644
index a44f1de51..000000000
--- a/src/scripts/cmdPlugin/MenuContextHandler.js
+++ /dev/null
@@ -1,228 +0,0 @@
-import store from '@/store/index';
-import CommandHandler from './CommandHandler';
-import { State2SimulationMap, State2ControlMap } from './Config';
-import { OperateMode } from '@/scripts/ConstDic';
-
-class MenuContextHandler {
-    constructor(store) {
-        this.operates = []; // 操作数据
-        this.command = {};	// 命令对象
-    }
-
-    getCurrentStateObject() {
-        return store.getters['menuOperation/selected'];
-    }
-
-    getStationControl(selected) {
-        let control;
-        if (selected._type == 'StationStand') {
-            control = store.getters['map/getDeviceStationCodeByStationCode'](selected.deviceStationCode);
-        } else if (selected._type == 'Station') {
-            control = store.getters['map/getDeviceStationCodeByStationCode'](selected.code);
-        } else if (selected._type == 'Train') { // 车次窗单独处理
-            control = store.getters['map/getStationCodeByTrain'](selected);
-        } else if (selected._type == 'TrainWindow') {
-            control = store.getters['map/getDeviceTrainWindowCodeByStationCode'](selected.code);
-        } else if (selected._type == 'LimitControl') {
-            control = {controlMode: 'Center'};
-        } else {
-            control = store.getters['map/getDeviceStationCodeByStationCode'](selected.stationCode);
-        }
-        return control;
-    }
-
-    getPrdType() {
-        return store.state.training.prdType;
-    }
-
-    getDeviceByCode(code) {
-        return store.state.map.mapDevice[code];
-    }
-
-    // 判断指令是否隐藏
-    checkDisabled(data, selected) {
-        let result = false;
-        if (data.conditionList.length > 0) {
-            data.conditionList.forEach(val=>{
-                switch (val.expression) {
-                case 'eq': {
-                    result = result || ((selected[val.name] || 0).toString() == val.value);
-                    break;
-                }
-                case 'neq': {
-                    result = result || ((selected[val.name] || 0).toString() != val.value);
-                    break;
-                }
-                default: {
-                    result = result || ((selected[val.name] || 0).toString() == val.value);
-                    break;
-                }
-                }
-            });
-            result = !result;
-        }
-        return result;
-    }
-
-    covert2(menuMap) {
-        const selected = this.getCurrentStateObject();
-        let menu = [];
-        const control = this.getStationControl(selected);
-        if (control && !store.state.scriptRecord.audioPlay) {
-            if (this.getPrdType() != '' && this.getPrdType() != null) {
-                const type = State2SimulationMap[this.getPrdType()];
-                const status = State2ControlMap[control.controlMode]; // 判断当前模式
-                if (type) {
-                    menu = [...menuMap[type]];
-                }
-
-                // 特殊处理站台的右键操作( 因为小站台不允许有操作 )
-                if (selected._type == 'StationStand' && selected.small) {
-                    menu = [];
-                }
-
-                if (menu.constructor === Array) {
-                    menu.forEach(elem => {
-                        if (elem.children && elem.children.length > 0) {
-                            elem.children.forEach(each=>{
-                                this.covertEachCommand(each, type, selected, status, false);
-                            });
-                        } else {
-                            this.covertEachCommand(elem, type, selected, status, false);
-                        }
-                    });
-                }
-            }
-        }
-        return menu;
-    }
-
-    covert(menuMap) {
-        const selected = this.getCurrentStateObject();
-        let menu = [];
-        const control = this.getStationControl(selected);
-        if (control && !store.state.scriptRecord.audioPlay) {
-            if (this.getPrdType() != '' && this.getPrdType() != null) {
-                const type = State2SimulationMap[this.getPrdType()];
-                const status = State2ControlMap[control.controlMode]; // 判断当前模式
-                if (type) {
-                    menu = [...menuMap[type]];
-                }
-                // 特殊处理站台的右键操作( 因为小站台不允许有操作 )
-                if (selected._type == 'StationStand' && selected.small) {
-                    menu = [];
-                }
-                if (menu.constructor === Array) {
-                    menu.forEach(elem => {
-                        if (elem.children && elem.children.length > 0) {
-                            elem.children.forEach(each=>{
-                                this.covertEachCommand(each, type, selected, status);
-                            });
-                        } else {
-                            this.covertEachCommand(elem, type, selected, status);
-                        }
-                    });
-                }
-            }
-        }
-        return menu;
-    }
-
-    covertList(list) {
-        const menu = [...list];
-        const selected = this.getCurrentStateObject();
-        const control = this.getStationControl(selected);
-        if (control && !store.state.scriptRecord.audioPlay) {
-            if (this.getPrdType() != '' && this.getPrdType() != null) {
-                const type = State2SimulationMap[this.getPrdType()];
-                const status = State2ControlMap[control.controlMode]; // 判断当前模式
-
-                // 特殊处理站台的右键操作( 因为小站台不允许有操作 )
-                if (selected._type == 'StationStand' && selected.small) {
-                    menu = [];
-                }
-
-                if (menu.constructor === Array) {
-                    menu.forEach(elem => {
-                        if (elem.children && elem.children.length > 0) {
-                            elem.children.forEach(each=>{
-                                this.covertEachCommand(each, type, selected, status, false);
-                            });
-                        } else {
-                            this.covertEachCommand(elem, type, selected, status, false);
-                        }
-                    });
-                }
-            }
-        }
-        return menu;
-    }
-
-    covertEachCommand(elem, type, selected, status, isSettingCommand = true) {
-        if (elem.type === 'separator') {
-            elem.show = true;
-            return;
-        }
-
-        const data = CommandHandler.getDefinition(elem.cmdType);
-        const model = this.getDeviceByCode(selected.code);
-
-        if (data) {
-            // 判断指令是否显示
-            if (data.simulationRole.toUpperCase() == type.toUpperCase() && data.controlMode.indexOf(status) > -1) {
-                elem.show = true;
-                elem.disabled = this.checkDisabled(data, model);
-                if (!elem.disabled &&
-					elem.checkDisabled) {
-                    elem.disabled = !!elem.checkDisabled(model);
-                }
-            } else {
-                elem.show = true;
-                elem.disabled = true;
-            }
-        } else {
-            if (isSettingCommand) {
-                elem.show = false;
-            }
-        }
-    }
-
-    menuBarConvert(menu, mode) {
-        if (menu) {
-            if (mode === OperateMode.NORMAL) {
-                menu.forEach(item => {
-                    if (item.type === 'separator') {
-                        item.show = true;
-                        return;
-                    }
-
-                    item.show = false;
-                    if (!item.click) {
-                        item.click = () => { };
-                    }
-
-                    if (!item.force) {
-                        item.show = true;
-                        if (item.children && item.children.length > 0) {
-                            this.menuBarConvert(item.children, mode);
-                        }
-                    }
-                });
-            } else if (mode === OperateMode.ADMIN) {
-                menu.forEach(item => {
-                    item.show = true;
-                    if (!item.click) {
-                        item.click = () => { };
-                    }
-
-                    if (item.children && item.children.length > 0) {
-                        this.menuBarConvert(item.children, mode);
-                    }
-                });
-            }
-        }
-        return menu || [];
-    }
-}
-
-export default new MenuContextHandler();
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 04262930b..d95118909 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -134,7 +134,7 @@ export const OperationEvent = {
             /** 控制模式菜单 */
             remoteControl: {
                 operation: '0024',
-                domId: '_Tips-Mbar-0-StationControl'
+                domId: '_Tips-Mbar-0-StationControl{RIGHT}'
             },
             /** 请求区域 */
             requestZone: {
@@ -182,6 +182,14 @@ export const OperationEvent = {
             limitSpeed:{
                 operation: '002d',
                 domId: '_Tips-Mbar-0-limitSpeed'
+            },
+            loginButton: {
+                operation: '002e',
+                domId: '_Tips-Mbar-0-loginButton'
+            },
+            loginInput: {
+                operation: '002f',
+                domId: '_Tips-Mbar-0-loginInput'
             }
         },
         // 前端视图指令
@@ -463,11 +471,11 @@ export const OperationEvent = {
             // 进路
             line_signal_route: {
                 operation: '00a23',
-                domId: '_Tips-ningBo-line-signal-cmd{TOP}'
+                domId: '_Tips-ningBo-line-signal-route{TOP}'
             },
             line_signal_route_cmd: {
                 operation: '00a231',
-                domId: '_Tips-ningBo-line-signal-cmd{TOP}'
+                domId: '_Tips-ningBo-line-signal-route-cmd{TOP}'
             },
             line_signal_route_show: {
                 operation: '00a232',
@@ -667,6 +675,58 @@ export const OperationEvent = {
             line_sectionLock_remoteResetFunc_sure: {
                 operation: '00c03s',
                 domId: '_Tips-ningBo-line_remoteResetFunc-sure{TOP}'
+            },
+            Switch_command_setMode: {
+                operation: '00c041',
+                domId: '_Tips-ningBo-Switch_command_setMode{BOTTOM}'
+            },
+            Switch_command_setPosition: {
+                operation: '00c042',
+                domId: '_Tips-ningBo-Switch_command_setPosition{BOTTOM}'
+            },
+            Switch_command_setReserved: {
+                operation: '00c043',
+                domId: '_Tips-ningBo-Switch_command_setReserved{BOTTOM}'
+            },
+            Signal_command: {
+                operation: '00c05',
+                domId: '_Tips-ningBo-Signal_command{BOTTOM}'
+            },
+            Signal_command_startSignal: {
+                operation: '00c051',
+                domId: '_Tips-ningBo-Signal_command_startSignal{BOTTOM}'
+            },
+            Signal_command_endSignal: {
+                operation: '00c052',
+                domId: '_Tips-ningBo-Signal_command_endSignal{BOTTOM}'
+            },
+            Signal_command_path: {
+                operation: '00c053',
+                domId: '_Tips-ningBo-Signal_command_path{BOTTOM}'
+            },
+            Signal_command_CBTC1: {
+                operation: '00c054',
+                domId: '_Tips-ningBo-Signal_command_CBTC1{BOTTOM}'
+            },
+            Signal_command_CBTC2: {
+                operation: '00c055',
+                domId: '_Tips-ningBo-Signal_command_CBTC2{BOTTOM}'
+            },
+            Signal_command_reserve1: {
+                operation: '00c056',
+                domId: '_Tips-ningBo-Signal_command_reserve1{BOTTOM}'
+            },
+            Signal_command_reserve2: {
+                operation: '00c057',
+                domId: '_Tips-ningBo-Signal_command_reserve2{BOTTOM}'
+            },
+            Signal_command_unlockType: {
+                operation: '00c058',
+                domId: '_Tips-ningBo-Signal_command_unlockType{BOTTOM}'
+            },
+            Signal_command_routeTabs: {
+                operation: '00c059',
+                domId: '_Tips-ningBo-Signal_command_routeTabs{BOTTOM}'
             }
         },
         commandRight: {
@@ -674,6 +734,69 @@ export const OperationEvent = {
                 operation: '00b',
                 domId: ''
             }
+        },
+        // 宁波一
+        commandNingBo1: {
+            // 区域选择
+            areaSelection: {
+                operation: '00c',
+                domId: '_Tips-ningBo1-areaSelection'
+            },
+            // 全部申请
+            applyAll: {
+                operation: '00c1',
+                domId: '_Tips-ningBo1-areaSelection-applyAll'
+            },
+            // 取消全部申请
+            cancelApplyAll: {
+                operation: '00c2',
+                domId: '_Tips-ningBo1-areaSelection-cancelApplyAll'
+            },
+            // 全部释放
+            releaseAll: {
+                operation: '00c3',
+                domId: '_Tips-ningBo1-areaSelection-releaseAll'
+            },
+            // 取消全部释放
+            cancelReleaseAll: {
+                operation: '00c4',
+                domId: '_Tips-ningBo1-areaSelection-cancelReleaseAll'
+            },
+            // 全部强制分配
+            distributionAll: {
+                operation: '00c5',
+                domId: '_Tips-ningBo1-areaSelection-distributionAll'
+            },
+            // 取消全部强制分配
+            cancelDistributionAll: {
+                operation: '00c6',
+                domId: '_Tips-ningBo1-areaSelection-cancelDistributionAll'
+            },
+            // 应用
+            commit: {
+                operation: '00c7',
+                domId: '_Tips-ningBo1-areaSelection-commit'
+            },
+            // 退出
+            doClose: {
+                operation: '00c8',
+                domId: '_Tips-ningBo1-areaSelection-doClose'
+            }
+        },
+        // 成都一
+        commandChengDu1: {
+            confirm: {
+                operation: '00d',
+                domId: '_Tips-commandChengDu1-confirm{BOTTOM}'
+            },
+            cancel: {
+                operation: '00d1',
+                domId: '_Tips-commandChengDu1-cancel{BOTTOM}'
+            },
+            requestBar: {
+                operation: '00d2',
+                domId: '_Tips-commandChengDu1-requestBar{BOTTOM}'
+            }
         }
     },
     // 站台概要表
@@ -1239,6 +1362,10 @@ export const OperationEvent = {
             menuButton: {
                 operation: '2024',
                 domId: '_Tips-Control-Request-Menu{BOTTOM}'
+            },
+            awaitAlarm: {
+                operation: '2025',
+                domId: '_Tips-Control-Request-AwaitAlarm'
             }
         },
         // 强行站控
@@ -2962,7 +3089,7 @@ export const OperationEvent = {
         // 区域选择 申请控制权
         areaSelection: {
             menu: {
-                operation: '616',
+                c: '616',
                 domId: '_Tips-Station-areaSelection-Menu'
             },
             mbar: {
@@ -3645,422 +3772,422 @@ export const OperationEvent = {
     CTCCommand: {
         receivingNotice: {
             menu: {
-                operation: '1100',
+                operation: 'a001',
                 domId: '_Tips-CTC-ReceivingNotice-Menu{TOP}'
             }
         },
         departureNotice: {
             menu: {
-                operation: '1101',
+                operation: 'a002',
                 domId: '_Tips-CTC-DepartureNotice-Menu{TOP}'
             }
         },
         assistPressDownTurnDirection:{
             menu:{
-                operation:'1102',
+                operation:'a003',
                 domId: '_Tips-CTC-AssistPressDownTurnDirection-Menu{TOP}'
             }
         },
         autoTrigger: {
             menu: {
-                operation: '1103',
+                operation: 'a004',
                 domId: '_Tips-CTC-AutoTrigger-Menu{TOP}'
             }
         },
         assistPressMainAssist:{
             menu: {
-                operation: '1104',
+                operation: 'a005',
                 domId: '_Tips-CTC-AssistPressMainAssist-Menu{TOP}'
             }
         },
         assistPressReceiveAssist:{
             menu: {
-                operation: '1105',
+                operation: 'a006',
                 domId: '_Tips-CTC-AssistPressReceiveAssist-Menu{TOP}'
             }
         },
         assistPressDeliverAssist:{
             menu: {
-                operation: '1106',
+                operation: 'a007',
                 domId: '_Tips-CTC-AssistPressDeliverAssist-Menu{TOP}'
             }
         },
         assistPressBlock:{
             menu: {
-                operation: '1107',
+                operation: 'a008',
                 domId: '_Tips-CTC-AssistPressBlock-Menu{TOP}'
             }
         },
         assistPressRestore:{
             menu: {
-                operation: '1108',
+                operation: 'a009',
                 domId: '_Tips-CTC-AssistPressRestore-Menu{TOP}'
             }
         },
         assistPressAccident:{
             menu: {
-                operation: '1109',
+                operation: 'a010',
                 domId: '_Tips-CTC-AssistPressAccident-Menu{TOP}'
             }
         },
         // // 批量修改股道
         // batchModifyTrackSection:{
         //     menu: {
-        //         operation: '1111',
+        //         operation: 'a011',
         //         domId: '_Tips-CTC-batchModifyTrackSection-Menu{TOP}'
         //     }
         // },
         // 修改股道
         modifyTrackSection:{
             menu: {
-                operation: '1111',
+                operation: 'a012',
                 domId: '_Tips-CTC-modifyTrackSection-Menu{TOP}'
             }
         },
         // // 移除行车日志
         // deleteRunplan:{
         //     menu: {
-        //         operation: '1112',
+        //         operation: 'a013',
         //         domId: '_Tips-CTC-deleteRunplan-Menu{TOP}'
         //     }
         // },
         // 修改行车计划的邻站信息
         modifyAdjacentStation:{
             menu: {
-                operation: '1113',
+                operation: 'a014',
                 domId: '_Tips-CTC-modifyAdjacentStation-Menu{TOP}'
             }
         },
         // 修改车次号(大铁CTC)
         modifyTripNumber:{
             menu: {
-                operation: '1114',
+                operation: 'a015',
                 domId: '_Tips-CTC-modifyTripNumber-Menu{TOP}'
             }
         },
         // 发送发车预告
         sendNotcie:{
             menu: {
-                operation: '1115',
+                operation: 'a016',
                 domId: '_Tips-CTC-sendNotcie-Menu{TOP}'
             }
         },
         // 同意发车预告
         agreeNotcie:{
             menu: {
-                operation: '1116',
+                operation: 'a017',
                 domId: '_Tips-CTC-agreeNotcie-Menu{TOP}'
             }
         },
         // 取消接预
         cancelReceivingNotice: {
             menu: {
-                operation: '1117',
+                operation: 'a018',
                 domId: '_Tips-CTC-CancelReceivingNotice-Menu{TOP}'
             }
         },
         // 取消发预
         cancelDepartureNotice: {
             menu: {
-                operation: '1118',
+                operation: 'a019',
                 domId: '_Tips-CTC-CancelDepartureNotice-Menu{TOP}'
             }
         },
         // 完成到点 FINISH_ARRIVE
         finishArrive: {
             menu: {
-                operation: '1119',
+                operation: 'a020',
                 domId: '_Tips-CTC-FinishArrive-Menu{TOP}'
             }
         },
         // 取消到点
         cancelArrive: {
             menu: {
-                operation: '1120',
+                operation: 'a021',
                 domId: '_Tips-CTC-CancelArrive-Menu{TOP}'
             }
         },
         // 完成发点 CTC_FINISH_DEPARTURE
         finishDeparture: {
             menu: {
-                operation: '1121',
+                operation: 'a022',
                 domId: '_Tips-CTC_FinishDeparture-Menu{TOP}'
             }
         },
         // 取消发点
         cancelDeparture: {
             menu: {
-                operation: '1122',
+                operation: 'a023',
                 domId: '_Tips-CTC_CancelDeparture-Menu{TOP}'
             }
         },
         // 增加列车固定径路
         addTrainFixedPath:{
             menu: {
-                operation: '1123',
+                operation: 'a024',
                 domId: '_Tips-CTC-addTrainFixedPath-Menu{TOP}'
             }
         },
         // 导入列车固定径路
         importTrainFixedPath:{
             menu: {
-                operation: '1124',
+                operation: 'a025',
                 domId: '_Tips-CTC-importTrainFixedPath-Menu{TOP}'
             }
         },
         // 删除列车固定径路
         deleteTrainFixedPath:{
             menu: {
-                operation: '1125',
+                operation: 'a026',
                 domId: '_Tips-CTC-deleteTrainFixedPath-Menu{TOP}'
             }
         },
         // 运行计划发布至CTC
         releaseTrainFixedPath:{
             menu: {
-                operation: '1126',
+                operation: 'a027',
                 domId: '_Tips-CTC-releaseTrainFixedPath-Menu{TOP}'
             }
         },
         // 设置进路
         setRoute: {
             menu: {
-                operation: '1127',
+                operation: 'a028',
                 domId: '_Tips-CTC-setRoute-Menu{TOP}'
             }
         },
         // 大铁 调度台 添加运行计划
         addDispatcherLogerRp: {
             menu: {
-                operation: '1128',
+                operation: 'a029',
                 domId: '_Tips-CTC-addDispatcherLogerRp-Menu{TOP}'
             }
         },
         // 大铁 调度台 删除运行计划
         deleteDispatcherLogerRp: {
             menu: {
-                operation: '1129',
+                operation: 'a030',
                 domId: '_Tips-CTC-addDispatcherLogerRp-Menu{TOP}'
             }
         },
         // 大铁 调度台 发布所有行车计划
         releaseAllDispatcherLogerRp:{
             menu: {
-                operation: '1130',
+                operation: 'a031',
                 domId: '_Tips-CTC-releaseAllDispatcherLogerRp-Menu{TOP}'
             }
         },
         // 车站签收行车计划
         stationSignRunplan:{
             menu: {
-                operation: '1131',
+                operation: 'a032',
                 domId: '_Tips-CTC-stationSignRunplan-Menu{TOP}'
             }
         },
         // 调度台行车计划修改股道
         modifyDispatcherLogerRpSection:{
             menu: {
-                operation: '1132',
+                operation: 'a033',
                 domId: '_Tips-CTC-modifyDispatcherLogerRpSection-Menu{TOP}'
             }
         },
         // 车站发送计划
         stationSendRunplan:{
             menu: {
-                operation: '1133',
+                operation: 'a034',
                 domId: '_Tips-CTC-stationSendRunplan-Menu{TOP}'
             }
         },
         // 车站取消红闪
         stationCancleTwinkle:{
             menu: {
-                operation: '1134',
+                operation: 'a035',
                 domId: '_Tips-CTC-stationCancleTwinkle-Menu{TOP}'
             }
         },
         // 调度台行车计划修改时间
         modifyDispatcherLogerRpPlanTime:{
             menu: {
-                operation: '1135',
+                operation: 'a036',
                 domId: '_Tips-CTC-modifyDispatcherLogerRpPlanTime-Menu{TOP}'
             }
         },
         // 调度台行车计划修改出入口
         modifyDispatcherLogerRpDirection:{
             menu: {
-                operation: '1136',
+                operation: 'a037',
                 domId: '_Tips-CTC-modifyDispatcherLogerRpDirection-Menu{TOP}'
             }
         },
         // 取消到达
         cancleArrive:{
             menu: {
-                operation: '1137',
+                operation: 'a038',
                 domId: '_Tips-CTC-cancleArrive-Menu{TOP}'
             }
         },
         // 取消出发
         cancleDepature:{
             menu: {
-                operation: '1138',
+                operation: 'a039',
                 domId: '_Tips-CTC-cancleDepature-Menu{TOP}'
             }
         },
         // 取消闭塞
         cancleBlock:{
             menu: {
-                operation: '1139',
+                operation: 'a040',
                 domId: '_Tips-CTC-cancleBlock-Menu{TOP}'
             }
         },
         // 设置重点列车
         setKeyTrains:{
             menu: {
-                operation: '1140',
+                operation: 'a041',
                 domId: '_Tips-CTC-setKeyTrains-Menu{TOP}'
             }
         },
         // 设置允许出入口与基本路径不一致
         setEntryOutDiscordant:{
             menu: {
-                operation: '1141',
+                operation: 'a042',
                 domId: '_Tips-CTC-setEntryOutDiscordant-Menu{TOP}'
             }
         },
         // 设置允许股道与基本路径不一致
         setTrackDiscordant:{
             menu: {
-                operation: '1142',
+                operation: 'a043',
                 domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
             }
         },
         // 设置始发
         setStartRunplan:{
             menu: {
-                operation: '1145',
+                operation: 'a044',
                 domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
             }
         },
         // 设置终到
         setEndRunplan:{
             menu: {
-                operation: '1146',
+                operation: 'a045',
                 domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
             }
         },
         // 设置删除标识
         setDeleteRunplanLabel:{
             menu: {
-                operation: '1147',
+                operation: 'a046',
                 domId: '_Tips-CTC-setDeleteRunplanLabel-Menu{TOP}'
             }
         },
         // 设置超限
         setTransfinite:{
             menu: {
-                operation: '1148',
+                operation: 'a047',
                 domId: '_Tips-CTC-setTransfinite-Menu{TOP}'
             }
         },
         // 行车日志保存运行计划
         logSaveRunplan:{
             menu: {
-                operation: '1149',
+                operation: 'a048',
                 domId: '_Tips-CTC-logSaveRunplan-Menu{TOP}'
             }
         },
         // 获取股道列表
         getStationTrack:{
             menu: {
-                operation: '1150',
+                operation: 'a049',
                 domId: 'getStationTrackTerminalStationTree'
             }
         },
         // 获取固定列车径路列表
         getTrainFixedPath:{
             menu: {
-                operation: '1151',
+                operation: 'a050',
                 domId: 'getTrainFixedPathTerminalStationTree'
             }
         },
         // 清空列车固定径路
         clearTrainFixedPath:{
             menu: {
-                operation: '1152',
+                operation: 'a051',
                 domId: '_Tips-CTC-clearTrainFixedPath-Menu{TOP}'
             }
         },
         // 股道发布生效区
         releaseStationTrack:{
             menu: {
-                operation: '1153',
+                operation: 'a052',
                 domId: '_Tips-CTC-releaseStationTrack-Menu{TOP}'
             }
         },
         // 修改股道信息
         modifyStationTrack:{
             menu: {
-                operation: '1154',
+                operation: 'a053',
                 domId: '_Tips-CTC-modifyStationTrack-Menu{TOP}'
             },
             edit: {
-                operation: '11541',
+                operation: 'a054',
                 domId: '_Tips-CTC-modifyStationTrack-edit{TOP}'
             }
         },
         // 出入口发布生效区
         releaseStationDirection:{
             menu: {
-                operation: '1155',
+                operation: 'a055',
                 domId: '_Tips-CTC-releaseStationDirection-Menu{TOP}'
             }
         },
         // 获取出入口列表
         getStationDirection:{
             menu: {
-                operation: '1156',
+                operation: 'a056',
                 domId: '_Tips-CTC-getStationDirection-Menu{TOP}'
             }
         },
         // 修改出入口
         modifyStationDirection:{
             menu: {
-                operation: '1157',
+                operation: 'a057',
                 domId: '_Tips-CTC-modifyStationDirection-Menu{TOP}'
             }
         },
         // 批量增加列车固定径路
         batchTrainFixedPath:{
             menu: {
-                operation: '1158',
+                operation: 'a058',
                 domId: '_Tips-CTC-batchTrainFixedPath-Menu{TOP}'
             }
         },
         // 固定列车径路从生效区更新
         updateTrainFixedPath2Station:{
             menu: {
-                operation: '1159',
+                operation: 'a059',
                 domId: '_Tips-CTC-updateTrainFixedPath2Station-Menu{TOP}'
             }
         },
         // 固定列车经路更新列表
         getStationTrainFixedPath:{
             menu: {
-                operation: '1160',
+                operation: 'a060',
                 domId: '_Tips-CTC-getStationTrainFixedPath-Menu{TOP}'
             }
         },
         // 固定列车经路更新加载到计划
         loadUpdateStationTrainFixedPath:{
             menu: {
-                operation: '1161',
+                operation: 'a061',
                 domId: '_Tips-CTC-loadUpdateStationTrainFixedPath-Menu{TOP}'
             }
         },
         // 修改列车固定径路
         modifyTrainFixedPath:{
             menu: {
-                operation: '1161',
+                operation: 'a062',
                 domId: '_Tips-CTC-loadUpdateStationTrainFixedPath-Menu{TOP}'
             }
         }
@@ -4189,6 +4316,10 @@ export const OperationEvent = {
             sideButton: {
                 operation: '1402',
                 domId: '_Tips-Conversation-Chat-sideButton'
+            },
+            record: {
+                operation: '1403',
+                domId: '_Tips-Conversation-Chat-record'
             }
         }
     },
@@ -4216,6 +4347,68 @@ export const OperationEvent = {
                 domId: '_Tips-TrainingDesign-menuButton-faultMode'
             }
         }
+    },
+    // 调度台
+    DispatcherManage: {
+        menu: {
+            schedulingPlan: {
+                operation: '1601',
+                domId: '_Tips-DispatcherManage-menu-schedulingPlan'
+            },
+            dispatchingCommand: {
+                operation: '1602',
+                domId: '_Tips-DispatcherManage-menu-dispatchingCommand'
+            },
+            dispatchWork: {
+                operation: '1603',
+                domId: '_Tips-DispatcherManage-menu-dispatchWork'
+            },
+            dataUpdate: {
+                operation: '1604',
+                domId: '_Tips-DispatcherManage-menu-dataUpdate'
+            },
+            timeLock: {
+                operation: '1605',
+                domId: '_Tips-DispatcherManage-menu-timeLock'
+            }
+        }
+    },
+    // 调度命令
+    DispatchCmd: {
+        menuButton: {
+            refreshSearch: {
+                operation: '1701',
+                domId: '_Tips-DispatchCmd-menuButton-refreshSearch'
+            },
+            createCmd: {
+                operation: '1702',
+                domId: '_Tips-DispatchCmd-menuButton-createCmd'
+            },
+            search: {
+                operation: '1703',
+                domId: '_Tips-DispatchCmd-menuButton-search'
+            },
+            allographCmd: {
+                operation: '1704',
+                domId: '_Tips-DispatchCmd-menuButton-allographCmd{BOTTOM}'
+            },
+            sendCmd: {
+                operation: '1705',
+                domId: '_Tips-DispatchCmd-menuButton-sendCmd{BOTTOM}'
+            },
+            saveCacheData: {
+                operation: '1706',
+                domId: '_Tips-DispatchCmd-menuButton-saveCacheData{BOTTOM}'
+            },
+            signCmdTrue: {
+                operation: '1707',
+                domId: '_Tips-DispatchCmd-menuButton-signCmdTrue{BOTTOM}'
+            },
+            signCmdFalse: {
+                operation: '1708',
+                domId: '_Tips-DispatchCmd-menuButton-signCmdFalse{BOTTOM}'
+            }
+        }
     }
 };
 
diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js
deleted file mode 100644
index e77f3f886..000000000
--- a/src/scripts/cmdPlugin/ValidateHandler.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { objectIsEqual } from '@/utils/date';
-import Handler from './Handler.js';
-import { TrainingMode, ScriptMode } from '@/scripts/ConstDic';
-
-class ValidateHandler {
-    vaildate(mode, operate) {
-        switch (mode) {
-        case TrainingMode.PRACTICE: // 练习模式
-            return this.vaildate_tips(operate);
-        case TrainingMode.TEACH: 	// 教学模式
-            return this.vaildate_tips(operate);
-        case ScriptMode.PRACTICE:
-            return this.vaildate_newTraining(operate);
-        case ScriptMode.TEACH:
-            return this.vaildate_newTraining(operate);
-        case ScriptMode.TEST:
-            return this.vaildate_newTrainingTest(operate);
-        }
-
-        return true;
-    }
-    vaildate_newTraining(operate) {
-        let valid = true;
-        if (Handler.getNewTrainingStart()) {
-            valid = this.judgeNewTraining(operate);
-        } else {
-            Handler.clear();
-            valid = false;
-        }
-        return valid;
-    }
-    vaildate_newTrainingTest(operate) {
-        let valid = true;
-        if (Handler.getNewTrainingStart()) {
-            this.judgeNewTraining(operate);
-        } else {
-            Handler.clear();
-            valid = false;
-        }
-        return valid;
-    }
-    vaildate_tips(operate) {
-        let valid = true;
-        if (Handler.getTrainingStart()) {
-            valid = this.judge(operate);
-        } else {
-            Handler.clear();
-            valid = false;
-        }
-
-        return valid;
-    }
-    judgeNewTraining(operate) {
-        const stepOperation = Handler.getNewTrainingOperation();
-        let valid = true;
-        if (operate.cmdType || stepOperation.operationType) {
-            const cmd = operate.cmdType ? operate.cmdType.value : '';
-            valid = (cmd === stepOperation.operationType) && valid;
-        }
-        if (operate.code || stepOperation.deviceCode) {
-            valid = (operate.code === stepOperation.deviceCode) && valid;
-        }
-        if (operate.operation || stepOperation.domId) {
-            valid = (operate.operation === stepOperation.domId) && valid;
-        }
-        if (operate.userOperationType || stepOperation.userOperationType) {
-            valid = (operate.userOperationType === stepOperation.userOperationType) && valid;
-        }
-        const opParam = operate.param == undefined ? {} : operate.param;
-        if (opParam || stepOperation.params) {
-            valid = objectIsEqual(opParam, stepOperation.params) && valid;
-        }
-        Handler.handleCheckNewTrainingResult(valid);
-        return valid;
-    }
-    /** 判断操作步骤是否正确 */
-    judge (operate) {
-        const steps = Handler.getSteps();
-        const order = Handler.getOrder();
-        let valid = false;
-
-        if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
-            if (operate && steps[0] &&
-                operate.code == steps[0].code &&
-                operate.operation == steps[0].operation) {
-                valid = true;
-            }
-        } else if (operate.over) { // 最后一步校验
-            const standard = steps[order];
-            if (operate && standard &&
-                        operate.operation == standard.operation &&
-                        operate.code == standard.code &&
-                        operate.val == standard.val) {
-                valid = true;
-            }
-        } else if (order < steps.length) { // 普通步骤信息校验
-            const standard = steps[order];
-            if (standard.type === 'bar') {
-                if (operate && standard &&
-					operate.operation == standard.operation &&
-					operate.val == standard.val) {
-                    valid = true;
-                }
-            } else {
-                if (operate && standard &&
-					operate.code == standard.code &&
-					operate.operation == standard.operation &&
-                    operate.val == standard.val &&
-                    (!standard.subType || standard.subType && operate.subType == standard.subType) ) {
-                    valid = true;
-                }
-            }
-
-        }
-
-        return valid;
-    }
-
-}
-
-export default new ValidateHandler();
diff --git a/src/scripts/cmdPlugin/newHandler.js b/src/scripts/cmdPlugin/newHandler.js
new file mode 100644
index 000000000..18a82be23
--- /dev/null
+++ b/src/scripts/cmdPlugin/newHandler.js
@@ -0,0 +1,185 @@
+import ValidateHandler from './newValidateHandler';
+import store from '@/store/index';
+import { sendCommandNew, endTrainingStep } from '@/api/jmap/training';
+import router from '@/router/index';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {UserOperationType} from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+class Handler {
+    constructor() {
+        this.operations = [];
+    }
+
+    undo(num) {
+        this.operations = this.operations.slice(0, num);
+    }
+
+    pop() {
+        this.operations.pop();
+    }
+
+    clear() {
+        this.operations.splice(0, this.operations.length);
+    }
+
+    storeOperation(operation) {
+        if (operation.start === true) {
+            this.clear();
+        }
+        this.operations.push(operation);
+    }
+
+    // 获取所有参数列表params
+    getWholeParam() {
+        const whole = {};
+        (this.operations || {}).forEach(elem => { Object.assign(whole, elem.param || {}); });
+        return whole;
+    }
+    // 获取cmdType
+    getCmdType() {
+        const cmdOperation = (this.operations || []).find(elem => elem.cmdType );
+        return cmdOperation ? cmdOperation.cmdType.value : '';
+    }
+    handle(operation) {
+        return new Promise((resolve, reject) => {
+            this.storeOperation(operation);
+            const valid = !this.isLoadTraining() || ValidateHandler.validate(this.getTrainingMode(), operation);
+            if (!valid) {
+                this.pop();
+                resolve({ valid });
+            } else if (operation.cancel === true) {
+                this.clear();
+                resolve({ valid });
+            } else if (operation.over === true || operation.send === true) {
+                const group = router.currentRoute.query.group;
+                const wholeParam = this.getWholeParam();
+                const cmdType = this.getCmdType();
+                if (!cmdType) {
+                    reject({ message: '未获取到操作指令！' });
+                } else {
+                    if (store.state.training.domConfig.trainingDesign) { // 实训设计模式下推送 指令数据
+                        store.dispatch('trainingNew/setSimCommand', {id: Date.now(), operationType: cmdType, params: wholeParam, simTime: store.state.socket.simulationTimeSync});
+                    }
+                    sendCommandNew(group, cmdType, wholeParam).then(response => {
+                        this.clear();
+                        resolve({ valid, response });
+                    }).catch(error => {
+                        this.clear();
+                        reject(error);
+                    });
+                }
+            } else {
+                resolve({ valid });
+            }
+        });
+    }
+    // 获取实训模式
+    getTrainingMode () {
+        return store.state.trainingNew.teachMode;
+    }
+    // 获取是否加载实训
+    isLoadTraining() {
+        return !!store.state.trainingNew.trainingDetail;
+    }
+    // 获取实训是否开始
+    getTrainingStart() {
+        return store.state.trainingNew.trainingSwitch;
+    }
+    // 获取实训操作
+    getTrainingOperation() {
+        const stepInfo = store.state.trainingNew.stepInfo;
+        const operateOrder = store.state.trainingNew.operateOrder;
+        return stepInfo.operations ? stepInfo.operations[operateOrder] : {};
+    }
+    // 是否为步骤最后一步操作
+    isLastOperation() {
+        const stepInfo = store.state.trainingNew.stepInfo;
+        const operateOrder = store.state.trainingNew.operateOrder;
+        return stepInfo.operations.length <= operateOrder + 1;
+    }
+    // 是否未特殊语音执行步骤列表的最后一步
+    isLastVoiceStep() {
+        return store.state.trainingNew.voiceStepList.length <= store.state.trainingNew.voiceStepIndex + 1;
+    }
+    // 计算当前步骤得分
+    computedScoring() {
+        const stepInfo = store.state.trainingNew.stepInfo;
+        const MyMemberId = store.state.training.myMemberId;
+        const scoringRules = store.state.trainingNew.scoringRules;
+        const scoringRule = scoringRules.find(rule => rule.memberId == MyMemberId);
+        if (scoringRule) {
+            const scoring = scoringRule.details.find(item => item.elementId == stepInfo.id);
+            store.dispatch('trainingNew/pushScoreList', scoring);
+        }
+    }
+    nextStep() {
+        const group = router.currentRoute.query.group;
+        const stepInfo = store.state.trainingNew.stepInfo;
+        this.computedScoring();
+        endTrainingStep(group, stepInfo.id).then(resp => {
+            store.dispatch('trainingNew/clearOperateOrder');
+        }).catch(e => {
+            console.error('进入下一步失败！', e);
+        });
+    }
+    // 判定是否转换特殊语音消息步骤列表 如果是跳过当前操作 进入特殊语音执行序列
+    judgeIsTextSendOperation() {
+        const stepInfo = store.state.trainingNew.stepInfo;
+        if (stepInfo.memberId !== store.state.training.myMemberId) {
+            return;
+        }
+        const operateOrder = store.state.trainingNew.operateOrder;
+        const operation = stepInfo.operations[operateOrder];
+        if (operation && operation.domId === OperationEvent.Conversation.Chat.menu.operation) {
+            this.handleVoiceStepList();
+        }
+    }
+    // 处理特殊语音消息步骤列表
+    handleVoiceStepList() {
+        const stepInfo = store.state.trainingNew.stepInfo;
+        const operateOrder = store.state.trainingNew.operateOrder;
+        const operation = stepInfo.operations[operateOrder];
+        const operation1 = {
+            userOperationType: UserOperationType.LEFTCLICK,
+            domId: OperationEvent.Conversation.Chat.sideButton.operation,
+            params: { chatBoxMin: true }
+        };
+        const step1 = {
+            description: '点击打开聊天室',
+            memberId: stepInfo.memberId,
+            operations: [operation1],
+            tipPosition: { deviceCode: '', domId: operation1.domId, operateIndex: 0 }
+        };
+        const operation2 = {
+            userOperationType: UserOperationType.LEFTCLICK,
+            domId: OperationEvent.Conversation.Chat.record.operation,
+            params: {}
+        };
+        const step2 = {
+            description: '点击录制语音',
+            memberId: stepInfo.memberId,
+            operations: [operation2],
+            tipPosition: { deviceCode: '', domId: operation2.domId, operateIndex: 0 }
+        };
+        const operation3 = {
+            userOperationType: UserOperationType.LEFTCLICK,
+            domId: OperationEvent.Conversation.Chat.record.operation,
+            operationType: CMD.Conversation.CMD_Conversation_Chat_Audio_Base64.value,
+            params: {
+                fileBase64Str: 'no'
+            }
+        };
+        const step3 = {
+            description: `请说出“${operation.params.content}”后，再次点击发送语音！`,
+            memberId: stepInfo.memberId,
+            operations: [operation3],
+            tipPosition: { deviceCode: '', domId: operation3.domId, operateIndex: 0 }
+        };
+        if (store.state.training.chatBoxMin) {
+            store.dispatch('trainingNew/setVoiceStepList', [step1, step2, step3]);
+        } else {
+            store.dispatch('trainingNew/setVoiceStepList', [step2, step3]);
+        }
+    }
+}
+export default new Handler();
diff --git a/src/scripts/cmdPlugin/newValidateHandler.js b/src/scripts/cmdPlugin/newValidateHandler.js
new file mode 100644
index 000000000..3c798b584
--- /dev/null
+++ b/src/scripts/cmdPlugin/newValidateHandler.js
@@ -0,0 +1,75 @@
+import { objectIsEqual } from '@/utils/date';
+import Handler from './newHandler.js';
+import { ScriptMode } from '@/scripts/ConstDic';
+import store from '@/store/index';
+import LangStorage from '@/utils/lang';
+import { OperationEvent } from './OperationHandler';
+class ValidateHandler {
+    validate(mode, operate) {
+        let valid = true;
+        if (Handler.getTrainingStart()) {
+            valid = this.judgeTraining(operate);
+            console.log(operate, valid, 'valid');
+            if ((mode === ScriptMode.PRACTICE || mode === ScriptMode.TEACH) && operate.operation !== OperationEvent.Conversation.Chat.record.operation) {
+                const rightMsg = {errMsg: LangStorage.getLang() === 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green'};
+                const errorMsg = {errMsg: LangStorage.getLang() === 'en' ? 'operation mistake!' : '操作错误！', color: 'red'};
+                store.dispatch('trainingNew/setOperateErrMsg', valid ? rightMsg : errorMsg);
+            }
+        } else {
+            const msg = { errMsg: LangStorage.getLang() === 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' };
+            store.dispatch('trainingNew/setOperateErrMsg', msg);
+            Handler.clear();
+            valid = false;
+        } return valid;
+    }
+    // 判断实训操作正确性
+    judgeTraining(operate) {
+        let stepOperation = {};
+        if (store.state.trainingNew.voiceStepIndex > -1) {
+            stepOperation = store.state.trainingNew.voiceStepList[store.state.trainingNew.voiceStepIndex].operations[0];
+        } else {
+            stepOperation = Handler.getTrainingOperation();
+        }
+        let valid = true;
+        if (operate.cmdType || stepOperation.operationType) {
+            const cmd = operate.cmdType ? operate.cmdType.value : '';
+            valid = (cmd === stepOperation.operationType) && valid;
+        }
+        if (operate.code || stepOperation.deviceCode) {
+            valid = (operate.code === stepOperation.deviceCode) && valid;
+        }
+        if (stepOperation.subType) {
+            valid = (operate.subType === stepOperation.subType) && valid;
+        }
+        if (operate.operation || stepOperation.domId) {
+            valid = (operate.operation === stepOperation.domId) && valid;
+        }
+        if (operate.userOperationType || stepOperation.userOperationType) {
+            valid = (operate.userOperationType === stepOperation.userOperationType) && valid;
+        }
+        if (stepOperation.val) {
+            // || operate.val
+            valid = ((operate.val).toString() === stepOperation.val.toString()) && valid;
+        }
+
+        const opParam = operate.param === undefined ? {} : operate.param;
+        if ((opParam || stepOperation.params) && !opParam.hasOwnProperty('fileBase64Str')) {
+            valid = objectIsEqual(opParam, stepOperation.params) && valid;
+        }
+
+        if (valid && store.state.trainingNew.voiceStepIndex > -1) {
+            !Handler.isLastVoiceStep() && store.dispatch('trainingNew/voiceStepIndexIncrease');
+        } else if (valid && Handler.isLastOperation()) {
+            Handler.nextStep();
+        } else if (valid) {
+            store.dispatch('trainingNew/operateOrderIncrease');
+            Handler.judgeIsTextSendOperation();
+        } else {
+            console.log(operate, stepOperation, '----------');
+            console.error('校验失败；');
+        }
+        return valid;
+    }
+}
+
+export default new ValidateHandler();
diff --git a/src/scripts/errorTip.js b/src/scripts/errorTip.js
index d08104b56..eccf7bfcc 100644
--- a/src/scripts/errorTip.js
+++ b/src/scripts/errorTip.js
@@ -1,6 +1,48 @@
-export default {
-    10002: '您权限已领取权限！',
-    10003: '您的权限数量不足！',
-    10013: '很抱歉，未查找到您的权限！',
-    10014: '很抱歉，您的权限暂不可用！'
-};
+export default function getErrorTip(code) {
+    let message = '';
+    switch (code) {
+    case '10002':
+        message = '您权限已领取！';
+        break;
+    case '10003':
+        message = '你的权限数据不足！';
+        break;
+    case '10013':
+        message = '很抱歉，未查找到您的权限！';
+        break;
+    case '10014':
+        message = '很抱歉，您的权限暂不可用！';
+        break;
+    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;
+    }
+    return message;
+}
diff --git a/src/store/index.js b/src/store/index.js
index 2b18f7145..7f5f0d01c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -19,6 +19,8 @@ import iscs from './modules/iscs';
 import rpTools from './modules/rpTools';
 import race from './modules/race';
 import trainingNew from './modules/trainingNew';
+import projectConfig from './modules/projectConfig';
+import lineList from './modules/lineList';
 
 import getters from './getters';
 
@@ -44,7 +46,9 @@ const store = new Vuex.Store({
         iscs,
         rpTools,
         race,
-        trainingNew
+        trainingNew,
+        projectConfig,
+        lineList
     },
     getters
 });
diff --git a/src/store/modules/ibp.js b/src/store/modules/ibp.js
index 9c0c50d56..43a090311 100644
--- a/src/store/modules/ibp.js
+++ b/src/store/modules/ibp.js
@@ -10,7 +10,8 @@ const ibp = {
         ibp: null, 				// 数据
         updateDeviceData: {}, // 修改的数据
         rightClickCount: 0, // 右键点击设备
-        ibpBgDevice: {} // ibp背景设备
+        ibpBgDevice: {}, // ibp背景设备
+        moreScreen: false // 切换按钮是否显示
     },
 
     getters: {
@@ -42,6 +43,9 @@ const ibp = {
         setIbpData: (state, ibp) => {
             state.ibp = ibp;
         },
+        setMoreScreen: (state, moreScreen) => {
+            state.moreScreen = moreScreen;
+        },
         setUpdateDeviceData: (state, model) => {
             state.rightClickCount++;
             state.updateDeviceData = model;
@@ -58,6 +62,9 @@ const ibp = {
         setIbpData: ({ commit }, ibp) => {
             commit('setIbpData', ibp);
         },
+        setMoreScreen: ({ commit }, moreScreen) => {
+            commit('setMoreScreen', moreScreen);
+        },
         updateIbpDevices: ({ commit }, models) => {
             return new Promise((resolve) => {
                 if (!(models instanceof Array)) {
diff --git a/src/store/modules/lineList.js b/src/store/modules/lineList.js
new file mode 100644
index 000000000..4b6b67fb0
--- /dev/null
+++ b/src/store/modules/lineList.js
@@ -0,0 +1,23 @@
+const lineList = {
+    namespaced: true,
+
+    state: {
+        lineList: [] // 线路列表
+    },
+    mutations: {
+        setLineList: (state, lineList) => {
+            if (lineList && lineList.length) {
+                state.lineList = lineList;
+            } else {
+                state.lineList = [];
+            }
+        }
+    },
+    actions: {
+        setLineList({ commit }, lineList) {
+            commit('setLineList', lineList);
+        }
+    }
+};
+
+export default lineList;
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 6e5f220ab..44a899239 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -225,6 +225,7 @@ const map = {
         mapDevice: {}, // 解析后的地图数据
         mapList: {}, // 地图数据列表
         mapViewLoadedCount: 0, // 地图视图加载完成标识
+        initJlmapLoadedCount: 0, // Jlmap初始化表示
         mapDataLoadedCount: 0, // 地图数据加载完成标识
         mapStateLoadedCount: 0, // 地图状态变化完成标识
         mapDataLoadedScreenCount: 0, // 大屏加载完成
@@ -255,7 +256,10 @@ const map = {
         foldLineMap: {}, // 现地折行线map数据
         clearButtonCount: 0, // 清除操作按钮计数器
         stationControlMap: {}, // 站控显示的map { 当前车站：显示车站列表 }
-        pictureDeviceMap: {} // 画面设备修正map
+        pictureDeviceMap: {}, // 画面设备修正map
+        picture:'', // 当前的客户端
+        domConfig: null, // 仿真配置
+        initClient: '' // 仿真初始客户端
     },
 
     getters: {
@@ -302,6 +306,25 @@ const map = {
         map: state => {
             return state.map;
         },
+        memberMetroList: state => {
+            if (!state.map.memberMap) {
+                // this.$set()
+                state.map.memberMap = {METRO: [], RAILWAY: [], EMERGENCY: []};
+            }
+            return state.map.memberMap.METRO;
+        },
+        memberRailwayList: state => {
+            if (!state.map.memberMap) {
+                state.map.memberMap = {METRO: [], RAILWAY: [], EMERGENCY: []};
+            }
+            return state.map.memberMap.RAILWAY;
+        },
+        memberEmergencyList: state => {
+            if (!state.map.memberMap) {
+                state.map.memberMap = {METRO: [], RAILWAY: [], EMERGENCY: []};
+            }
+            return state.map.memberMap.EMERGENCY;
+        },
         psdList: state => {
             if (state.map) {
                 return state.map.psdList;
@@ -659,14 +682,6 @@ const map = {
 
             return device;
         },
-        getStationCodeByTrain: state => train => {
-            if (train && train.sectionCode) {
-                const section = state.mapDevice[train.sectionCode];
-                if (section && section.stationCode) {
-                    return state.mapDevice[section.stationCode];
-                }
-            }
-        },
         // 通过循环区段来获取控制模式
         getDeviceTrainWindowCodeByStationCode: state => code => {
             let device = null;
@@ -777,6 +792,19 @@ const map = {
         // 设置地图数据
         setMapData: (state, map) => {
             if (map && map.skinVO) {
+                if (!map.memberMap) {
+                    map.memberMap = { METRO: [], RAILWAY: [], EMERGENCY: [] };
+                } else {
+                    if (!map.memberMap.METRO) {
+                        map.memberMap.METRO = [];
+                    }
+                    if (!map.memberMap.RAILWAY) {
+                        map.memberMap.RAILWAY = [];
+                    }
+                    if (!map.memberMap.EMERGENCY) {
+                        map.memberMap.EMERGENCY = [];
+                    }
+                }
                 state.map = map;
                 let showConfig = {};
                 if (Vue.prototype.$jlmap && typeof Vue.prototype.$jlmap.getShowConfig === 'function') {
@@ -800,7 +828,7 @@ const map = {
                         state.stationControlMap[station.code] = centrailzedList;
                         station.relStationCodeList.forEach(relStationCode => {
                             state.stationControlMap[relStationCode] = centrailzedList;
-                            if (state.mapDevice[relStationCode].centralized) {
+                            if (state.mapDevice[relStationCode].centralized && !centrailzedList.includes(relStationCode)) {
                                 centrailzedList.push(relStationCode);
                             }
                         });
@@ -862,6 +890,12 @@ const map = {
         mapViewLoadedCountIncrement: state => {
             state.mapViewLoadedCount += 1;
         },
+        initJlmapLoadedCountIncrement: state => {
+            state.initJlmapLoadedCount += 1;
+        },
+        initJlmapLoadedCountClear: state => {
+            state.initJlmapLoadedCount = 0;
+        },
         mapDataLoadedCountIncrement: state => {
             state.mapDataLoadedCount += 1;
         },
@@ -1110,6 +1144,9 @@ const map = {
         },
         setPictureDeviceMap: (state, pictureDeviceMap) => {
             state.pictureDeviceMap = pictureDeviceMap;
+        },
+        setPicture: (state, picture) => {
+            state.picture = picture;
         }
     },
 
@@ -1216,7 +1253,7 @@ const map = {
                     }
                 });
                 const list = Object.values(dict);
-                if (window.location.href.includes('/design/usermap/map/draw')) {
+                if (window.location.href.includes('/lineDesign/usermap/map/draw')) {
                     handleOperation(state, list);
                 }
                 commit('mapRender', list);
@@ -1265,7 +1302,12 @@ const map = {
         mapViewLoaded: ({ commit }) => {
             commit('mapViewLoadedCountIncrement');
         },
-
+        initJlmapLoaded: ({ commit }) => {
+            commit('initJlmapLoadedCountIncrement');
+        },
+        initJlmapLoadedCountClear:({commit}) => {
+            commit('initJlmapLoadedCountClear');
+        },
         mapViewScreenLoaded: ({ commit }) => {
             commit('mapViewLoadedScreenCountIncrement');
         },
@@ -1384,6 +1426,9 @@ const map = {
         },
         setPictureDeviceMap: ({ commit }, pictureDeviceMap) => {
             commit('setPictureDeviceMap', pictureDeviceMap);
+        },
+        setPicture: ({ commit }, picture) => {
+            commit('setPicture', picture);
         }
     }
 };
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 145ccd55d..1a1bef2a3 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -3,6 +3,7 @@ import { publicAsyncRoute, asyncRouter, constantRoutes, user, projectTrain, proj
     projectSrsandbox, projectJxgm, projectSay, projectRichorhhcj, projectTeaching } from '@/router/index';
 import { loginInfo } from '@/scripts/ProjectConfig';
 import { getSessionStorage } from '@/utils/auth';
+import store from '@/store/index';
 
 /**
  * 通过meta.role判断是否与当前用户权限匹配及子系统生成
@@ -13,6 +14,9 @@ function hasPermission(roles, route, parentsRoles) {
     if (!getSessionStorage('project')) {
         return false;
     }
+    if (route.companyAdmin) { // 判断有没有组织角色（管理员，教师）
+        return store.state.permission.companyAdmin || roles.includes(admin);
+    }
     if (route.meta && route.meta.roles) {
         // 如果存在本级路由，则使用自己的roles过滤
         if (getSessionStorage('project').startsWith('design') || getSessionStorage('project').startsWith('refereeJsxt')) {
@@ -20,7 +24,8 @@ function hasPermission(roles, route, parentsRoles) {
             return result.length && route.meta.roles.indexOf(userTrainingPlatform) < 0;
         } else {
             roles = roles.filter((role) => route.meta.roles.indexOf(role) >= 0);
-            return roles.some(role => route.meta.roles.indexOf(role) >= 0) && route.meta.roles.indexOf(userTrainingPlatform) >= 0;
+            // return roles.some(role => route.meta.roles.indexOf(role) >= 0) && route.meta.roles.indexOf(userTrainingPlatform) >= 0;
+            return roles.some(role => route.meta.roles.indexOf(role) >= 0);
         }
     } else if (parentsRoles) {
         // 如果没有本级路由，有父级路由，则使用父级路由过滤
@@ -84,19 +89,24 @@ function filterAsyncRouter(asyncRouter, roles, parentsRoles) {
 const permission = {
     state: {
         routes: constantRoutes,
-        addRouters: []
+        addRouters: [],
+        companyAdmin: false
     },
     mutations: {
         SET_ROUTERS: (state, routes) => {
             state.addRouters = routes;
             state.routes = constantRoutes.concat(routes);
+        },
+        SET_COMANYADMIN: (state, companyAdmin) => {
+            state.companyAdmin = companyAdmin;
         }
     },
     actions: {
         // 生成其他权限路由
-        GenerateRoutes({ commit }, data) {
+        GenerateRoutes({ commit, rootState }, data) {
             return new Promise(resolve => {
-                const { roles } = data;
+                const { roles, companyAdmin } = data;
+                commit('SET_COMANYADMIN', companyAdmin);
                 if (roles.includes(superAdmin) && !roles.includes(admin)) { // 只拥有超级管理员 没有管理员权限
                     roles.push(admin);
                 }
@@ -110,6 +120,9 @@ const permission = {
                     if (route.children && route.children.length == 0) {
                         route.hidden = true;
                     }
+                    if (route.path == '/case') { // 案例菜单是否显示
+                        route.hidden = !rootState.projectConfig.caseShow;
+                    }
                 });
                 commit('SET_ROUTERS', accessedRouters);
                 resolve();
diff --git a/src/store/modules/projectConfig.js b/src/store/modules/projectConfig.js
new file mode 100644
index 000000000..4e6ed7002
--- /dev/null
+++ b/src/store/modules/projectConfig.js
@@ -0,0 +1,45 @@
+const user = {
+    state: {
+        homeProLogoWidth:0,
+        loginProLogo:'',
+        homeTitle:'',
+        caseShow: true,
+        helpShow: true
+    },
+    mutations: {
+        setHomeProLogoWidth: (state, homeProLogoWidth) => {
+            state.homeProLogoWidth = homeProLogoWidth;
+        },
+        setLoginProLogo: (state, loginProLogo) => {
+            state.loginProLogo = loginProLogo;
+        },
+        setHomeTitle: (state, homeTitle) => {
+            state.homeTitle = homeTitle;
+        },
+        setCaseShow: (state, caseShow) => {
+            state.caseShow = caseShow;
+        },
+        setHelpShow: (state, helpShow) => {
+            state.helpShow = helpShow;
+        }
+    },
+    actions: {
+        setHomeProLogoWidth({ commit }, homeProLogoWidth) {
+            commit('setHomeProLogoWidth', homeProLogoWidth);
+        },
+        setLoginProLogo({ commit }, loginProLogo) {
+            commit('setLoginProLogo', loginProLogo);
+        },
+        setHomeTitle({ commit }, homeTitle) {
+            commit('setHomeTitle', homeTitle);
+        },
+        setCaseShow({ commit }, caseShow) {
+            commit('setCaseShow', caseShow);
+        },
+        setHelpShow({ commit }, helpShow) {
+            commit('setHelpShow', helpShow);
+        }
+    }
+};
+
+export default user;
diff --git a/src/store/modules/runplan.js b/src/store/modules/runplan.js
index a56649ab3..6857f69e5 100644
--- a/src/store/modules/runplan.js
+++ b/src/store/modules/runplan.js
@@ -176,10 +176,7 @@ const runPlan = {
         },
         /** 设置stations数据 */
         setStations: ({ commit }, mapModel) => {
-            return new Promise((resolve) => {
-                commit('setStations', mapModel);
-                resolve(mapModel);
-            });
+            commit('setStations', mapModel);
         },
         /** 重置运行图数据更新池 */
         resetRunPlanData:({ commit }) => {
@@ -218,10 +215,7 @@ const runPlan = {
         },
         /** 清空数据*/
         clear: ({ commit }) => {
-            return new Promise((resolve) => {
-                commit('clear');
-                resolve();
-            });
+            commit('clear');
         },
         draftClear: ({ commit }) => {
             return new Promise(resolve => {
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index 7f7360e5e..a6daff985 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -1,6 +1,5 @@
 import store from '@/store/index';
 import { copyAssign } from '@/utils/index';
-import { Notification } from 'element-ui';
 
 function handleSockInfo(state, msg, type) {
     switch (type) {
@@ -27,403 +26,18 @@ function handleSimulationStateMsg(state, type) {
         break;
     }
 }
-function handle(state, data) {
-    // console.log(data, 'socket订阅');
-    const msg = data.body;
-    const path = window.location.href;
-    if ((path.includes('/practiceDisplay') || path.includes('/planSchedule/window')) && !state.isFirst) { state.isFirst = true; }
-    switch (data.type) {
-    case 'Order_Pay_Result': // 订单支付结果消息
-        state.payOrder = msg;
-        break;
-    case 'JointTraining_Room': // 综合演练室-房间消息
-        if (!path.includes('/plan') || !path.includes('/dp/')) {
-            state.jointRoomInfo = msg; // 房间信息
-        }
-        break;
-    case 'JointTraining_User': // 综合演练室-用户消息
-        handleUserinfo(state, msg); // 分配角色权限消息
-        break;
-    case 'JointTraining_Chat': //  综合演练室-群聊消息
-        handleRecordList(state, msg);
-        break;
-    case 'Simulation_DeviceStatus': // 仿真-设备状态消息
-        state.equipmentStatus = msg;
-        break;
-    case 'Simulation_User': // 仿真-进出仿真消息
-        handleSimulationUserinfo(state, msg); // 用户进出仿真消息
-        break;
-    case 'Simulation_Script_Action_Tip': // 剧本提示消息
-        handleSimulationScriptTipInfo(state, msg); // 剧本提示消息
-        break;
-    case 'Simulation_Script_Action_Finish':
-        state.simulationScriptTipFinish++; // 剧本某一部操作完成提示
-        break;
-    case 'Simulation_Script_Action_Error':
-        state.simulationScriptTipError++; // 剧本某一部操作执行错误
-        break;
-    case 'Simulation_PlayBack_Finish': // 竞赛裁判系统裁判员回放结束推送
-        state.playBackFinish++; // 竞赛裁判系统裁判员回放结束推送
-        break;
-    case 'Simulation_Over': // 用户退出仿真推送消息
-        state.simulationOver++; // 用户退出仿真推送消息
-        break;
-    case 'Simulation_Script_Finish': // 剧本执行完成推送消息
-        state.scriptFinish++; // 剧本执行完成推送消息
-        break;
-    case 'Simulation_Script_Action':// 剧本编制添加指令的推送消息
-        state.scriptAction = msg;
-        break;
-    case 'Simulation_AutoFault_Trigger': // 自动故障触发操作推送消息
-        state.autoFaultTrigger++;
-        break;
-    case 'Simulation_RunFact': // 仿真-列车实际到发车站消息
-        if (!Array.isArray(msg)) {
-            state.trainStationList = [msg];
-        } else {
-            state.trainStationList = msg;
-        }
-        break;
-    case 'Simulation_Error': // 仿真-异常消息
-        state.simulationError += 1;
-        break;
-    case 'Simulation_RunAsPlan_Start': // 仿真-仿真开始按计划行车消息
-        state.simulationStart = msg;
-        break;
-    case 'Simulation_Reset': // 仿真-仿真重置消息 退出计划行车
-        state.simulationReset += 1;
-        break;
-    case 'Simulation_Conversation': // 仿真-用户交互消息（聊天/命令）
-        handleSimulationInfo(state, msg);
-        break;
-    case 'Simulation_Conversation_Operation': // 仿真-用户交互消息（聊天/命令）-新
-        handleSimulationInfo(state, {id: msg.id, message: msg, messageType: 'MESSAGE'});
-        break;
-    case 'Simulation_PlayBack_Conversation': // 回放-用户交互消息
-        handleSimulationInfo(state, msg);
-        break;
-
-    case 'Simulation_ApplyHandle': 	// 请求处理消息（旧版可能在用，新版地图不用这个）
-        handlePushMsgQueue(state, msg);
-        break;
-
-    case 'JointTraining_User_Permit': // 综合演练室-用户获取权限消息
-        state.userPermit = msg;
-        break;
-    case 'Simulation_Invite': // 综合演练-仿真邀请消息
-        state.simulationInvite = msg;
-        break;
-    case 'JointTraining_Room_Invite': // 综合演练室-房间邀请消息
-        state.roomInvite = msg;
-        break;
-    case 'Big_Screen_Simulation_DeviceStatus': // 大屏仿真状态数据
-        state.equipmentStatus = msg;
-        break;
-    case 'Big_Screen_Simulation_RunFact': 	// 大屏仿真运行图状态
-        state.trainStationList = msg;
-        break;
-    case 'Plan_Simulation_DeviceStatus': // 大屏仿真状态数据
-        state.equipmentStatus = msg;
-        break;
-    case 'Plan_Simulation_RunFact': 	// 大屏仿真运行图状态
-        state.trainStationList = msg;
-        break;
-    case 'Simulation_Permission_Over': // 权限结束
-        state.permissionOver = msg;
-        break;
-    case 'Simulation_Quest_Finish': // 任务结束标志
-        state.tipOperateCount++;
-        break;
-    case 'JointTraining_Device':
-        state.realDeviceInfo++;
-        break;
-    case 'Be_Logged_Out': // 重复登录被登出
-        state.beLogoutCount++;
-        state.loggedOutMsg = msg;
-        break;
-    case 'Simulation_Run_Plan_Reload': // 运行图变更
-        state.runPlanReloadCount++;
-        break;
-    case 'Simulation_Control_Pause': // 暂停中
-        store.dispatch('scriptRecord/updateSimulationPause', msg);
-        break;
-    case 'BROADCAST': // 升级通知消息
-        Notification.warning({
-            title: msg.title,
-            center: true,
-            message: msg.message,
-            position: 'bottom-right',
-            showClose: msg.showClose,
-            duration: 0
-        });
-        break;
-    case 'Simulation_Member':
-        state.memberChangeCount++;
-        break;
-    case 'Simulation_Time_Sync':
-        state.simulationTimeSync = msg;
-        break;
-    case 'Simulation_IbpStatus':
-        state.simulationIbpStatus = msg;
-        break;
-    case 'Simulation_Competition_Practice_Finish':
-        state.competitionPracticeFinish++;
-        break;
-    case 'Simulation_Alarm':
-        state.simulationAlarmInfo = msg;
-        break;
-    case 'STATION_PFI_NUM':
-        state.stationPfiNum = msg;
-        break;
-    case 'STAND_PFI':
-        state.standPfiNum = msg;
-        break;
-    case 'TRAIN_PFI_NUM':
-        state.trainPfiNum = msg;
-        break;
-    case 'TRAIN_PFI_BL':
-        state.trainPfiBL = msg;
-        break;
-    case 'LPF_STRATEGY_RECOMMEND':
-        state.LPFstrategy = msg;
-        break;
-    case 'Simulation_Scenes_Reload':
-        if (msg) {
-            store.dispatch('training/start');
-        } else {
-            store.dispatch('training/over');
-        }
-        state.trainingReloadCount++;
-        break;
-    case 'Simulation_PslStatus':
-        state.simulationPslStatus = msg;
-        break;
-        // 运行图加线/抽线/变化推送消息
-    case 'Simulation_Trip_Plan_Change':
-        state.simulationPlanChange = msg;
-        break;
-        // 占线板信息
-    case 'Simulation_RailCtcStatus':
-        state.railCtcStatusMsg = msg;
-        break;
-        // 大铁项目 ctc 运行图初始化信息
-    // case 'SIMULATION_CTC_RUN_PLAN_INIT':
-    //     msg.forEach(element => {
-    //         const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
-    //         const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
-    //         if (tripNumberDe) { parseInt(tripNumberDe[tripNumberDe.length - 1]) % 2 == 0 ? element.departRunPlan.up = tripNumberDe : element.departRunPlan.down = tripNumberDe; }
-    //         if (tripNumberAr) { parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr; }
-    //         const code = element.stationCode + '' + element.code;
-    //         state.railCtcRunplanInitMsg[code] = element;
-    //     });
-    //     break;
-        // 大铁项目 ctc 运行图改变信息
-    case 'SIMULATION_CTC_RUN_PLAN_CHANGE':
-        state.voiceBroadcastMsgs = [];
-        msg.forEach(element => {
-            const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
-            const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
-            if (tripNumberDe) {
-                element.departRunPlan.up = '';
-                element.departRunPlan.down = '';
-                parseInt(tripNumberDe[tripNumberDe.length - 1]) % 2 == 0 ? element.departRunPlan.up = tripNumberDe : element.departRunPlan.down = tripNumberDe;
-            }
-            if (tripNumberAr) {
-                element.arriveRunPlan.up = '';
-                element.arriveRunPlan.down = '';
-                parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr;
-            }
-            const code = element.stationCode + '' + element.code;
-            if (store.state.training.roleDeviceCode === element.stationCode && element.arriveRunPlan && element.arriveRunPlan.adjacentMessage === '1') {
-                state.voiceBroadcastMsgs.push(element.stationCode + '' + element.code);
-            }
-            state.railCtcRunplanInitMsg[code] = copyAssign(state.railCtcRunplanInitMsg[code] || {}, element);
-        });
-        if (state.voiceBroadcastMsgs.length) {
-            state.voiceBroadcastChange++;
-        }
-        state.railCtcRunplanChange++;
-        break;
-    // 大铁项目 ctc 调度发布行车计划 给车站下发消息
-    case 'SIMULATION_RAILWAY_RUN_PLAN_SEND':
-        msg.forEach(each=>{
-            state.railwaySimulationRunplanSendMap[each.stationCode] = each;
-        });
-        state.railwaySimulationRunplanSendChange++;
-        break;
-        // 大铁项目 ctc 车务管理端 初始化消息
-    case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_INIT':
-        state.railCtcStationManageRpMsg = {};
-        msg.forEach(element => {
-            const code = element.stationCode + '' + element.tripNumber;
-            state.railCtcStationManageRpMsg[code] = element;
-        });
-        // state.railCtcStationManageRpChange++;
-        break;
-        // 大铁项目 ctc 车务管理端 修改/增加消息
-    case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_CHANGE':
-        msg.forEach(element => {
-            const code = element.stationCode + '' + element.tripNumber;
-            state.railCtcStationManageRpMsg[code] = copyAssign(state.railCtcStationManageRpMsg[code] || {}, element);
-        });
-        state.railCtcStationManageRpChange++;
-        break;
-    // 大铁项目 ctc 车务管理端 移除消息
-    case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_REMOVE':
-        msg.forEach(element => {
-            const code = element.stationCode + '' + element.tripNumber;
-            delete state.railCtcStationManageRpMsg[code];
-        });
-        state.railCtcStationManageRpChange++;
-        break;
-        // 调度命令信息
-    case 'SIMULATION_RAIL_CTC_DIS_COMMAND_ADD':
-        state.dispatchCommandMsg = msg;
-        break;
-        // 调度命令状态
-    case 'SIMULATION_RAIL_CTC_DIS_COMMAND_SYNC':
-        state.dispatchCommandState = msg;
-        console.log('调度命令状态', msg);
-        break;
-        // 车站发送计划信息
-    case 'SIMULATION_CTC_RUN_PLAN_CONFIRM_SEND':
-        state.changedCtcRunplanMap = msg;
-        break;
-    case 'SIMULATION_RAIL_TICKET':
-        state.ticketInfo = msg;
-        break;
-    // 实训提示消息
-    case 'Simulation_Training_Step_Tip':
-        state.trainingStepTip = msg;
-        break;
-    case 'Simulation_Training_Finish':
-        state.trainingOverCount++;
-        break;
-    case 'YJDDZH_TRAIN_POSITION':
-        state.whTrainInfo = msg;
-        break;
-    case 'Simulation_Training_Step_Finish':
-        state.trainingStepFinishCount++;
-        break;
-        //
-    // // 大铁项目 调度台 运行图信息 初始化消息
-    // case 'SIMULATION_RAILWAY_RUN_PLAN_INIT':
-    //     state.railwaySimulationRpMsg = {};
-    //     msg.forEach(element => {
-    //         const code = element.stationCode + '' + element.runPlanCode;
-    //         state.railwaySimulationRpMsg[code] = element;
-    //     });
-    //     break;
-    // // 大铁项目 调度台 运行图信息 修改/增加消息
-    // case 'SIMULATION_RAILWAY_RUN_PLAN_CHANGE':
-    //     msg.forEach(element => {
-    //         const code = element.stationCode + '' + element.runPlanCode;
-    //         state.railwaySimulationRpMsg[code] = copyAssign(state.railwaySimulationRpMsg[code] || {}, element);
-    //     });
-    //     state.railwaySimulationRpChange++;
-    //     break;
-    // // 大铁项目 调度台 运行图信息 移除消息
-    // case 'SIMULATION_RAILWAY_RUN_PLAN_REMOVE':
-    //     msg.forEach(element => {
-    //         const code = element.stationCode + '' + element.runPlanCode;
-    //         delete state.railwaySimulationRpMsg[code];
-    //     });
-    //     state.railwaySimulationRpChange++;
-    //     break;
-    }
-}
-
-// 操作聊天信息
-function handleRecordList(state, data) {
-    const userId = store.state.user.id;
-    let isSelf = false;
-    if (data.member.id == userId) {
-        isSelf = true;
-    }
-    const myDate = new Date();
-    const myDate1 = myDate.toLocaleDateString().replace(/\//g, '-');
-    const param = {
-        join: false,
-        value: data.message,
-        self: isSelf,
-        voice: data.isAudio,
-        src: data.isAudio ? `${data.audioPath}` : '',
-        other: !isSelf,
-        userName: data.member.nickName,
-        chatTime: data.chatTime,
-        chatInfo: true,
-        inSimulation: false,
-        inRoom: true,
-        date: +new Date(`${myDate1} ${data.chatTime}`)
-    };
-    state.chatContent = param;
-}
-// 仿真内部聊天
-function handleSimulationInfo(state, data) {
-    switch (data.messageType) {
-    case 'INVITE':
-        state.inviteSimulationConversition = data;
-        break;
-    case 'CONNECT':
-        state.acceptConversionInvite = data;
-        break;
-    case 'OVER':
-        state.overConversition = data;
-        break;
-    case 'MESSAGE':
-        state.conversationInfo = data;
-        break;
-    case 'CREATE':
-        state.createConversition = data;
-        break;
-    case 'EXIT':
-        state.exitConversition = data;
-        break;
-    }
-}
-
-// 剧本提示
-function handleSimulationScriptTipInfo(state, data) {
-    state.simulationScriptTip = data;
-}
-
-function handleUserinfo(state, data) {
-    state.roleList = (data instanceof Array) ? data : [data];
-}
-
-function handleSimulationUserinfo(state, data) {
-    state.simulationRoleList = (data instanceof Array) ? data : [data];
-}
-
-// （旧版可能在用，新版地图不用这个）
-function handlePushMsgQueue(state, msg) {
-    if (msg instanceof Array) {
-        state.msgQueue.concat(msg);
-    } else {
-        state.msgQueue.push(msg);
-    }
-
-    if (!state.msgHead) {
-        state.msgHead = state.msgQueue[0];
-    }
-}
 
 const socket = {
     namespaced: true,
 
     state: {
         payOrder: '', // 支付订单
-        jointRoomInfo: {}, // 受邀请房间信息
-        chatContent: {}, // 聊天室聊天内容
-        roleList: [], // 设置角色信息
         simulationRoleList:[], // 设置仿真的聊天角色信息
         simulationScriptTip:{}, // 剧本推送提示信息
         simulationScriptTipFinish:0, // 剧本某一步完成的消息
         simulationScriptTipError: 0, // 剧本某一步执行错误
-        scriptFinish:0, // 剧本执行完成提示信息
         autoFaultTrigger:0, // 自动故障触发操作推送消息
         scriptAction:{}, // 剧本编制添加指令的推送消息
-        playBackFinish:0, // 竞赛裁判系统裁判回放结束推送
         jointRoomPrepare: false, // 演练房间准备状态
         equipmentStatus: [], // 仿真-设备状态消息
         trainStationList: [], //  仿真-列车实际到发车站消息
@@ -431,11 +45,11 @@ const socket = {
         simulationStart: '',	// 仿真-开始消息
         simulationOver:0, // 退出仿真推送消息
         simulationReset: 0, // 仿真-异常消息
-        inviteSimulationConversition: {}, // 仿真会话邀请消息
+        inviteSimulationConversation: {}, // 仿真会话邀请消息
         acceptConversionInvite:{}, // 仿真会话成员接收邀请
-        createConversition:{}, // 仿真创建会话
-        overConversition: {}, // 仿真会话结束
-        exitConversition: {}, // 仿真成员退出会话
+        createConversation:{}, // 仿真创建会话
+        overConversation: {}, // 仿真会话结束
+        exitConversation: {}, // 仿真成员退出会话
         conversationInfo: {}, // 仿真会话消息
         ticketInfo: {}, // 路票消息
 
@@ -443,25 +57,18 @@ const socket = {
         msgQueue: [],	// 命令请求列表（旧版控制权转移可能在用，新版不用这个）
         msgHead: null,	// 消息头（旧版控制权转移可能在用，新版不用这个）
 
-        userPermit: {}, // 用户获取权限消息
         userRoomKickOut: {}, // 用户被踢出房间消息
         userInRoom: {}, // 用户从外部进入房间消息
         userOutRoom: {}, // 用户退出房间消息
         userInSimulation: {}, //  用户进入仿真消息
         userBackRoom: {}, // 用户从仿真返回房间消息
-        simulationInvite: {}, // 用户扫码信息
-
-        permissionOver: {}, // 权限结束
 
         roomIsSubscribe:false, // 房间是否订阅
         assistantIsSubscribe:false, // 综合演练仿真聊天是否订阅
 
-        tipOperateCount: 0, // 任务结束提示消息
-        realDeviceInfo: 0, // 真实设备信息
         beLogoutCount: 0, // 被登出
         runPlanReloadCount: 0, // 仿真运行图变更
         memberChangeCount: 0, // 仿真成员变更
-        roomInvite: {},
         simulationTimeSync: '', // 仿真时间
         simulationIbpStatus: null,
         stationPfiNum: null, // 客流消息列表
@@ -493,11 +100,9 @@ const socket = {
         railwaySimulationRunplanSendChange:0, // 大铁项目 调度台 发布 行车计划变化
         voiceBroadcastMsgs: [], // 语音播报信息
         voiceBroadcastChange: 0, // 语音播报信息变化
-        trainingStepTip: '', // 新实训推送消息
         trainingOverCount: 0, // 新实训结束计数器
         trainingReloadCount: 0,
         whTrainInfo: null,
-        trainingStepFinishCount: 0,
         // railwaySimulationRpMsg:{}, // 大铁项目 调度台 调度台
         // railwaySimulationRpChange:0, // 大铁项目 调度台 运行图信息变化
         standPisState: {
@@ -510,23 +115,18 @@ const socket = {
         onboardPisState: {
             nextStationName: '',
             endStationName: ''
-        }
+        },
+        simulationWorkParam: {},
+        conversationMessage: {},
+        controlTransfer: {}
     },
     getters: {
     },
     mutations: {
-        setJointRoomInfo: (state, jointRoomInfo) => {
-            state.jointRoomInfo = jointRoomInfo;
-        },
-
         setStationPfiNum: (state, stationPfiNum) => {
             state.stationPfiNum = stationPfiNum;
         },
 
-        setChatContent: (state, chatContent) => {
-            state.chatContent = chatContent;
-        },
-
         setEquipmentStatus: (state, equipmentStatus) => {
             state.equipmentStatus = equipmentStatus;
         },
@@ -553,17 +153,16 @@ const socket = {
             state.msgQueue.shift();
             state.msgHead = state.msgQueue[0];
         },
+        handlePushMsgQueue: (state, msg) => {
+            if (msg instanceof Array) {
+                state.msgQueue.concat(msg);
+            } else {
+                state.msgQueue.push(msg);
+            }
 
-        // （旧版可能在用，新版地图不用这个）
-        pushMsgQueue: (state, msg) => {
-            handlePushMsgQueue(state, msg);
-        },
-
-        setSimulationInvite: (state, simulationInvite) => {
-            state.simulationInvite = simulationInvite;
-        },
-        setRoomInvite: (state, roomInvite) => {
-            state.roomInvite = roomInvite;
+            if (!state.msgHead) {
+                state.msgHead = state.msgQueue[0];
+            }
         },
         setRoomSubscribe:(state, roomIsSubscribe)=>{
             state.roomIsSubscribe = roomIsSubscribe;
@@ -579,6 +178,9 @@ const socket = {
         setIsFirst:(state, isFirst)=>{
             state.isFirst = isFirst;
         },
+        setSimulationRoleList: (state, data) => {
+            state.simulationRoleList = data;
+        },
         clearSimulationRoleList: (state)=>{
             state.simulationRoleList = [];
         },
@@ -623,17 +225,176 @@ const socket = {
                 state.railCtcRunplanInitMsg[code] = element;
             });
         },
-        clearTrainingStepTip: (state) => {
-            state.trainingStepTip = '';
-        },
         clearTrainingOverCount: (state) => {
             state.trainingOverCount = 0;
+        },
+        setPayOrder: (state, payOrder) => {
+            state.payOrder = payOrder;
+        },
+        setSimulationScriptTip: (state, data) => {
+            state.simulationScriptTip = data;
+        },
+        simulationScriptTipFinishIncrease: (state) => {
+            state.simulationScriptTipFinish++;
+        },
+        clearSimulationScriptTipFinish: (state) => {
+            state.simulationScriptTipFinish = 0;
+        },
+        simulationScriptTipErrorIncrease: (state) => {
+            state.simulationScriptTipError++;
+        },
+        simulationOverIncrease: (state) => {
+            state.simulationOver++;
+        },
+        setScriptAction: (state, data) => {
+            state.setScriptAction = data;
+        },
+        autoFaultTriggerIncrease: (state) => {
+            state.autoFaultTrigger++;
+        },
+        simulationErrorIncrease: (state) => {
+            state.simulationError++;
+        },
+        simulationResetIncrease: (state) => {
+            state.simulationReset++;
+        },
+        setInviteSimulationConversation: (state, data) => {
+            state.inviteSimulationConversation = data;
+        },
+        setAcceptConversionInvite: (state, data) => {
+            state.acceptConversionInvite = data;
+        },
+        setOverConversation: (state, data) => {
+            state.overConversation = data;
+        },
+        setConversationInfo: (state, data) => {
+            state.conversationInfo = data;
+        },
+        setCreateConversation: (state, data) => {
+            state.createConversation = data;
+        },
+        setExitConversation: (state, data) => {
+            state.exitConversation = data;
+        },
+        memberChangeCountIncrease: (state) => {
+            state.memberChangeCount++;
+        },
+        setLoggedOutMsg: (state, msg) => {
+            state.loggedOutMsg = msg;
+            state.beLogoutCount++;
+        },
+        runPlanReloadCountIncrease: (state) => {
+            state.runPlanReloadCount++;
+        },
+        setSimulationIbpStatus: (state, data) => {
+            state.simulationIbpStatus = data;
+        },
+        competitionPracticeFinishIncrease: (state) => {
+            state.competitionPracticeFinish++;
+        },
+        setSimulationAlarmInfo: (state, data) => {
+            state.simulationAlarmInfo = data;
+        },
+        setStandPfiNum: (state, data) => {
+            state.standPfiNum = data;
+        },
+        setTrainPfiNum: (state, data) => {
+            state.trainPfiNum = data;
+        },
+        setTrainPfiBL: (state, data) => {
+            state.trainPfiBL = data;
+        },
+        trainingReloadCountIncrease: (state) => {
+            state.trainingReloadCount++;
+        },
+        setSimulationPslStatus: (state, data) => {
+            state.simulationPslStatus = data;
+        },
+        setSimulationPlanChange: (state, data) => {
+            state.simulationPlanChange = data;
+        },
+        setRailCtcStatusMsg: (state, data) => {
+            state.railCtcStatusMsg = data;
+        },
+        handleCtcRunPlanChange: (state, data) => {
+            state.voiceBroadcastMsgs = [];
+            data.forEach(element => {
+                const tripNumberDe = element.departRunPlan && element.departRunPlan.tripNumber;
+                const tripNumberAr = element.arriveRunPlan && element.arriveRunPlan.tripNumber;
+                if (tripNumberDe) {
+                    element.departRunPlan.up = '';
+                    element.departRunPlan.down = '';
+                    parseInt(tripNumberDe[tripNumberDe.length - 1]) % 2 == 0 ? element.departRunPlan.up = tripNumberDe : element.departRunPlan.down = tripNumberDe;
+                }
+                if (tripNumberAr) {
+                    element.arriveRunPlan.up = '';
+                    element.arriveRunPlan.down = '';
+                    parseInt(tripNumberAr[tripNumberAr.length - 1]) % 2 == 0 ? element.arriveRunPlan.up = tripNumberAr : element.arriveRunPlan.down = tripNumberAr;
+                }
+                const code = element.stationCode + '' + element.code;
+                if (store.state.training.roleDeviceCode === element.stationCode && element.arriveRunPlan && element.arriveRunPlan.adjacentMessage === '1') {
+                    state.voiceBroadcastMsgs.push(element.stationCode + '' + element.code);
+                }
+                state.railCtcRunplanInitMsg[code] = copyAssign(state.railCtcRunplanInitMsg[code] || {}, element);
+            });
+            if (state.voiceBroadcastMsgs.length) {
+                state.voiceBroadcastChange++;
+            }
+            state.railCtcRunplanChange++;
+        },
+        sendRailwayRunPlan: (state, data) => {
+            data.forEach(each => {
+                state.railwaySimulationRunplanSendMap[each.stationCode] = each;
+            });
+            state.railwaySimulationRunplanSendChange++;
+        },
+        initCtcManagerRunPlan: (state, data) => {
+            state.railCtcStationManageRpMsg = {};
+            data.forEach(element => {
+                const code = element.stationCode + '' + element.tripNumber;
+                state.railCtcStationManageRpMsg[code] = element;
+            });
+        },
+        changeCtcManagerRunPlanEdit: (state, data) => {
+            data.forEach(element => {
+                const code = element.stationCode + '' + element.tripNumber;
+                state.railCtcStationManageRpMsg[code] = copyAssign(state.railCtcStationManageRpMsg[code] || {}, element);
+            });
+            state.railCtcStationManageRpChange++;
+        },
+        removeCtcManagerRunPlanEdit: (state, data) => {
+            data.forEach(element => {
+                const code = element.stationCode + '' + element.tripNumber;
+                delete state.railCtcStationManageRpMsg[code];
+            });
+            state.railCtcStationManageRpChange++;
+        },
+        setDispatchCommandMsg: (state, data) => {
+            state.dispatchCommandMsg = data;
+        },
+        setChangedCtcRunplanMap: (state, data) => {
+            state.changedCtcRunplanMap = data;
+        },
+        setTicketInfo: (state, data) => {
+            state.ticketInfo = data;
+        },
+        trainingOverCountIncrease: (state) => {
+            state.trainingOverCount++;
+        },
+        setSimulationWorkParam: (state, data) => {
+            state.simulationWorkParam = data;
+        },
+        setConversationMessage: (state, message) => {
+            state.conversationMessage = message;
+        },
+        setControlTransfer: (state, transfer) => {
+            state.controlTransfer = transfer;
         }
     },
 
     actions: {
         setStomp: ({ state }, res) => {
-            handle(state, res);
+            // handle(state, res);
         },
         handleSock: ({ state }, data) => {
             handleSockInfo(state, data.res, data.type);
@@ -644,44 +405,29 @@ const socket = {
         setSimulationSpeed: ({ commit }, speed) => {
             commit('setSimulationSpeed', speed);
         },
-        setChatContent: ({ commit }, chatContent) => {
-            commit('setChatContent', chatContent);
+        setStationPfiNum: ({ commit }, data) => {
+            commit('setStationPfiNum', data);
         },
 
-        setJointRoomInfo: ({ commit }) => {
-            commit('setJointRoomInfo', {});
-        },
-
-        setStationPfiNum: ({ commit }) => {
-            commit('setStationPfiNum', null);
-        },
-
-        setEquipmentStatus: ({ commit }) => {
-            commit('setEquipmentStatus', []);
+        setEquipmentStatus: ({ commit }, data = []) => {
+            commit('setEquipmentStatus', data);
         },
 
         setDeviceStateMessages: ({ commit }) => {
             commit('setDeviceStateMessages', null);
         },
 
-        setTrainStationList: ({ commit }) => {
-            commit('setTrainStationList', []);
+        setTrainStationList: ({ commit }, data) => {
+            commit('setTrainStationList', data || []);
         },
 
-        setSimulationStart: ({ commit }) => {
-            commit('setSimulationStart', '');
+        setSimulationStart: ({ commit }, data) => {
+            commit('setSimulationStart', data || '');
         },
 
         setSimulationReset: ({ commit }) => {
             commit('setSimulationReset', 0);
         },
-
-        setSimulationInvite: ({ commit }) => {
-            commit('setSimulationInvite', {});
-        },
-        setRoomInvite: ({ commit }) => {
-            commit('setRoomInvite', {});
-        },
         setMessage: ({ state }, data) => {
             if (!state.message[data.key]) {
                 state.message[data.key] = [];
@@ -708,6 +454,9 @@ const socket = {
         setIsFirst:({ commit }, isFirst) => {
             commit('setIsFirst', isFirst);
         },
+        setSimulationRoleList: ({ commit }, data) => {
+            commit('setSimulationRoleList', data);
+        },
         clearSimulationRoleList:({ commit }) => {
             commit('clearSimulationRoleList');
         },
@@ -738,11 +487,137 @@ const socket = {
         initRailCtcRunplanInitMsg:({ commit }, list) => {
             commit('initRailCtcRunplanInitMsg', list);
         },
-        clearTrainingStepTip: ({ commit }) => {
-            commit('clearTrainingStepTip');
-        },
         clearTrainingOverCount: ({ commit }) => {
             commit('clearTrainingOverCount');
+        },
+        setPayOrder: ({ commit }, payOrder) => {
+            commit('setPayOrder', payOrder);
+        },
+        setSimulationScriptTip: ({ commit }, data) => {
+            commit('setSimulationScriptTip', data);
+        },
+        simulationScriptTipFinishIncrease: ({ commit }) => {
+            commit('simulationScriptTipFinishIncrease');
+        },
+        clearSimulationScriptTipFinish: ({ commit }) => {
+            commit('clearSimulationScriptTipFinish');
+        },
+        simulationScriptTipErrorIncrease: ({ commit }) => {
+            commit('simulationScriptTipErrorIncrease');
+        },
+        simulationOverIncrease: ({ commit }) => {
+            commit('simulationOverIncrease');
+        },
+        setScriptAction: ({ commit }, data) => {
+            commit('setScriptAction', data);
+        },
+        autoFaultTriggerIncrease: ({ commit }) => {
+            commit('autoFaultTriggerIncrease');
+        },
+        simulationErrorIncrease: ({ commit }) => {
+            commit('simulationErrorIncrease');
+        },
+        simulationResetIncrease: ({ commit }) => {
+            commit('simulationResetIncrease');
+        },
+        setInviteSimulationConversation: ({ commit }, data) => {
+            commit('setInviteSimulationConversation', data);
+        },
+        setAcceptConversionInvite: ({ commit }, data) => {
+            commit('setAcceptConversionInvite', data);
+        },
+        setOverConversation: ({ commit }, data) => {
+            commit('setOverConversation', data);
+        },
+        setConversationInfo: ({ commit }, data) => {
+            commit('setConversationInfo', data);
+        },
+        setCreateConversation: ({ commit }, data) => {
+            commit('setCreateConversation', data);
+        },
+        setExitConversation: ({ commit }, data) => {
+            commit('setExitConversation', data);
+        },
+        handlePushMsgQueue: ({ commit }, data) => {
+            commit('handlePushMsgQueue', data);
+        },
+        memberChangeCountIncrease: ({ commit }) => {
+            commit('memberChangeCountIncrease');
+        },
+        setLoggedOutMsg: ({ commit }, data) => {
+            commit('setLoggedOutMsg', data);
+        },
+        runPlanReloadCountIncrease: ({ commit }) => {
+            commit('runPlanReloadCountIncrease');
+        },
+        setSimulationIbpStatus: ({ commit }, data) => {
+            commit('setSimulationIbpStatus', data);
+        },
+        competitionPracticeFinishIncrease: ({ commit }) => {
+            commit('competitionPracticeFinishIncrease');
+        },
+        setSimulationAlarmInfo: ({ commit }, data) => {
+            commit('setSimulationAlarmInfo', data);
+        },
+        setStandPfiNum: ({ commit }, data) => {
+            commit('setStandPfiNum', data);
+        },
+        setTrainPfiNum: ({ commit }, data) => {
+            commit('setTrainPfiNum', data);
+        },
+        setTrainPfiBL: ({ commit }, data) => {
+            commit('setTrainPfiBL', data);
+        },
+        setLPFstrategy: ({ commit }, data) => {
+            commit('setLPFstrategy', data);
+        },
+        trainingReloadCountIncrease: ({ commit }) => {
+            commit('trainingReloadCountIncrease');
+        },
+        setSimulationPslStatus: ({ commit }, data) => {
+            commit('setSimulationPslStatus', data);
+        },
+        setSimulationPlanChange: ({ commit }, data) => {
+            commit('setSimulationPlanChange', data);
+        },
+        setRailCtcStatusMsg: ({ commit }, data) => {
+            commit('setRailCtcStatusMsg', data);
+        },
+        handleCtcRunPlanChange: ({ commit }, data) => {
+            commit('handleCtcRunPlanChange', data);
+        },
+        sendRailwayRunPlan: ({ commit }, data) => {
+            commit('sendRailwayRunPlan', data);
+        },
+        initCtcManagerRunPlan: ({ commit }, data) => {
+            commit('initCtcManagerRunPlan', data);
+        },
+        changeCtcManagerRunPlanEdit: ({ commit }, data) => {
+            commit('changeCtcManagerRunPlanEdit', data);
+        },
+        removeCtcManagerRunPlanEdit: ({ commit }, data) => {
+            commit('removeCtcManagerRunPlanEdit', data);
+        },
+        setDispatchCommandMsg: ({ commit }, data) => {
+            commit('setDispatchCommandMsg', data);
+        },
+        setChangedCtcRunplanMap: ({ commit }, data) => {
+            commit('setChangedCtcRunplanMap', data);
+        },
+        setTicketInfo: ({ commit }, data) => {
+            commit('setTicketInfo', data);
+        },
+        trainingOverCountIncrease: ({ commit }) => {
+            commit('trainingOverCountIncrease');
+        },
+        setSimulationWorkParam: ({ commit }, data) => {
+            commit('setSimulationWorkParam', data);
+        },
+        setConversationMessage: ({ commit }, message) => {
+            commit('setConversationMessage', message);
+        },
+        setControlTransfer: ({ commit }, transfer) => {
+            commit('setControlTransfer', transfer);
         }
     }
 };
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index 86c4e857b..050a60b79 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -2,11 +2,8 @@ import Vue from 'vue';
 import { TrainingMode } from '@/scripts/ConstDic';
 import deviceType from '../../jmapNew/constant/deviceType';
 import LangStorage from '@/utils/lang';
-import Handler from '@/scripts/cmdPlugin/Handler';
 import { deepAssign } from '@/utils/index';
 import store from '@/store/index';
-import { ScriptMode } from '@/scripts/ConstDic';
-import { setLocalStorage } from '@/utils/auth';
 
 /**
  * 实训状态数据
@@ -25,7 +22,6 @@ const training = {
         rezoomCount: 0,				// 车站变更标识
         steps: [],					// 实训步骤数据
         order: -1,					// 实训进行到第几步
-        // orderCount: 0,				// 步骤变更标识
         operateErrMsg: '',			// 操作错误提示信息
         subscribeCount: 0,			// 仿真订阅完成标识
         score: 0,					// 实训得分
@@ -37,6 +33,7 @@ const training = {
         prdType: '', 				// 产品类型
         roles: '', 					// 角色权限类型
         roleDeviceCode:'', // 当前角色对应的deviceCode
+        myMemberId: '', // 我的仿真成员id
         centerStationCode:'', // 当前居中的集中站code
         changeRoleInfo:'', // 切换角色的信息（）
         memberList: [], 			// 综合仿真成员列表
@@ -50,7 +47,11 @@ const training = {
         triggerFaultDevice: '', // 触发故障目标设备
         trainingStart: false, // 实训开始状态
         notifySelected: null, // 场景弹窗内容
-        runPathList:[] // 运行线 (宁波三号线)
+        runPathList:[], // 运行线 (宁波三号线)
+        domConfig: {}, // 线路功能前端配置项
+        simulationUserType: '', // 仿真用户角色
+        simulationCreator: false,
+        chatBoxMin: true // 聊天框最小化
     },
 
     getters: {
@@ -84,14 +85,18 @@ const training = {
         // 视图中的列车列表
         viewTrainList: (state) => () =>{
             const trainList = [];
-            const mapDevice = Vue.prototype.$jlmap.mapDevice;
-            Object.values(mapDevice).forEach(device => {
-                if (device && device._type === deviceType.Train) {
-                    trainList.push(device);
-                }
-            });
-
+            if (Vue.prototype.$jlmap) {
+                const mapDevice = Vue.prototype.$jlmap.mapDevice;
+                Object.values(mapDevice).forEach(device => {
+                    if (device && device._type === deviceType.Train) {
+                        trainList.push(device);
+                    }
+                });
+            }
             return trainList;
+        },
+        domConfig: (state) => {
+            return state.domConfig;
         }
     },
 
@@ -191,9 +196,6 @@ const training = {
         setRoles: (state, roles) => {
             state.roles = roles;
         },
-        notifyGetCommandDefinition: (state, lineCode) => {
-            Handler.notify(lineCode);
-        },
         setCenterStationCode:(state, centerStationCode) => {
             state.centerStationCode = centerStationCode;
         },
@@ -204,10 +206,23 @@ const training = {
                 memberList.forEach(item => {
                     state.memberData[item.id] = deepAssign({userId: ''}, item);
                     state.memberData[item.id].disabled = userId == item.userId;
+                    if (userId == item.userId) {
+                        state.roles = item.type;
+                        state.roleDeviceCode = item.deviceCode;
+                        state.myMemberId = item.id;
+                    }
                 });
             }
         },
         setSimulationUserList: (state, simulationUserList) => {
+            state.simulationUserType = '';
+            state.simulationCreator = false;
+            simulationUserList.forEach(item => {
+                if (item.userId == store.state.user.id ) {
+                    state.simulationUserType = item.userType;
+                    state.simulationCreator = item.creator;
+                }
+            });
             state.simulationUserList = simulationUserList;
         },
         updateMemberTrust:(state, {deviceCode, trust}) => {
@@ -236,12 +251,12 @@ const training = {
                 let memberIndex = -1;
                 let memberId = '';
                 state.simulationUserList.forEach((user, index) =>{
-                    if (user.userId === item.userId) {
+                    if (user.userId == item.userId) {
                         memberId = user.memberId;
                         user.online = item.online;
                         user.memberId = item.memberId;
                         user.role = item.role;
-                        user.type = item.type;
+                        user.memberType = item.memberType;
                         user.deviceCode = item.deviceCode;
                         memberIndex = index;
                     }
@@ -279,6 +294,9 @@ const training = {
         setRoleDeviceCode :(state, roleDeviceCode) => {
             state.roleDeviceCode = roleDeviceCode;
         },
+        setMyMemberId: (state, memberId) => {
+            state.myMemberId = memberId;
+        },
         setOrignalUserRoleId:(state, orignalUserRoleId) => {
             state.orignalUserRoleId = orignalUserRoleId;
         },
@@ -304,6 +322,12 @@ const training = {
         },
         setUserRole: (state, userRole) => {
             state.userRole = userRole;
+        },
+        setDomConfig: (state, domConfig) => {
+            state.domConfig = domConfig;
+        },
+        setChatBoxMin: (state, chatBoxMin) => {
+            state.chatBoxMin = chatBoxMin;
         }
     },
 
@@ -346,7 +370,6 @@ const training = {
          */
         start: ({ commit }) => {
             // 清空操作组
-            Handler.clear(); // 两种方式
             // 清空计时器以及得分
             commit('resetUsedTime');
             commit('resetScore');
@@ -429,56 +452,6 @@ const training = {
             }
         },
 
-        // 下一步
-        nextNew: ({ commit, state }, operate) => {
-            setLocalStorage('nextNew', JSON.stringify(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;
-                }
-                if (store.state.trainingNew.trainingDetail && !store.state.trainingNew.trainingSwitch) {
-                    commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
-                    return;
-                }
-                // 处理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');
-                        }
-                    } else if (store.state.trainingNew.trainingSwitch && store.state.trainingNew.trainingDetail.type === 'SINGLE') {
-                        if (store.state.trainingNew.teachMode === ScriptMode.TEACH || store.state.trainingNew.teachMode === ScriptMode.PRACTICE) {
-                            if (rtn && rtn.valid) {
-                                commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green' });
-                            } else {
-                                commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'operation mistake!' : '操作错误！', color: 'red' });
-                            }
-                        }
-                    } else {
-                        store.dispatch('trainingNew/setTrainingOperate', operate);
-                    }
-                    resolve(rtn);
-                }).catch(error => {
-                    console.error(error);
-                    reject(error);
-                });
-            });
-        },
-
         /**
 		 * 更新偏移位置车站
 		 */
@@ -657,6 +630,10 @@ const training = {
         setRoleDeviceCode:({ commit }, roleDeviceCode) => {
             commit('setRoleDeviceCode', roleDeviceCode);
         },
+        /** 更新我得仿真成员角色id */
+        setMyMemberId: ({ commit }, memberId) => {
+            commit('setMyMemberId', memberId);
+        },
         /** 剧本仿真 主动退出*/
         setScriptQuit:({ commit }) => {
             commit('setScriptQuit');
@@ -682,6 +659,15 @@ const training = {
         },
         setOperateErrMsg: ({ commit }) => {
             commit('setOperateErrMsg', { errMsg: '操作错误！', color: 'red' });
+        },
+        setDomConfig: ({ commit }, config) => {
+            commit('setDomConfig', config);
+        },
+        setOperate: ({ commit }, operate) => {
+            commit('setOperate', operate);
+        },
+        setChatBoxMin: ({ commit }, chatBoxMin) => {
+            commit('setChatBoxMin', chatBoxMin);
         }
     }
 };
diff --git a/src/store/modules/trainingNew.js b/src/store/modules/trainingNew.js
index 17339eff1..8a558a949 100644
--- a/src/store/modules/trainingNew.js
+++ b/src/store/modules/trainingNew.js
@@ -1,4 +1,7 @@
-import { setLocalStorage } from '@/utils/auth';
+import Handler from '@/scripts/cmdPlugin/newHandler';
+import store from '@/store/index';
+import { SimulationUserType, OperateMode } from '@/scripts/ConstDic';
+import LangStorage from '@/utils/lang';
 const training = {
     namespaced: true,
     state: {
@@ -7,11 +10,16 @@ const training = {
         trainingSwitch: false, // 实训开始结束标志
         trainingOperate: null,
         simulationPause: false, // 实训 暂停判断
-        sceneOperate: null,
-        stepOrder: 0,
-        operateOrder: 0,
-        stepOverCount: 0,
-        trainingScore: ''
+        simCommand: null, // 指令操作  实训设计维护
+        stepInfo: {}, // 当前实训步骤信息
+        stepList: [], // 当前实训所有步骤列表
+        scoringRules: [], // 当前实训评分规则
+        operateOrder: 0, // 操作order
+        operateErrMsg: '',
+        scoreList: [], // 实训得分
+        draftStepList: null, // 显示的步骤列表
+        voiceStepList: [], // 实训特殊语音步骤列表
+        voiceStepIndex: -1
     },
     getters: {
         teachMode: (state) => {
@@ -25,18 +33,6 @@ const training = {
         },
         trainingOperate: (state) => {
             return state.trainingOperate;
-        },
-        stepOrder: (state) => {
-            return state.stepOrder;
-        },
-        stepOverCount: (state) => {
-            return state.stepOverCount;
-        },
-        trainingScore: (state) => {
-            return state.trainingScore;
-        },
-        sceneOperate: (state) => {
-            return state.sceneOperate;
         }
     },
     mutations: {
@@ -45,44 +41,75 @@ const training = {
         },
         setTrainingDetail: (state, detail) => {
             state.trainingDetail = detail;
-            setLocalStorage('trainingDetail', JSON.stringify(detail));
+            if (detail) {
+                state.stepList = JSON.parse(detail.stepJson || '[]');
+                state.scoringRules = JSON.parse(detail.scoringRuleJson || '[]');
+            }
         },
         setTrainingSwitch: (state, flag) => {
             state.trainingSwitch = flag;
+            state.stepInfo = {};
+            state.operateOrder = 0;
+            state.scoreList = [];
         },
         setTrainingOperate: (state, trainingOperate) => {
             state.trainingOperate = trainingOperate;
         },
-        stepOrderIncrease: (state) => {
-            state.stepOrder++;
-            setLocalStorage('stepOrder', JSON.stringify(state.stepOrder));
-        },
-        clearStepOrder: (state) => {
-            state.stepOrder = 0;
-            setLocalStorage('stepOrder', JSON.stringify(state.stepOrder));
-        },
         operateOrderIncrease: (state) => {
             state.operateOrder++;
-            setLocalStorage('operateOrder', JSON.stringify(state.operateOrder));
+        },
+        clearOperateOrder: (state) => {
+            state.operateOrder = 0;
         },
         setSimulationPause: (state, value) => {
             state.simulationPause = value;
         },
-        clearOperateOrder: (state) => {
-            state.operateOrder = 0;
-            setLocalStorage('operateOrder', JSON.stringify(state.operateOrder));
-        },
-        stepOverCountChange: (state) => {
-            state.stepOverCount++;
-        },
         clearStepOverCount: (state) => {
             state.clearStepOverCount = 0;
         },
-        setTrainingScore: (state, score) => {
-            state.trainingScore = score;
+        setSimCommand: (state, simCommand) => {
+            state.simCommand = simCommand;
         },
-        setSceneOperate: (state, sceneOperate) => {
-            state.sceneOperate = sceneOperate;
+        setOperateErrMsg: (state, msg) => {
+            state.operateErrMsg = msg;
+        },
+        setStepInfo: (state, stepInfo) => {
+            state.stepInfo = state.stepList.find(step => step.id === stepInfo.stepId);
+            Handler.judgeIsTextSendOperation();
+        },
+        clearStepInfo: (state, stepInfo) => {
+            if (state.stepInfo.id == stepInfo.stepId) {
+                state.stepInfo = {};
+            }
+        },
+        clearTrainingData: (state) => {
+            state.teachMode = '';
+            state.trainingDetail = null;
+            state.trainingSwitch = false;
+            state.stepInfo = {};
+            state.stepList = []; // 当前实训所有步骤列表
+            state.operateOrder = 0;
+            state.operateErrMsg = '';
+            state.scoringRules = [];
+            state.scoreList = [];
+        },
+        pushScoreList: (state, scoring) => {
+            state.scoreList.push(scoring);
+        },
+        editDraftStepList: (state, draftStepList) => {
+            state.draftStepList = draftStepList;
+        },
+        setVoiceStepList: (state, voiceStepList) => {
+            state.voiceStepIndex = 0;
+            state.voiceStepList = voiceStepList;
+            console.log(voiceStepList, state.voiceStepIndex);
+        },
+        voiceStepIndexIncrease: (state) => {
+            state.voiceStepIndex++;
+        },
+        clearVoiceStepList: (state) => {
+            state.voiceStepIndex = -1;
+            state.voiceStepList = [];
         }
     },
     actions: {
@@ -94,48 +121,88 @@ const training = {
         },
         trainingStart: ({commit}) => {
             commit('setTrainingSwitch', true);
-            setLocalStorage('nextNew', null);
         },
         trainingEnd: ({commit}) => {
             commit('setTrainingSwitch', false);
-            setLocalStorage('nextNew', null);
+            commit('clearVoiceStepList');
         },
         setTrainingOperate: ({commit, state}, trainingOperate) => {
             commit('setTrainingOperate', trainingOperate);
         },
-        stepOrderIncrease: ({commit}) => {
-            commit('stepOrderIncrease');
-        },
-        clearStepOrder: ({commit}) => {
-            commit('clearStepOrder');
-        },
         operateOrderIncrease: ({commit}) => {
             commit('operateOrderIncrease');
         },
         setSimulationPause: ({commit}, simulationPause) => {
             commit('setSimulationPause', simulationPause);
         },
-        clearOperateOrder: ({commit}) => {
-            commit('clearOperateOrder');
-        },
         clearStepOverCount: ({commit}) => {
             commit('clearStepOverCount');
         },
-        setTrainingScore: ({commit}, score) => {
-            commit('setTrainingScore', score);
+        setSimCommand: ({commit}, simCommand) => {
+            commit('setSimCommand', simCommand);
         },
-        setSceneOperate: ({commit}, sceneOperate) => {
-            commit('setSceneOperate', sceneOperate);
+        clearOperateOrder:({ commit }) => {
+            commit('clearOperateOrder');
         },
-        handleCheckNewTrainingResult:({commit, state}, valid) => {
-            const stepList = JSON.parse(state.trainingDetail.stepJson);
-            const step = stepList[state.stepOrder - 1];
-            if (valid && step.operations.length === (state.operateOrder + 1 )) {
-                commit('stepOverCountChange');
-            } else if (valid) {
-                commit('operateOrderIncrease');
-            } else {
-                console.error('校验失败；');
+        next: ({ commit, state }, operate) => {
+            store.dispatch('training/setOperate', operate);
+            console.log(operate, 'operate');
+            commit('setTrainingOperate', operate);
+            return new Promise((resolve, reject) => {
+                if (store.state.training.roles || (store.state.training.simulationUserType === SimulationUserType.TEACHER && store.state.training.operatemode === OperateMode.FAULT)) {
+                    Handler.handle(operate).then(rtn => {
+                        resolve(rtn);
+                    }).catch(e => {
+                        reject(e);
+                    });
+                } else {
+                    reject({message: '您目前无仿真成员角色！'});
+                }
+            });
+        },
+        setOperateErrMsg: ({ commit }, msg) => {
+            commit('setOperateErrMsg', msg);
+        },
+        setStepInfo: ({ commit }, stepInfo) => {
+            commit('setStepInfo', stepInfo);
+        },
+        clearStepInfo: ({ commit }, stepInfo) => {
+            commit('clearStepInfo', stepInfo);
+        },
+        clearTrainingData: ({ commit }) => {
+            commit('clearTrainingData');
+        },
+        pushScoreList: ({ commit }, scoring) => {
+            commit('pushScoreList', scoring);
+        },
+        editDraftStepList: ({ commit }, draftStepList) => {
+            commit('editDraftStepList', draftStepList);
+        },
+        setVoiceStepList: ({ commit }, voiceStepList) => {
+            commit('setVoiceStepList', voiceStepList);
+        },
+        voiceStepIndexIncrease: ({ commit }) => {
+            commit('voiceStepIndexIncrease');
+        },
+        clearVoiceStepList: ({ commit }) => {
+            commit('clearVoiceStepList');
+        },
+        handleMatchVoice: ({ commit }, info) => {
+            if (info && info.content === 'true') {
+                const rightMsg = {errMsg: LangStorage.getLang() === 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green'};
+                commit('setOperateErrMsg', rightMsg);
+                if (Handler.isLastOperation()) {
+                    Handler.nextStep();
+                    commit('clearVoiceStepList');
+                } else {
+                    commit('clearVoiceStepList');
+                    commit('operateOrderIncrease');
+                    Handler.judgeIsTextSendOperation();
+                }
+            } else if (info && info.content === 'false') {
+                const errorMsg = {errMsg: LangStorage.getLang() === 'en' ? 'operation mistake!' : '操作错误！', color: 'red'};
+                commit('setOperateErrMsg', errorMsg);
+                Handler.handleVoiceStepList();
             }
         }
     }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ee9f742b7..df2f0ee4f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,6 +2,7 @@ import { login, logout, getInfo, preLogout } from '@/api/login';
 import { getToken, setToken, removeToken } from '@/utils/auth';
 import { LoginParams } from '@/utils/login';
 import { creatSubscribe, clearSubscribe, perpetualTopic, disconnect} from '@/utils/stomp';
+import { defaultCallback } from '@/utils/subscribeCallback';
 import Cookies from 'js-cookie';
 
 const user = {
@@ -22,8 +23,9 @@ const user = {
         companyName: '',
         companyProjectList: [],
         baseUrl:'',
-        resourcesUrl: '',
-        uploadUrl: '',
+        // resourcesUrl: '',
+        // uploadUrl: '',
+        ossUrl:'',
         baseSite: ''
     },
 
@@ -74,7 +76,7 @@ const user = {
             Cookies.remove('UserToken');
         },
         SUBSCRIBE: (state, {header, type}) => {
-            creatSubscribe(perpetualTopic, header);
+            creatSubscribe(perpetualTopic, header, defaultCallback);
         },
         SUBSCRIBE_UN: () => {
             clearSubscribe(perpetualTopic);
@@ -85,11 +87,14 @@ const user = {
         setBaseUrl: (state, baseUrl) => {
             state.baseUrl = baseUrl;
         },
-        setResourcesUrl: (state, resourcesUrl) => {
-            state.resourcesUrl = resourcesUrl;
-        },
-        setUploadUrl: (state, uploadUrl) => {
-            state.uploadUrl = uploadUrl;
+        // setResourcesUrl: (state, resourcesUrl) => {
+        //     state.resourcesUrl = resourcesUrl;
+        // },
+        // setUploadUrl: (state, uploadUrl) => {
+        //     state.uploadUrl = uploadUrl;
+        // },
+        setOssUrl: (state, ossUrl) => {
+            state.ossUrl = ossUrl;
         },
         setBaseSite: (state, baseSite) => {
             state.baseSite = baseSite;
@@ -101,13 +106,14 @@ const user = {
         Login({ commit }, userInfo) {
             const username = userInfo.username.trim();
             const password = userInfo.password.trim();
-            const type = userInfo.type;
+            // const type = userInfo.type;
+            const type = 'class';
             const project = userInfo.project;
             const deviceCode = userInfo.deviceCode;
             const teacherLogin = userInfo.teacherLogin;
             return new Promise((resolve, reject) => {
                 // 登录系统
-                const params = Object.assign({ account: username, password, project:project, deviceCode:deviceCode, teacherLogin:teacherLogin }, type == 'design' ? LoginParams.Design : LoginParams.LianKeTang);
+                const params = Object.assign({ account: username, password, project:project, deviceCode:deviceCode, teacherLogin:teacherLogin }, LoginParams.LianKeTang);
                 login(params).then(resp => {
                     const token = resp.data;
                     const header = { group: '', 'X-Token': token };
@@ -159,6 +165,14 @@ const user = {
                 });
             });
         },
+        GetUserInfo({ commit }, token) {
+            return new Promise((resolve, reject) => {
+                getInfo(token).then(response => {
+                    const user = response.data;
+                    resolve(user);
+                });
+            });
+        },
         // 前端登出
         FedLogOut({ commit }) {
             commit('SUBSCRIBE_UN');
@@ -225,11 +239,14 @@ const user = {
         setBaseUrl ({commit}, baseUrl) {
             commit('setBaseUrl', baseUrl);
         },
-        setResourcesUrl({commit}, resourcesUrl) {
-            commit('setResourcesUrl', resourcesUrl);
-        },
-        setUploadUrl({commit}, uploadUrl) {
-            commit('setUploadUrl', uploadUrl);
+        // setResourcesUrl({commit}, resourcesUrl) {
+        //     commit('setResourcesUrl', resourcesUrl);
+        // },
+        // setUploadUrl({commit}, uploadUrl) {
+        //     commit('setUploadUrl', uploadUrl);
+        // },
+        setOssUrl({commit}, ossUrl) {
+            commit('setOssUrl', ossUrl);
         },
         setBaseSite({commit}, baseSite) {
             commit('setBaseSite', baseSite);
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index e2536b2c3..f84210e59 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -16,16 +16,16 @@
 //     }
 //     return BASE_API;
 // }
-export function handlerUrl(data) {
+
+export function handlerUrl() {
     let BASE_API;
-    let VOICE_API;
-    let UPLOAD_API;
     let BASE_SITE;
+    let OSS_URL;
     if (process.env.NODE_ENV === 'development') {
-        // const data = null;
+        // 开发分支
+        BASE_API = 'http://192.168.3.233/rtss-server';
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
-        // BASE_API = 'http://192.168.3.233/rtss-server';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://114.116.51.125/jlcloud';
         // BASE_API = 'http://192.168.3.90:9000'; // 周寅
         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
@@ -35,37 +35,83 @@ export function handlerUrl(data) {
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
-        BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API;
-        // BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API;
-        VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
-        UPLOAD_API = 'http://joylink.club/jlfile';
         BASE_SITE = 'https://test.joylink.club/cbtc';
+        OSS_URL = 'https://192.168.3.233/oss-rtss';
     } else if (process.env.NODE_ENV === 'test' && process.env.VUE_APP_PRO === 'local-test') {
-        BASE_API = 'https://192.168.3.233/rtss-server';
-        VOICE_API = 'https://192.168.3.233/oss/joylink';
-        UPLOAD_API = 'https://192.168.3.233';
-        BASE_SITE = '/cbtc';
+        // 本地打包测试分支
+        BASE_API = 'https://192.168.3.233/rtss-server'; // api地址
+        BASE_SITE = 'https://192.168.3.233/cbtc'; // 前端项目地址
+        OSS_URL = 'https://192.168.3.233/oss-rtss'; // 资源地址
     } else if (process.env.NODE_ENV === 'test') {
-        BASE_API = data && data.domainName ? 'https://' + data.domainName : 'https://test.joylink.club/jlcloud';
-        VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
-        UPLOAD_API = 'http://joylink.club/jlfile';
+        // 测试分支
+        BASE_API = 'https://test.joylink.club/jlcloud';
         BASE_SITE = 'https://test.joylink.club/cbtc';
+        OSS_URL = 'https://joylink.club/oss-rtss'; // 资源地址
     } else if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_PRO === 'local') {
+        // 本地打包分支
         BASE_API = 'http://160.20.60.15:9000';
-        VOICE_API = 'http://160.20.60.15/oss/joylink';
-        UPLOAD_API = 'http://160.20.60.15';
         BASE_SITE = 'http://160.20.60.15';
-    } else if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_PRO === 'ntyl') {
-        BASE_API = 'https://joylink.club/jlcloud';
-        VOICE_API = 'https://joylink.club/oss/joylink';
-        UPLOAD_API = 'http://joylink.club/jlfile';
-        BASE_SITE = 'https://joylink.club/cbtc';
+        OSS_URL = 'https://joylink.club/oss-rtss';
     } else if (process.env.NODE_ENV === 'production') {
-        BASE_API = data && data.domainName ? 'https://' + data.domainName : 'https://joylink.club/jlcloud';
-        VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
-        UPLOAD_API = 'http://joylink.club/jlfile';
+        // 远程发布分支
+        BASE_API = 'https://joylink.club/jlcloud';
         BASE_SITE = 'https://joylink.club/cbtc';
+        OSS_URL = 'https://joylink.club/oss-rtss';
     }
-    const PROD_API = 'https://joylink.club/jlcloud';
-    return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE, PROD_API};
+    // VOICE_API, UPLOAD_API, BASE_SITE, PROD_API
+    return {BASE_API, BASE_SITE, OSS_URL};
 }
+
+// export function handlerUrl(data) {
+//     let BASE_API;
+//     let VOICE_API;
+//     let UPLOAD_API;
+//     let BASE_SITE;
+//     if (process.env.NODE_ENV === 'development') {
+//         // const data = null;
+//         // BASE_API = 'https://joylink.club/jlcloud';
+//         // BASE_API = 'https://test.joylink.club/jlcloud';
+//         BASE_API = 'http://192.168.3.233/rtss-server';
+//         // BASE_API = 'http://114.116.51.125/jlcloud';
+//         // BASE_API = 'http://192.168.3.90:9100'; // 周寅
+//         // BASE_API = 'http://192.168.3.94:9000'; // 旭强
+//         // BASE_API = 'http://192.168.3.15:9000'; // 张赛
+//         // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬
+//         // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
+//         // BASE_API = 'http://b29z135112.zicp.vip';
+//         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
+//         // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
+//         // BASE_API = data && data.domainName ? 'https://' + data.domainName : BASE_API;
+//         BASE_API = data && data.domainName ? 'http://' + data.domainName : BASE_API;
+//         VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
+//         // UPLOAD_API = 'http://joylink.club/jlfile';
+//         BASE_SITE = 'https://test.joylink.club/cbtc';
+//     } else if (process.env.NODE_ENV === 'test' && process.env.VUE_APP_PRO === 'local-test') {
+//         BASE_API = 'https://192.168.3.233/rtss-server';
+//         VOICE_API = 'https://192.168.3.233/oss/joylink';
+//         UPLOAD_API = 'https://192.168.3.233';
+//         BASE_SITE = '/cbtc';
+//     } else if (process.env.NODE_ENV === 'test') {
+//         BASE_API = data && data.domainName ? 'https://' + data.domainName : 'https://test.joylink.club/jlcloud';
+//         VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
+//         UPLOAD_API = 'http://joylink.club/jlfile';
+//         BASE_SITE = 'https://test.joylink.club/cbtc';
+//     } else if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_PRO === 'local') {
+//         BASE_API = 'http://160.20.60.15:9000';
+//         VOICE_API = 'http://160.20.60.15/oss/joylink';
+//         UPLOAD_API = 'http://160.20.60.15';
+//         BASE_SITE = 'http://160.20.60.15';
+//     } else if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_PRO === 'ntyl') {
+//         BASE_API = 'https://joylink.club/jlcloud';
+//         VOICE_API = 'https://joylink.club/oss/joylink';
+//         UPLOAD_API = 'http://joylink.club/jlfile';
+//         BASE_SITE = 'https://joylink.club/cbtc';
+//     } else if (process.env.NODE_ENV === 'production') {
+//         BASE_API = data && data.domainName ? 'https://' + data.domainName : 'https://joylink.club/jlcloud';
+//         VOICE_API = data && data.resourcesDomainName ? 'https://' + data.resourcesDomainName : 'https://joylink.club/oss/joylink';
+//         UPLOAD_API = 'http://joylink.club/jlfile';
+//         BASE_SITE = 'https://joylink.club/cbtc';
+//     }
+//     const PROD_API = 'https://joylink.club/jlcloud';
+//     return {BASE_API, VOICE_API, UPLOAD_API, BASE_SITE, PROD_API};
+// }
diff --git a/src/utils/date.js b/src/utils/date.js
index c1d33503b..afb150905 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -106,7 +106,7 @@ export function objectIsEqual(obj1, obj2) {
     }
     // 仅过滤值为null的项
     const arr1 = Object.keys(obj1).filter(key => { return obj1[key] != null; });
-    const arr2 = Object.keys(obj2).filter(key => { return obj1[key] != null; });
+    const arr2 = Object.keys(obj2).filter(key => { return obj2[key] != null; });
     if (arr1.length !== arr2.length) {
         return false;
     }
diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js
index f08ca5b0c..351c8dd23 100644
--- a/src/utils/loaddata.js
+++ b/src/utils/loaddata.js
@@ -57,7 +57,7 @@ export function handleMapData(mapData, type) {
         });
     }
 }
-export function loadRunPlanData(group, dataError) {
+export function loadRunPlanData(group) {
     if (!store.state.runPlan.runPlanInfo || !store.state.runPlan.runPlanInfo.templateId) {
         MessageBox.confirm('未获取到运行图信息！', '提示', {
             confirmButtonText: '确定',
@@ -78,7 +78,7 @@ export function loadRunPlanData(group, dataError) {
                 resp.data.version = store.state.runPlan.runPlanInfo.version;
                 dbUpdateData('runPlan', resp.data);
             }).catch(error => {
-                runPlanErrorHandle(error, dataError);
+                runPlanErrorHandle(error);
             });
         } else {
             getEveryDayRunPlanNew(group).then(async (resp) => {
@@ -88,12 +88,12 @@ export function loadRunPlanData(group, dataError) {
                 resp.data.version = store.state.runPlan.runPlanInfo.version;
                 dbAddData('runPlan', resp.data);
             }).catch(error => {
-                runPlanErrorHandle(error, dataError);
+                runPlanErrorHandle(error);
             });
         }
     });
 }
-export function runPlanErrorHandle(error, dataError) {
+export function runPlanErrorHandle(error) {
     store.dispatch('runPlan/setPlanData', []);
     if (error.code == 30001) {
         MessageBox.confirm('今日运行图未加载', '提示', {
@@ -101,12 +101,6 @@ export function runPlanErrorHandle(error, dataError) {
             showCancelButton: false,
             type: 'warning'
         });
-    } else if (!dataError) {
-        MessageBox.confirm('获取运行图数据失败', '提示', {
-            confirmButtonText: '确定',
-            showCancelButton: false,
-            type: 'warning'
-        });
     }
 
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index f31c561f9..543e9cd07 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -28,13 +28,16 @@ service.interceptors.request.use(config => {
     //  用于/demo/index 文件中baseUrl 判断（后端要求不管本地还是正式，都要可以访问实训/临时使用）
     if (store.state.user.baseUrl) {
         config.baseURL = store.state.user.baseUrl;
+    } else {
+        config.baseURL = urlData.BASE_API;
     }
-    if (config.upload) {
-        config.baseURL = urlData.UPLOAD_API;
-    }
-    if (config.production) {
-        config.baseURL = urlData.PROD_API;
-    }
+    // if (config.upload) {
+    //     config.baseURL = urlData.UPLOAD_API;
+    // }
+    // if (config.production) {
+    //     config.baseURL = urlData.PROD_API;
+    // }
+
     if (config.time) {
         config.timeout = config.time; // 让每个请求携带自定义token 请根据实际情况自行修改
     }
diff --git a/src/utils/sock.js b/src/utils/sock.js
index dc4347a03..d661945cf 100644
--- a/src/utils/sock.js
+++ b/src/utils/sock.js
@@ -44,7 +44,7 @@ StompClient.prototype = {
             that.status = true;
             // 恢复订阅
             that.subscribeMap.forEach((subscribe) => {
-                that.subscribe(subscribe.dest, subscribe.handler);
+                that.subscribe(subscribe.dest, subscribe.handler, subscribe.headers);
             });
         }, (e)=> {
             console.log('socket连接错误:' + e);
@@ -114,21 +114,24 @@ StompClient.prototype = {
         this.onmessage = onmessage;
         this.headers = headers;
         if (!this.status) {
-            this.subscribeMap.set(topic, {dest: topic, handler: onmessage, sub: null});
+            this.subscribeMap.set(topic, {dest: topic, handler: onmessage, sub: null, headers, count: 1});
         } else {
             const sub = this.clientIns.subscribe(topic, onmessage);
-            this.subscribeMap.set(topic, {dest: topic, handler: onmessage, sub: sub});
+            this.subscribeMap.set(topic, {dest: topic, handler: onmessage, sub: sub, headers, count: 1});
         }
     },
 
     unsubscribe(topic) {
         const subscription = this.subscribeMap.get(topic);
-        if (subscription && subscription.sub) {
-            subscription.sub.unsubscribe();
-            this.subscribeMap.delete(topic);
-            console.log('取消订阅:' + topic);
-        } else if (subscription) {
-            this.subscribeMap.delete(topic);
+        if (subscription && subscription.count > 0) {
+            subscription.count--;
+            if (subscription && subscription.sub && subscription.count <= 0) {
+                subscription.sub.unsubscribe();
+                this.subscribeMap.delete(topic);
+                console.log('取消订阅:' + topic);
+            } else if (subscription && subscription.count <= 0) {
+                this.subscribeMap.delete(topic);
+            }
         }
     },
 
diff --git a/src/utils/stomp.js b/src/utils/stomp.js
index 5b4f5ec3f..b2fc5b99c 100644
--- a/src/utils/stomp.js
+++ b/src/utils/stomp.js
@@ -50,19 +50,39 @@ export function getTopic(type, group, param) {
         // topic = `/user/queue/simulation/${group}/ctc/manage`;
         topic = `/user/queue/simulation/${group}/ctcManage`;
         break;
+    case 'ATS_STATUS':
+        topic = `/user/queue/simulation/${group}/device/status`;
+        break;
+    case 'COMMON':
+        topic = `/user/queue/simulation/${group}`;
+        break;
+    case 'LPF':
+        topic = `/user/queue/simulation/passenger/${group}`;
+        break;
+    case 'YJDDZH':
+        topic = `/topic/yjddzh/trainPosition`;
+        break;
+    case 'RUNFACT':
+        topic = `/user/queue/simulation/${group}/runFact`;
+        break;
+    case 'JL3D':
+        topic = `/user/queue/simulation/${group}/jl3d`;
+        break;
     }
 
     return topic;
 }
 
 // 建立连接并订阅地址
-export function creatSubscribe(topic, header) {
+export function creatSubscribe(topic, header, callbackFun) {
     try {
         if (!Vue.prototype.$stomp) {
             Vue.prototype.$stomp = new StompClient();
         }
-        if (!Vue.prototype.$stomp.subscribeMap.has(topic)) {
-            Vue.prototype.$stomp.subscribe(topic, callback, header);
+        if (!Vue.prototype.$stomp.subscribeMap[topic]) {
+            Vue.prototype.$stomp.subscribe(topic, callbackFun || callback, header);
+        } else {
+            Vue.prototype.$stomp.subscribeMap[topic].count++;
         }
     } catch (error) {
         console.error('websocket订阅失败', error, topic, header);
diff --git a/src/utils/subscribeCallback.js b/src/utils/subscribeCallback.js
new file mode 100644
index 000000000..ff573dc64
--- /dev/null
+++ b/src/utils/subscribeCallback.js
@@ -0,0 +1,216 @@
+import store from '@/store/index';
+import {Notification} from 'element-ui';
+export function atsCallback(Response) {
+    const data = {res:JSON.parse(Response.body), type:'ats' };
+    store.dispatch('socket/handleSock', data);
+}
+export function sysTimeCallback(Response) {
+    store.dispatch('socket/setSimulationTimeSync', Number.parseInt(Response.body));
+}
+export function stateCallback(Response) {
+    store.dispatch('socket/handleSimulationState', Number.parseInt(Response.body));
+}
+export function iscsPsdCallback(Response) {
+    store.dispatch('socket/handleIscsState', JSON.parse(Response.body));
+}
+export function iscsPaCallback(Response) {
+    store.dispatch('socket/handleIscsPaState', JSON.parse(Response.body));
+}
+export function iscsPisCallback(Response) {
+    store.dispatch('socket/handleIscsPisState', JSON.parse(Response.body));
+}
+export function defaultCallback(Response) {
+    handle(JSON.parse(Response.body));
+}
+function handle(data) {
+    const msg = data.body;
+    switch (data.type) {
+    case 'Order_Pay_Result': // 订单支付结果消息
+        store.dispatch('socket/setPayOrder', msg);
+        break;
+    case 'Simulation_DeviceStatus': // 仿真-设备状态消息
+        store.dispatch('socket/setEquipmentStatus', msg);
+        break;
+    case 'Simulation_User': // 仿真-进出仿真消息
+        store.dispatch('socket/setSimulationRoleList', (data instanceof Array) ? data : [data]);
+        break;
+    case 'Simulation_Script_Action_Tip': // 剧本提示消息
+        store.dispatch('socket/setSimulationScriptTip', data);
+        break;
+    case 'Simulation_Script_Action_Finish': // 剧本某一部操作完成提示
+        store.dispatch('socket/simulationScriptTipFinishIncrease');
+        break;
+    case 'Simulation_Script_Action_Error': // 剧本某一部操作执行错误
+        store.dispatch('socket/simulationScriptTipErrorIncrease');
+        break;
+    case 'Simulation_Over': // 用户退出仿真推送消息
+        store.dispatch('socket/simulationOverIncrease');
+        break;
+    case 'Simulation_Script_Action':// 剧本编制添加指令的推送消息
+        store.dispatch('socket/setScriptAction', msg);
+        break;
+    case 'Simulation_AutoFault_Trigger': // 自动故障触发操作推送消息
+        store.dispatch('socket/autoFaultTriggerIncrease');
+        break;
+    case 'Simulation_RunFact': // 仿真-列车实际到发车站消息
+        store.dispatch('socket/setTrainStationList', Array.isArray(msg) ? msg : [msg]);
+        break;
+    case 'Simulation_Error': // 仿真-异常消息
+        store.dispatch('socket/simulationErrorIncrease');
+        break;
+    case 'Simulation_RunAsPlan_Start': // 仿真-仿真开始按计划行车消息
+        store.dispatch('socket/setSimulationStart', msg);
+        break;
+    case 'Simulation_Reset': // 仿真-仿真重置消息 退出计划行车
+        store.dispatch('socket/simulationResetIncrease');
+        break;
+    case 'Simulation_Conversation': // 仿真-用户交互消息（聊天/命令）
+        handleSimulationInfo(msg);
+        break;
+    case 'Simulation_Conversation_Operation': // 仿真-用户交互消息（聊天/命令）-新
+        store.dispatch('socket/setConversationMessage', msg);
+        break;
+    case 'Simulation_ApplyHandle': 	// 请求处理消息（旧版可能在用，新版地图不用这个）
+        store.dispatch('socket/handlePushMsgQueue', msg);
+        break;
+    case 'Be_Logged_Out': // 重复登录被登出
+        store.dispatch('socket/setLoggedOutMsg', msg);
+        break;
+    case 'Simulation_Run_Plan_Reload': // 运行图变更
+        store.dispatch('socket/runPlanReloadCountIncrease');
+        break;
+    case 'Simulation_Control_Pause': // 暂停中
+        store.dispatch('scriptRecord/updateSimulationPause', msg);
+        break;
+    case 'BROADCAST': // 升级通知消息
+        Notification.warning({
+            title: msg.title,
+            center: true,
+            message: msg.message,
+            position: 'bottom-right',
+            showClose: msg.showClose,
+            duration: 0
+        });
+        break;
+    case 'Simulation_Member':
+        store.dispatch('socket/memberChangeCountIncrease');
+        break;
+    case 'Simulation_Time_Sync':
+        store.dispatch('socket/setSimulationTimeSync', msg);
+        break;
+    case 'Simulation_IbpStatus':
+        store.dispatch('socket/setSimulationIbpStatus', msg);
+        break;
+    case 'Simulation_Competition_Practice_Finish':
+        store.dispatch('socket/competitionPracticeFinishIncrease');
+        break;
+    case 'Simulation_Alarm':
+        store.dispatch('socket/setSimulationAlarmInfo', msg);
+        break;
+    case 'STATION_PFI_NUM':
+        store.dispatch('socket/setStationPfiNum', msg);
+        break;
+    case 'STAND_PFI':
+        store.dispatch('socket/setStandPfiNum', msg);
+        break;
+    case 'TRAIN_PFI_NUM':
+        store.dispatch('socket/setTrainPfiNum', msg);
+        break;
+    case 'TRAIN_PFI_BL':
+        store.dispatch('socket/setTrainPfiBL', msg);
+        break;
+    case 'LPF_STRATEGY_RECOMMEND':
+        store.dispatch('socket/setLPFstrategy', msg);
+        break;
+    case 'Simulation_Scenes_Reload':
+        if (msg) {
+            store.dispatch('training/start');
+        } else {
+            store.dispatch('training/over');
+        }
+        store.dispatch('socket/trainingReloadCountIncrease');
+        break;
+    case 'Simulation_PslStatus':
+        store.dispatch('socket/setSimulationPslStatus', msg);
+        break;
+        // 运行图加线/抽线/变化推送消息
+    case 'Simulation_Trip_Plan_Change':
+        store.dispatch('socket/setSimulationPlanChange', msg);
+        break;
+        // 占线板信息
+    case 'Simulation_RailCtcStatus':
+        store.dispatch('socket/setRailCtcStatusMsg', msg);
+        break;
+    case 'SIMULATION_CTC_RUN_PLAN_CHANGE':
+        store.dispatch('socket/handleCtcRunPlanChange', msg);
+        break;
+        // 大铁项目 ctc 调度发布行车计划 给车站下发消息
+    case 'SIMULATION_RAILWAY_RUN_PLAN_SEND':
+        store.dispatch('socket/sendRailwayRunPlan', msg);
+        break;
+        // 大铁项目 ctc 车务管理端 初始化消息
+    case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_INIT':
+        store.dispatch('socket/initCtcManagerRunPlan', msg);
+        break;
+        // 大铁项目 ctc 车务管理端 修改/增加消息
+    case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_CHANGE':
+        store.dispatch('socket/changeCtcManagerRunPlanEdit', msg);
+        break;
+        // 大铁项目 ctc 车务管理端 移除消息
+    case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_REMOVE':
+        store.dispatch('socket/removeCtcManagerRunPlanEdit', msg);
+        break;
+        // 调度命令信息
+    case 'SIMULATION_RAIL_CTC_DISPATCH_COMMAND':
+        store.dispatch('socket/setDispatchCommandMsg', msg);
+        break;
+        // 车站发送计划信息
+    case 'SIMULATION_CTC_RUN_PLAN_CONFIRM_SEND':
+        store.dispatch('socket/setChangedCtcRunplanMap', msg);
+        break;
+    case 'SIMULATION_RAIL_TICKET':
+        store.dispatch('socket/setTicketInfo', msg);
+        break;
+    case 'Simulation_Training_Finish':
+        store.dispatch('socket/trainingOverCountIncrease');
+        break;
+    case 'SIMULATION_WORK_PARAM':
+        store.dispatch('socket/setSimulationWorkParam', msg);
+        break;
+    case 'Simulation_Training_Step_Tip':
+        store.dispatch('trainingNew/setStepInfo', msg);
+        break;
+    case 'Simulation_Training_Step_Finish':
+        store.dispatch('trainingNew/clearStepInfo', msg);
+        break;
+    case 'Simulation_Training_Audio_MATCH_RESULT':
+        store.dispatch('trainingNew/handleMatchVoice', msg);
+        break;
+    case 'Simulation_Control_Transfer_Result':
+        store.dispatch('socket/setControlTransfer', msg);
+        break;
+    }
+}
+// 仿真内部聊天
+function handleSimulationInfo(data) {
+    switch (data.messageType) {
+    case 'INVITE':
+        store.dispatch('socket/setInviteSimulationConversation', data);
+        break;
+    case 'CONNECT':
+        store.dispatch('socket/setAcceptConversionInvite', data);
+        break;
+    case 'OVER':
+        store.dispatch('socket/setOverConversation', data);
+        break;
+    case 'MESSAGE':
+        store.dispatch('socket/setConversationInfo', data);
+        break;
+    case 'CREATE':
+        store.dispatch('socket/setCreateConversation', data);
+        break;
+    case 'EXIT':
+        store.dispatch('socket/setExitConversation', data);
+        break;
+    }
+}
diff --git a/src/views/authorityTransfer/create/addPermission.vue b/src/views/authorityTransfer/create/addPermission.vue
new file mode 100644
index 000000000..935afca13
--- /dev/null
+++ b/src/views/authorityTransfer/create/addPermission.vue
@@ -0,0 +1,30 @@
+<template>
+  <el-dialog v-dialogDrag title="选择权限" :visible.sync="dialogShow" width="1400px" :before-close="close">
+    <PermissionList :only-select="true" table-height="450" v-bind="$attrs" v-on="$listeners" />
+  </el-dialog>
+</template>
+
+<script>
+import PermissionList from '@/views/permissionManage/index';
+
+export default {
+    name: 'AddPermission',
+    components: {
+        PermissionList
+    },
+    data() {
+        return {
+            dialogShow: false
+        };
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        close() {
+            this.dialogShow = false;
+        }
+    }
+};
+</script>
+
diff --git a/src/views/authorityTransfer/create/index.vue b/src/views/authorityTransfer/create/index.vue
new file mode 100644
index 000000000..30f158c80
--- /dev/null
+++ b/src/views/authorityTransfer/create/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div>
+    <div class="forms pack-rule">
+      <el-form ref="dataform" label-position="right" :model="formModel" label-width="80px" :rules="rules" size="mini" @submit.native.prevent>
+        <el-form-item label="关联权限" prop="permissionIds">
+          <div>
+            <el-button size="mini" style="margin-bottom:10px" @click="buttonClick">添加权限</el-button>
+            <el-table :data="formModel.permissionIds" size="mini" border class="table_item" max-height="400">
+              <el-table-column prop="permissionId" label="权限id" width="80" />
+              <el-table-column prop="permissionName" :label="$t('orderAuthor.permissionName')" />
+              <el-table-column :label="$t('orderAuthor.totalPermissions')" width="160">
+                <template slot-scope="scope">
+                  <el-input-number v-model="scope.row.amount" :step="1" :min="1" :precision="0" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('global.operate')" width="80">
+                <template slot-scope="scope">
+                  <el-button type="text" size="small" @click="removePermissions(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-form-item>
+        <el-form-item :label="$t('orderAuthor.permanenceOrNot')" prop="forever">
+          <el-radio v-model="formModel.forever" :label="false">否</el-radio>
+          <el-radio v-model="formModel.forever" :label="true">是</el-radio>
+        </el-form-item>
+        <el-form-item :label="$t('orderAuthor.startTime')" prop="startTime">
+          <el-date-picker v-model="formModel.startTime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-form-item>
+        <el-form-item v-if="noForever" :label="$t('orderAuthor.endTime')">
+          <el-date-picker v-model="formModel.endTime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:mm:ss" />
+        </el-form-item>
+        <el-form-item label="备注" prop="dsc">
+          <el-input v-model="formModel.dsc" placeholder="请输入" />
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="draft">
+      <el-button @click="turnback">{{ $t('global.back') }}</el-button>
+      <el-button type="primary" @click="saveAs">{{ $t('map.confirm') }}</el-button>
+    </div>
+    <addPermission ref="addPermission" :select-ids="formModel.permissionIds" @handleSelect="addPermissions" />
+  </div>
+</template>
+
+<script>
+import addPermission from '@/views/authorityTransfer/create/addPermission';
+import { createDistribute } from '@/api/authorityTransfer';
+
+export default {
+    name: 'OrderForm',
+    components: {
+        addPermission
+    },
+    data() {
+        return {
+            errorTip: '请输入数量',
+            errorIntTip: '数量必须为整数',
+            formModel: {
+                forever: false,
+                startTime: '',
+                endTime: '',
+                dsc: '',
+                permissionIds:[]
+            },
+            pickerOptions: {
+                shortcuts: [{
+                    text: '今天',
+                    onClick(picker) {
+                        picker.$emit('pick', new Date());
+                    }
+                }, {
+                    text: '昨天',
+                    onClick(picker) {
+                        const date = new Date();
+                        date.setTime(date.getTime() - 3600 * 1000 * 24);
+                        picker.$emit('pick', date);
+                    }
+                }, {
+                    text: '一周前',
+                    onClick(picker) {
+                        const date = new Date();
+                        date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit('pick', date);
+                    }
+                }]
+            }
+        };
+    },
+    computed: {
+        noForever() {
+            return !this.formModel.forever;
+        },
+        rules() {
+            const _this = this;
+            const baseRules = {
+                permissionIds: [
+                    { required: true, message: '请添加权限', trigger: 'change' },
+                    {
+                        validator(rule, value, callback) {
+                            if (Array.isArray(value) && value.length > 0) {
+                                callback();
+                            } else {
+                                callback(new Error('请添加权限'));
+                            }
+                        },
+                        trigger: 'blur'
+                    }
+                ],
+                forever: [
+                    { required: true, message: this.$t('rules.pleaseSelect'), trigger: 'change' }
+                ],
+                amount: [
+                    { required: true, message: this.$t('rules.authorAmountInput'), trigger: 'change' },
+                    {
+                        validator(rule, value, callback) {
+                            if (Number.isInteger(Number(value)) && Number(value) > 0) {
+                                callback();
+                            } else {
+                                callback(new Error(_this.$t('rules.authorAmountInputError')));
+                            }
+                        },
+                        trigger: 'blur'
+                    }
+                ],
+                startTime: [
+                    { required: true, message: this.$t('rules.startTimePick'), trigger: 'change' }
+                ],
+                dsc: [
+                    { required: true, message: '请输入备注', trigger: 'change' }
+                ]
+            };
+
+            // 清空表单验证提示信息
+            this.$nextTick(function () {
+                this.$refs.dataform.clearValidate();
+            });
+
+            return baseRules;
+        }
+    },
+    methods: {
+        buttonClick() {
+            this.$refs.addPermission.doShow();
+        },
+        validateChoose(rule, value, callback) {
+            if (value || value === 0) {
+                if (Number.isInteger(value)) {
+                    callback();
+                } else {
+                    callback(new Error(this.errorIntTip));
+                }
+            } else {
+                callback(new Error(this.errorTip));
+            }
+        },
+        addPermissions(row) {
+            const data = {
+                'permissionId': row.id,
+                'permissionName': row.name,
+                'amount': 1
+            };
+            this.formModel.permissionIds.push(data);
+        },
+        removePermissions(data) {
+            this.formModel.permissionIds = this.formModel.permissionIds.filter(({ permissionId }) => permissionId !== data.permissionId);
+        },
+        turnback() {
+            this.$router.go(-1);
+        },
+        saveAs() {
+            this.$refs['dataform'].validate((valid) => {
+                if (!valid) { return; }
+                this.loading = true;
+                createDistribute(this.formModel).then(response => {
+                    this.loading = false;
+                    this.$message.success('创建成功！');
+                    this.turnback();
+                }).catch(() => {
+                    this.loading = false;
+                    this.$message.error('创建失败！');
+                });
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.pack-rule {
+        width: 800px;
+        margin: 0 auto;
+        margin-top: 12px;
+        padding: 40px;
+	}
+	.draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/src/views/authorityTransfer/detail.vue b/src/views/authorityTransfer/detail.vue
new file mode 100644
index 000000000..daf00b22d
--- /dev/null
+++ b/src/views/authorityTransfer/detail.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-dialog v-dialogDrag title="权限详情" :visible.sync="dialogShow" width="800px" :before-close="handleClose">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <div slot="footer">
+      <el-button type="primary" @click="handleClose">{{ $t('global.return') }}</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getDistributeDetail } from '@/api/authorityTransfer';
+
+export default {
+    name: 'DistributeDetail',
+    data() {
+        return {
+            dialogShow: false,
+            height: 0,
+            disId: '',
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                show: false
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                paginationHiden: true,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '权限id',
+                        width: '80',
+                        prop: 'permissionId'
+                    },
+                    {
+                        title: '权限名称',
+                        prop: 'permissionName'
+                    },
+                    {
+                        title: '总数量',
+                        width: '80',
+                        prop: 'amount'
+                    },
+                    {
+                        title: '剩余数量',
+                        width: '80',
+                        prop: 'remains'
+                    }
+                ]
+            }
+        };
+    },
+    methods: {
+        doShow(row) {
+            this.disId = row.id || '';
+            this.reloadTable();
+            this.dialogShow = true;
+        },
+        queryFunction(params) {
+            return getDistributeDetail(this.disId);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        handleClose() {
+            this.dialogShow = false;
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/src/views/authorityTransfer/distributePackage.vue b/src/views/authorityTransfer/distributePackage.vue
new file mode 100644
index 000000000..7f290f3da
--- /dev/null
+++ b/src/views/authorityTransfer/distributePackage.vue
@@ -0,0 +1,186 @@
+<template>
+  <el-dialog title="权限分发到指定用户" :visible.sync="dialogVisible" width="1200px" :before-close="doClose" center :close-on-click-modal="false">
+    <QueryListPage ref="queryListPage1" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </el-dialog>
+</template>
+
+<script>
+
+import { getUserList } from '@/api/management/user';
+import { setDistributeToSubject } from '@/api/authorityTransfer';
+import { getCompanyList } from '@/api/company';
+export default {
+    name:'DistributePackage',
+    data() {
+        return {
+            packageId:'',
+            dialogVisible:false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            companyMap: {},
+            companyList: [],
+            countTypeList:[
+                {label:'个人账户', value:'1'},
+                {label:'企业账户', value:'2'},
+                {label:'企业账户下子账户', value:'3'}
+            ],
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: this.$t('system.name')
+                    },
+                    id: {
+                        type: 'text',
+                        label: 'id'
+                    },
+                    roles: {
+                        type: 'select',
+                        label: this.$t('system.roles'),
+                        config: {
+                            data: this.$ConstSelect.roleList
+                        }
+                    },
+                    nickname: {
+                        type: 'text',
+                        label: '昵称'
+                    },
+                    mobile: {
+                        type: 'text',
+                        label: '手机号'
+                    },
+                    email: {
+                        type: 'text',
+                        label: '邮箱'
+                    },
+                    companyId: {
+                        type: 'select',
+                        label: '组织',
+                        config: {
+                            data: []
+                        }
+                    },
+                    type:{
+                        type: 'select',
+                        label: '类型',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+
+            },
+            queryList: {
+                query: getUserList,
+                selectCheckShow: false,
+                height: '420',
+                indexShow: true,
+                columns: [
+                    {
+                        title: 'id',
+                        prop: 'id',
+                        width: 80
+                    },
+                    {
+                        title: this.$t('system.name'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('system.nickname'),
+                        prop: 'nickname'
+                    },
+                    {
+                        title: '类型',
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getCountType(row.type); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('global.mobile'),
+                        prop: 'mobile'
+                    },
+                    {
+                        title: this.$t('global.email'),
+                        prop: 'email'
+                    },
+                    {
+                        title: '组织',
+                        prop: 'companyId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getCompanyName(row.companyId); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('system.roles'),
+                        prop: 'roles',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '90',
+                        buttons: [
+                            {
+                                name: '选择',
+                                handleClick: this.distributePackage
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    created() {
+        this.companyMap = {};
+        this.companyList = [];
+        getCompanyList().then(resp => {
+            if (resp && resp.data && resp.data.length) {
+                resp.data.forEach(item => {
+                    this.companyMap[item.id] = item.name;
+                    this.companyList.push({label: item.name, value: parseInt(item.id)});
+                });
+                this.queryForm.queryObject.companyId.config.data = this.companyList;
+                this.queryForm.queryObject.type.config.data = this.countTypeList;
+            }
+        }).catch((error) => {
+            console.error(error);
+        });
+    },
+    methods:{
+        doShow(data) {
+            this.packageId = data.id;
+            this.dialogVisible = true;
+        },
+        doClose() {
+            this.dialogVisible = false;
+        },
+        getCountType(type) {
+            const countType = this.countTypeList.find(each=>{ return each.value == type; });
+            return countType ? countType.label : '';
+        },
+        getCompanyName(companyId) {
+            return this.companyMap[companyId];
+        },
+        distributePackage(index, row) {
+            if (this.packageId) {
+                const accountId = row.id;
+                const subjectType = row.type == '1' ? 'user' : 'org';
+                setDistributeToSubject(this.packageId, subjectType, accountId).then(resp=> {
+                    this.$message.success('权限分发给指定账户成功！');
+                    this.$emit('reloadTable');
+                    this.doClose();
+                }).catch(() => {
+                    this.$messageBox('权限分发给指定账户失败');
+                });
+            }
+        }
+    }
+};
+</script>
diff --git a/src/views/authorityTransfer/index.vue b/src/views/authorityTransfer/index.vue
new file mode 100644
index 000000000..a3d319f1e
--- /dev/null
+++ b/src/views/authorityTransfer/index.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <qr-code ref="qrCode" />
+    <distribute-package ref="distributePackage" @reloadTable="reloadTable" />
+    <Detail ref="detail" />
+  </div>
+</template>
+
+<script>
+import { admin } from '@/router/index';
+import { getDistributeList, getDistributeQrCode } from '@/api/authorityTransfer';
+import QrCode from '@/components/QrCode';
+import DistributePackage from './distributePackage';
+import Detail from './detail';
+
+export default {
+    name: 'Author',
+    components: {
+        QrCode,
+        Detail,
+        DistributePackage
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '100px',
+                reset: false,
+                queryObject: {
+                    dsc: {
+                        type: 'text',
+                        label: '备注'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '权限分发Id',
+                        width: '100',
+                        prop: 'id'
+                    },
+                    {
+                        title: '备注',
+                        prop: 'dsc'
+                    },
+                    {
+                        title: this.$t('orderAuthor.founder'),
+                        prop: 'nickName'
+                    },
+                    {
+                        title: this.$t('orderAuthor.permanenceOrNot'),
+                        prop: 'forever',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.forever) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('orderAuthor.startTime'),
+                        prop: 'startTime',
+                        width: '160'
+
+                    },
+                    {
+                        title: this.$t('orderAuthor.endTime'),
+                        prop: 'endTime',
+                        width: '160'
+                    },
+                    {
+                        title: '创建时间',
+                        prop: 'createTime',
+                        width: '160'
+                    },
+                    {
+                        title: '更新时间',
+                        prop: 'updateTime',
+                        width: '160'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: this.$i18n.locale == 'en' ? '400' : '300',
+                        hide: (row) => { return this.$store.state.user.roles.indexOf(admin) < 0; },
+                        buttons: [
+                            {
+                                name: this.$t('orderAuthor.obtainQrCode'),
+                                handleClick: this.handleRtCodeShow,
+                                type: ''
+                            },
+                            {
+                                name: '权限详情',
+                                handleClick: this.handleDetailShow,
+                                type: ''
+                            },
+                            {
+                                name: '领取到',
+                                handleClick: this.distributePackage,
+                                type: ''
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '创建权限分发', handler: this.handleCreatePackage }
+                ]
+            }
+        };
+    },
+    methods: {
+        queryFunction(params) {
+            return getDistributeList(params);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        handleDetailShow(index, row) {
+            this.$refs.detail.doShow(row);
+        },
+        handleRtCodeShow(index, row) {
+            getDistributeQrCode(row.id).then(resp => {
+                this.$refs.qrCode.doShow({
+                    url: resp.data,
+                    title: this.$t('orderAuthor.privilegeTransferQRCode')
+                });
+            }).catch(() => {
+                this.$message.error('获取二维码失败！');
+            });
+        },
+        handleCreatePackage() {
+            this.$router.push({ path: `/systemManagement/permissionDataManage/createDistribute` });
+        },
+        distributePackage(index, row) {
+            this.$refs.distributePackage.doShow(row);
+        }
+    }
+};
+</script>
diff --git a/src/views/bigTrainRunplanManage/addRunplan.vue b/src/views/bigTrainRunplanManage/addRunplan.vue
index ba09f15af..29fa26377 100644
--- a/src/views/bigTrainRunplanManage/addRunplan.vue
+++ b/src/views/bigTrainRunplanManage/addRunplan.vue
@@ -354,7 +354,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/bigTrainRunplanManage/batchTrainFxPath.vue b/src/views/bigTrainRunplanManage/batchTrainFxPath.vue
index d24218fc3..25b9485c8 100644
--- a/src/views/bigTrainRunplanManage/batchTrainFxPath.vue
+++ b/src/views/bigTrainRunplanManage/batchTrainFxPath.vue
@@ -289,7 +289,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/bigTrainRunplanManage/directionInformation.vue b/src/views/bigTrainRunplanManage/directionInformation.vue
index 81864a710..7bea6ea8f 100644
--- a/src/views/bigTrainRunplanManage/directionInformation.vue
+++ b/src/views/bigTrainRunplanManage/directionInformation.vue
@@ -146,7 +146,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/bigTrainRunplanManage/index.vue b/src/views/bigTrainRunplanManage/index.vue
index cdfb5d6c5..37559d347 100644
--- a/src/views/bigTrainRunplanManage/index.vue
+++ b/src/views/bigTrainRunplanManage/index.vue
@@ -10,9 +10,9 @@
         <div class="eachBTRpMenuBar">工作区选择</div>
         <div class="eachBTRpMenuBar">帮助</div>
       </div>
-      <div class="BTRunplanClose" @click="quit">
+      <!-- <div class="BTRunplanClose" @click="quit">
         <i class="el-icon-close" />
-      </div>
+      </div> -->
     </div>
     <div class="BTRpTabs">
       <el-tabs v-model="activeTab" type="card" closable @tab-remove="removeTab">
@@ -67,7 +67,6 @@ export default {
     },
     watch: {
         '$store.state.map.mapDataLoadedCount': function (val) { // 地图数据加载完成
-            this.$store.commit('training/notifyGetCommandDefinition', this.$route.query.lineCode);
             this.subscribe();
         }
     },
@@ -110,9 +109,9 @@ export default {
             }
             this.activeTab = name;
         },
-        quit() {
-            window.close();
-        },
+        // quit() {
+        //     window.close();
+        // },
         initLoadData() {
             loadMapDataById(this.$route.query.mapId, 'parse');
         },
diff --git a/src/views/bigTrainRunplanManage/trackInformation.vue b/src/views/bigTrainRunplanManage/trackInformation.vue
index 61a3c422e..26b250ab6 100644
--- a/src/views/bigTrainRunplanManage/trackInformation.vue
+++ b/src/views/bigTrainRunplanManage/trackInformation.vue
@@ -264,7 +264,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/case/index.vue b/src/views/case/index.vue
new file mode 100644
index 000000000..b4fa5a18b
--- /dev/null
+++ b/src/views/case/index.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="quick-entry">
+    <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </div>
+</template>
+<script>
+export default {
+    name: 'Case',
+    components: {},
+    data() {
+        return {
+            caseList: [
+                {
+                    name: '西安铁路职业技术学院',
+                    url: 'https://joylink.club/oss/portal/cases/西安铁路职业技术学院.pdf'
+                },
+                {
+                    name: '贵州装备制造职业学院',
+                    url: 'https://joylink.club/oss/portal/cases/贵州装备制造职业学院机电技术专业实训室建设.pdf'
+                },
+                {
+                    name: '江苏电子信息职业学院',
+                    url: 'https://joylink.club/oss/portal/cases/江苏电子信息职业学院-城市轨道交通行车组织综合实训室.pdf'
+                }
+            ],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '100px',
+                reset: true,
+                show:false
+            },
+            queryList: {
+                data: [],
+                selectCheckShow: false,
+                paginationHiden: true,
+                indexShow: true,
+                height: 500,
+                columns: [
+                    {
+                        title: '案例名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '描述',
+                        prop: 'description'
+                    },
+                    {
+                        type: 'button',
+                        title: '操作',
+                        width: '150',
+                        buttons: [
+                            {
+                                name: '查看',
+                                handleClick: this.handleClick,
+                                type: 'primary'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    created() {
+        this.queryList.data = this.caseList;
+    },
+    methods: {
+        handleClick(index, row) {
+            window.open(row.url, '_blank');
+        }
+    }
+};
+</script>
diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue
index 42aaeb074..e2072484c 100644
--- a/src/views/competitionManage/bankList/index.vue
+++ b/src/views/competitionManage/bankList/index.vue
@@ -1,25 +1,30 @@
 <template>
   <div>
-    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <query-list-page ref="user" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
     <dialog-detail ref="detail" />
+    <preview-answer ref="previewAnswer" :question-id="questionId" />
   </div>
 </template>
 
 <script>
-import { UrlConfig } from '@/scripts/ConstDic';
-import { listQuestionPage, deleteQuestion } from '@/api/questionBank.js';
+// import { UrlConfig } from '@/scripts/ConstDic';
+import { listQuestionPage, listAllQuestionPage, deleteQuestion, getLabelList, listQuestionAll, clearBank } from '@/api/questionBank.js';
 import DialogDetail from './dialog-detail';
+import PreviewAnswer from './previewAnswer';
 import { convertSheetToList } from '@/jmapNew/theme/parser/util.js';
-import { getCompanyList } from '@/api/company';
+// import { getCompanyList } from '@/api/company';
 import XLSX from 'xlsx';
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
 
 export default {
     components: {
-        DialogDetail
+        DialogDetail,
+        PreviewAnswer
     },
     data() {
         return {
-            companyList: [],
+            // companyList: [],
+            questionId: '',
             companyMap: {},
             pagerConfig: {
                 pageSize: 'pageSize',
@@ -29,35 +34,49 @@ export default {
                 reset: true,
                 labelWidth: '80px',
                 leftSpan: 16,
+                beforeQuery: this.beforeQuery,
                 queryObject: {
                     type: {
                         type: 'select',
                         label: '类 型',
                         config: {
-                            data: this.$ConstSelect.QuestionTypeList
+                            data: this.$ConstSelect.QuestionTypeList.filter(item => { return !['fill', 'answer'].includes(item.value); })
                         }
                     },
                     topic: {
                         type: 'text',
                         label: '题 目'
                     },
-                    companyId: {
+                    labels: {
                         type: 'select',
-                        label: '单位',
+                        label: '分 类',
                         config: {
+                            // multiple: true,
                             data: []
                         }
                     }
                 }
             },
             queryList: {
-                query: listQuestionPage,
+                query: this.getListApi,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
                     {
                         title: '题 目',
-                        prop: 'topic'
+                        prop: 'topic',
+                        type: 'html'
+                    },
+                    {
+                        title: '分 类',
+                        prop: 'tags',
+                        // type: 'tagMore',
+                        type: 'tag',
+                        width: '200',
+                        columnValue: (row) => { return this.lableTags(row); },
+                        tagType: (row) => {
+                            return '';
+                        }
                     },
                     {
                         title: '类 型',
@@ -79,14 +98,14 @@ export default {
                             return '';
                         }
                     },
-                    {
-                        title: '单位',
-                        prop: 'companyId',
-                        width: '100',
-                        type: 'tag',
-                        columnValue: (row) => { return this.getCompanyName(row.companyId); },
-                        tagType: (row) => { return ''; }
-                    },
+                    // {
+                    //     title: '单位',
+                    //     prop: 'companyId',
+                    //     width: '100',
+                    //     type: 'tag',
+                    //     columnValue: (row) => { return this.getCompanyName(row.orgId); },
+                    //     tagType: (row) => { return ''; }
+                    // },
                     {
                         type: 'button',
                         title: '操 作',
@@ -102,9 +121,13 @@ export default {
                                 // showControl: (row) => { return row.createUserId == this.userId; },
                                 type: 'danger'
                             },
+                            // {
+                            //     name: '预 览',
+                            //     handleClick: this.doDetail
+                            // },
                             {
-                                name: '预 览',
-                                handleClick: this.doDetail
+                                name: '预览答题',
+                                handleClick: this.previewAnswer
                             }
                         ]
                     }
@@ -112,8 +135,10 @@ export default {
                 actions: [
                     { text: '添 加', handler: this.doCreate },
                     { text: '导 入', fileType: 'file', handler: this.importQuestionBank },
-                    { text: '试卷规则管理', handler: this.questionsRuleManage},
-                    { text: '模板导出', handler: this.exportTemplate}
+                    // { text: '试卷规则管理', handler: this.questionsRuleManage},
+                    // { text: '导出', handler: this.exportTemplate},
+                    { text: '导出模板', handler: this.downloadTemplate},
+                    { text: '清空题库', type:'danger', handler: this.clearBank, show: !this.hasTeachingDataManage() }
                 ]
             }
         };
@@ -124,23 +149,46 @@ export default {
         }
     },
     mounted() {
-        this.companyList = [];
-        getCompanyList().then(resp => {
-            resp.data.forEach(item => {
-                this.queryForm.queryObject.companyId.config.data.push({ value: item.id, label: item.name });
-                this.companyMap[item.id] = item.name;
+        // this.companyList = [];
+        // getCompanyList().then(resp => {
+        //     resp.data.forEach(item => {
+        //         // this.queryForm.queryObject.companyId.config.data.push({ value: item.id, label: item.name });
+        //         this.companyMap[item.id] = item.name;
+        //     });
+        // });
+        getLabelList().then(res => {
+            res.data.forEach(item => {
+                this.queryForm.queryObject.labels.config.data.push({ value: item, label: item });
             });
+        }).catch(err => {
+            console.log(err);
         });
     },
     methods: {
+        hasTeachingDataManage() {
+            return this.$route.path.includes('/teachingDataManage/');
+        },
+        getListApi(obj) {
+            if (this.hasTeachingDataManage()) {
+                return listAllQuestionPage(obj);
+            } else {
+                return listQuestionPage(obj);
+            }
+        },
+        beforeQuery(obj) {
+            // obj.labels = obj.labels ? obj.labels.join(',') : '';
+            return obj;
+        },
         doCreate() {
-            this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
-        },
-        getCompanyName(companyId) {
-            return this.companyMap[companyId];
+            // this.$router.push({path: `${UrlConfig.bank.questionCreate}`});
+            this.$router.push({path: '/teaching/questionCreate'});
         },
+        // getCompanyName(companyId) {
+        //     return this.companyMap[companyId];
+        // },
         edit(index, row) {
-            this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${row.id}`});
+            // this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${row.id}`});
+            this.$router.push({path: `/teaching/questionUpdate/${row.id}`});
         },
 
         doDelete(index, row) {
@@ -161,6 +209,16 @@ export default {
             this.$refs.detail.doShow({index, row});
         },
 
+        previewAnswer(index, row) {
+            this.questionId = row.id;
+            this.$refs.previewAnswer.doShow();
+        },
+
+        lableTags(row) {
+            // return row.tags ? row.tags.split(',') : '';
+            return row.tags || '';
+        },
+
         answerTags(row) {
             const answer = [];
             row.optionList.forEach((el, i) => {
@@ -196,19 +254,20 @@ export default {
         },
         handleImport(file) {
             const questionTypeMap = {
-                '单选': 'select',
-                '多选': 'multi',
-                '判断': 'judge',
-                '填空': 'fill',
-                '问答': 'answer'
+                '单选题': 'select',
+                '多选题': 'multi',
+                '判断题': 'judge',
+                '填空题': 'fill',
+                '问答题': 'answer'
             };
             if (file) {
                 try {
-                    setTimeout(() => {
-                        const that = this;
-                        const reader = new FileReader();
-                        if (reader) {
-                            reader.onload = function (e) {
+                    // setTimeout(() => {
+                    const that = this;
+                    const reader = new FileReader();
+                    if (reader) {
+                        reader.onload = function (e) {
+                            try {
                                 let wb;
                                 const data = e.target.result;
                                 if (that.rABS) {
@@ -224,36 +283,47 @@ export default {
                                 if (wb && wb.Sheets) {
                                     for (const index in wb.Sheets) {
                                         const dataList = convertSheetToList(wb.Sheets[index], true);
-                                        let questionTypeIndex;
-                                        let topicIndex;
-                                        let option1Index;
-                                        let option2Index;
-                                        let option3Index;
-                                        let option4Index;
-                                        let answerIndex;
-                                        dataList.forEach((item, index) => {
-                                            if (item[0] === '题型') {
-                                                questionTypeIndex = index;
-                                            } else if (item[0] === '题目') {
-                                                topicIndex = index;
-                                            } else if ( item[0] === '选项' && item[1] === 'A') {
-                                                option1Index = index;
-                                            } else if (!item[0] && item[1] === 'B') {
-                                                option2Index = index;
-                                            } else if (!item[0] && item[1] === 'C') {
-                                                option3Index = index;
-                                            } else if (!item[0] && item[1] === 'D') {
-                                                option4Index = index;
-                                            } else if (item[0] === '答案') {
-                                                answerIndex = index;
+                                        const objHeader = {
+                                            questionTypeIndex: '题型（必填）',
+                                            topicIndex: '题干（必填）',
+                                            tagsIndex: '分类',
+                                            option1Index: '选项A（必填）',
+                                            option2Index: '选项B（必填）',
+                                            option3Index: '选项C',
+                                            option4Index: '选项D',
+                                            option5Index: '选项E',
+                                            option6Index: '选项F',
+                                            answerIndex: '正确答案（必填）'
+                                        };
+                                        const indexHeader = JSON.parse(JSON.stringify(objHeader));
+                                        dataList.forEach((item, ii) => {
+                                            Object.keys(objHeader).forEach(key => {
+                                                if (!item[0] && !item[1] && item[2] === objHeader[key]) {
+                                                    indexHeader[key] = ii;
+                                                }
+                                            });
+                                        });
+                                        const errHeader = [];
+                                        Object.keys(objHeader).forEach(key => {
+                                            if (typeof indexHeader[key] != 'number') {
+                                                errHeader.push(objHeader[key]);
                                             }
                                         });
+                                        let errInfo = errHeader.join('；');
+                                        if (errInfo) {
+                                            const error = `以下列：${errInfo}，无法找到`;
+                                            throw error;
+                                        }
+                                        const errRow = [];
+                                        const {questionTypeIndex, topicIndex, tagsIndex, option1Index, option2Index, option3Index, option4Index, option5Index, option6Index, answerIndex } = indexHeader;
                                         if (questionTypeIndex || questionTypeIndex === 0) {
                                             dataList[questionTypeIndex].forEach((item, index) => {
-                                                if (item && item !== '题型') {
+                                                if (item && item !== '题型（必填）' && index > 2) {
                                                     const param = {
                                                         type: questionTypeMap[item],
                                                         topic: dataList[topicIndex][index],
+                                                        // tags: dataList[tagsIndex][index] ? dataList[tagsIndex][index].replace(/\s+/g, ',') : '',
+                                                        tags: dataList[tagsIndex][index] || '',
                                                         optionList: []
                                                     };
                                                     if (param.type === 'fill') {
@@ -273,27 +343,80 @@ export default {
                                                         if (dataList[option4Index][index]) {
                                                             param.optionList.push({content:dataList[option4Index][index], correct: dataList[answerIndex][index].includes('D')});
                                                         }
+                                                        if (dataList[option5Index][index]) {
+                                                            param.optionList.push({content:dataList[option5Index][index], correct: dataList[answerIndex][index].includes('E')});
+                                                        }
+                                                        if (dataList[option6Index][index]) {
+                                                            param.optionList.push({content:dataList[option6Index][index], correct: dataList[answerIndex][index].includes('F')});
+                                                        }
                                                     }
-                                                    param.id = questionList.length;
+                                                    // param.id = questionList.length;
                                                     questionList.push(param);
+
+                                                    if (!param.type || !param.topic || !dataList[option1Index][index] || !dataList[option2Index][index] || !dataList[answerIndex][index]) {
+                                                        errRow.push(index + 1);
+                                                    }
+                                                    if (param.type === 'judge') {
+                                                        const arr = ['√', '正确', '×', '错误'];
+                                                        const asJudge = ['A', 'B'];
+                                                        if (!arr.includes(dataList[option1Index][index]) || !arr.includes(dataList[option2Index][index]) || !asJudge.includes(dataList[answerIndex][index])) {
+                                                            if (!errRow.includes(index + 1)) {
+                                                                errRow.push(index + 1);
+                                                            }
+                                                        }
+                                                    }
+                                                    const asList = ['A', 'B', 'C', 'D', 'E', 'F'];
+                                                    if (param.type === 'select') {
+                                                        if (!asList.includes(dataList[answerIndex][index])) {
+                                                            if (!errRow.includes(index + 1)) {
+                                                                errRow.push(index + 1);
+                                                            }
+                                                        }
+                                                    }
+                                                    if (param.type === 'multi') {
+                                                        if (dataList[answerIndex][index]) {
+                                                            const list = dataList[answerIndex][index].split('');
+                                                            const sortNew = list.sort(function(a, b) {
+                                                                return a.localeCompare(b);
+                                                            });
+                                                            const fArr = sortNew.filter((item, ii) => {
+                                                                return !asList.includes(item) || item == sortNew[ii + 1];
+                                                            });
+                                                            if (!errRow.includes(index + 1) && fArr.length) {
+                                                                errRow.push(index + 1);
+                                                            }
+                                                        }
+                                                    }
                                                 }
                                             });
                                         }
+                                        errInfo = errRow.join('，');
+                                        if (errInfo) {
+                                            const error = `第${errInfo}行，数据错误，请检查！`;
+                                            throw error;
+                                        }
                                     }
                                     that.$store.dispatch('race/setPreTheoryData', questionList).then(() => {
-                                        that.$router.push({ path: `/system/preTheoryImport`});
+                                        that.$router.push({ path: `/teaching/preTheoryImport`});
                                     }).catch((e) => {
                                         that.$message.error('导入题库失败！');
                                     });
                                 }
-                            };
-                            if (that.rABS) {
-                                reader.readAsArrayBuffer(file);
-                            } else {
-                                reader.readAsBinaryString(file);
+                            } catch (e) {
+                                that.$message.warning('导入错误！' + e);
+                                throw e;
                             }
+                        };
+                        reader.onerror = function (e) {
+                            throw e;
+                        };
+                        if (that.rABS) {
+                            reader.readAsArrayBuffer(file);
+                        } else {
+                            reader.readAsBinaryString(file);
                         }
-                    }, 200);
+                    }
+                    // }, 200);
                 } catch (e) {
                     this.$message.error('请根据下载模板导入题目！');
                 }
@@ -306,55 +429,149 @@ export default {
             this.handleImport(f);
         },
         questionsRuleManage() {
-            this.$router.push({ path: `/system/questionsRuleManage`});
+            // this.$router.push({ path: `/system/questionsRuleManage`});
+            this.$router.push({ path: `/teaching/questionsRuleManage`});
+        },
+        clearBank() {
+            this.$confirm('慎重！本操作可清空所有题库数据，是否继续？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                clearBank().then(resp => {
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$message.error(`清空题库数据失败: ${error.message}`);
+                });
+            }).catch( () => { });
+        },
+        downloadTemplate() {
+            // 创建隐藏的可下载链接
+            var eleLink = document.createElement('a');
+            eleLink.download = '理论试题导入模板.xlsx';
+            eleLink.style.display = 'none';
+            const url = JL3D_LOCAL_STATIC + '/theoryTemplate/理论试题导入模板.xlsx';
+            eleLink.href = url;
+            // 触发点击
+            document.body.appendChild(eleLink);
+            eleLink.click();
+            // 然后移除
+            document.body.removeChild(eleLink);
         },
         exportTemplate() {
             const wb = XLSX.utils.book_new();
-            const data1 = [{A: '序号', B: '题型', C:'题目', D:'答案', E: '', F: '', G: '', H: ''}];
-            const data2 = [{A: '', B: '', C:'', D:'', E: 'A', F: 'B', G: 'C', H: 'D'}];
-            const data3 = [{A: '1', B: '判断', C:'题目一', D:'√', E: '', F: '', G: '', H: ''}];
-            const data4 = [{A: '2', B: '判断', C:'题目二', D:'×', E: '', F: '', G: '', H: ''}];
-            const data5 = [{A: '3', B: '单选', C:'题目三', D:'A', E: '选项A', F: '选项B', G: '选项C', H: '选项D'}];
-            const data6 = [{A: '4', B: '多选', C:'题目四', D:'ABCD', E: '选项A', F: '选项B', G: '选项C', H: '选项D'}];
-            // const data7 = [{A: '5', B: '填空', C:'题目五', D:'第一空答案&&第二空答案&&第三空答案', E: '', F: '', G: '', H: ''}];
-            // const data8 = [{A: '6', B: '问答', C:'题目六', D:'问答题答案', E: '', F: '', G: '', H: '问答题答案'}];
-            // const data = [...data1, ...data2, ...data3, ...data4, ...data5, ...data6, ...data7, ...data8];
-            const data = [...data1, ...data2, ...data3, ...data4, ...data5, ...data6];
-            const ws = XLSX.utils.json_to_sheet(data, {skipHeader:true});
-            ws['!merges'] = [
-                {
-                    s: {c: 4, r: 0},
-                    e: {c: 7, r: 0}
-                },
-                {
-                    s: {c: 0, r: 0},
-                    e: {c: 0, r: 1}
-                },
-                {
-                    s: {c: 1, r: 0},
-                    e: {c: 1, r: 1}
-                },
-                {
-                    s: {c: 2, r: 0},
-                    e: {c: 2, r: 1}
-                },
-                {
-                    s: {c: 3, r: 0},
-                    e: {c: 3, r: 1}
-                }
-            ];
-            ws['!cols'] = [
-                {width: 10},
-                {width: 10},
-                {width: 50},
-                {width: 15},
-                {width: 15},
-                {width: 15},
-                {width: 15},
-                {width: 15}
-            ];
-            XLSX.utils.book_append_sheet(wb, ws, 'file');
-            XLSX.writeFile(wb, '题库模板' + '.xlsx');
+            const data1 = [{A: '理论试题导入模板', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}];
+            const data2 = [{A: '说明：1、本表表头（第一行到第三行）内容不能修改删除;\n 2、支持批量导入的题型：单选题，多选题，判断题，题型不能自定义，只能按照表格提供的进行录入;\n 3、【判断题】在选项A中可填写√ 或正确，选项B中填写× 或错误，答案填写A或B', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}];
+            const data3 = [{A: '序号', B: '题干（必填）', C:'题型（必填）', D:'选项A（必填）', E:'选项B（必填）', F: '选项C', G: '选项D', H: '选项E', I: '选项F', J: '正确答案（必填）', K: '分类'}];
+            const data = [...data1, ...data2, ...data3];
+            const mapType = {
+                select: '单选题',
+                multi: '多选题',
+                judge: '判断题',
+                fill: '填空题',
+                answer: '问答题'
+            };
+            listQuestionAll().then(res => {
+                console.log(res, '---res===');
+                res.data.forEach((item, index) => {
+                    let as = item.answer;
+                    const arr = ['select', 'multi', 'judge'];
+                    if (arr.includes(item.type)) {
+                        as = [];
+                        item.optionList.forEach((it, ind) => {
+                            if (it.correct) {
+                                as.push(this.$asc2chart(ind + 65));
+                            }
+                        });
+                        as = as.join(',');
+                    }
+                    const obj = {
+                        A: index + 1,
+                        B: item.topic,
+                        C: mapType[item.type] || '',
+                        D: item.optionList[0].content,
+                        E: item.optionList[1].content,
+                        F: item.optionList[2] ? item.optionList[2].content : '',
+                        G: item.optionList[3] ? item.optionList[3].content : '',
+                        H: item.optionList[4] ? item.optionList[4].content : '',
+                        I: item.optionList[5] ? item.optionList[5].content : '',
+                        J: as,
+                        // K: item.tags ? item.tags.replace(',', ' ') : ''
+                        K: item.tags || ''
+                    };
+                    data.push(obj);
+                });
+                const ws = XLSX.utils.json_to_sheet(data, {skipHeader:true});
+                ws['!merges'] = [
+                    {
+                        s: {c: 0, r: 0},
+                        e: {c: 10, r: 0}
+                    },
+                    {
+                        s: {c: 0, r: 1},
+                        e: {c: 10, r: 1}
+                    },
+                    {
+                        s: {c: 0, r: 2},
+                        e: {c: 0, r: 2}
+                    },
+                    {
+                        s: {c: 1, r: 2},
+                        e: {c: 1, r: 2}
+                    },
+                    {
+                        s: {c: 2, r: 2},
+                        e: {c: 2, r: 2}
+                    },
+                    {
+                        s: {c: 3, r: 2},
+                        e: {c: 3, r: 2}
+                    },
+                    {
+                        s: {c: 4, r: 2},
+                        e: {c: 4, r: 2}
+                    },
+                    {
+                        s: {c: 5, r: 2},
+                        e: {c: 5, r: 2}
+                    },
+                    {
+                        s: {c: 6, r: 2},
+                        e: {c: 6, r: 2}
+                    },
+                    {
+                        s: {c: 7, r: 2},
+                        e: {c: 7, r: 2}
+                    },
+                    {
+                        s: {c: 8, r: 2},
+                        e: {c: 8, r: 2}
+                    },
+                    {
+                        s: {c: 9, r: 2},
+                        e: {c: 9, r: 2}
+                    },
+                    {
+                        s: {c: 10, r: 2},
+                        e: {c: 10, r: 2}
+                    }
+                ];
+                ws['!cols'] = [
+                    {width: 10},
+                    {width: 50},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15},
+                    {width: 15}
+                ];
+                XLSX.utils.book_append_sheet(wb, ws, 'file');
+                XLSX.writeFile(wb, '题库模板' + '.xlsx');
+            });
         }
     }
 };
diff --git a/src/views/competitionManage/bankList/item-answer.vue b/src/views/competitionManage/bankList/item-answer.vue
index c6c161064..e0313645c 100644
--- a/src/views/competitionManage/bankList/item-answer.vue
+++ b/src/views/competitionManage/bankList/item-answer.vue
@@ -7,8 +7,9 @@
     </template>
     <template v-if="type=='judge'">
       <el-radio-group v-model="active" @change="onChange">
-        <el-radio :label="0"> √ </el-radio>
-        <el-radio :label="1"> × </el-radio>
+        <!-- <el-radio :label="0"> √ </el-radio>
+        <el-radio :label="1"> × </el-radio> -->
+        <el-radio v-for="(el,i) in optionList" :key="i" :label="i"> {{ el.content }} </el-radio>
       </el-radio-group>
     </template>
     <template v-if="type=='multi'">
@@ -71,6 +72,7 @@ export default {
             handler:function(newV, oldV) {
                 if (this.type === 'judge' || this.type === 'select') {
                     this.active = this.optionList.findIndex(ele => ele.correct);
+                    this.$emit('change', this.active);
                 } else if (this.type === 'multi') {
                     this.activeList = [];
                     this.optionList.forEach((el, i) => {
@@ -78,13 +80,16 @@ export default {
                             this.activeList.push(i);
                         }
                     });
+                    this.$emit('change', this.activeList);
                 } else if (this.type === 'fill') {
                     this.answerList = [];
                     this.optionList.forEach(el => {
                         this.answerList.push(el.content);
                     });
+                    this.$emit('change', this.answerList);
                 } else if (this.type === 'answer') {
                     this.answer = (this.optionList[0] || {content: ''}).content;
+                    this.$emit('change', this.answer);
                 }
             }
         }
diff --git a/src/views/competitionManage/bankList/item-options.vue b/src/views/competitionManage/bankList/item-options.vue
index 6be8de212..f0a160d70 100644
--- a/src/views/competitionManage/bankList/item-options.vue
+++ b/src/views/competitionManage/bankList/item-options.vue
@@ -4,6 +4,7 @@
       <div v-for="(el,i) in optionList" :key="i" class="option__item">
         <div> 选项-{{ $asc2chart(65+i) }} </div>
         <item-rich v-model="el.content" :remove="remove" @modify="doModify(el)" @remove="doRemove(i)" />
+        <span v-if="!el.content" class="error">选项不能为空</span>
       </div>
       <el-button v-if="add" class="item__button" type="primary" size="mini" icon="el-icon-plus" @click="doAppend" />
     </template>
@@ -57,6 +58,19 @@ export default {
     .option {
 		&__item {
 			margin-bottom: 10px;
+			position: relative;
+			.error {
+				color: #F56C6C;
+				font-size: 12px;
+				line-height: 1;
+				padding-top: 4px;
+				position: absolute;
+				top: 100%;
+				left: 0;
+			}
+		}
+		.item__button {
+			margin-top: 20px;
 		}
     }
 </style>
diff --git a/src/views/competitionManage/bankList/preImport.vue b/src/views/competitionManage/bankList/preImport.vue
index 78334b35f..254c0e033 100644
--- a/src/views/competitionManage/bankList/preImport.vue
+++ b/src/views/competitionManage/bankList/preImport.vue
@@ -1,62 +1,43 @@
 <template>
   <div style="text-align: center;padding: 10px;">
     <div style="margin-top: 10px;margin-bottom: 10px;display: flex;justify-content: space-between;">
-      <div style="display: inline-block;font-size: 14px;">
+      <!-- <div style="display: inline-block;font-size: 14px;">
         <span>单位</span>
         <el-select v-model="companyId" placeholder="请选择单位" clearable size="mini" style="margin-left: 10px;">
           <el-option v-for="it in companyList" :key="it.id" :label="it.name" :value="it.id" />
         </el-select>
-      </div>
+      </div> -->
       <div style="display: inline-block;">
-        <el-button
-          v-loading="loading"
-          size="mini"
-          type="primary"
-          @click="doSave"
-        >保存</el-button>
-        <el-button
-          size="mini"
-          type="danger"
-          @click="doCancel"
-        >取消</el-button>
+        <el-button v-loading="loading" size="mini" type="primary" @click="doSave">保存</el-button>
+        <el-button size="mini" type="danger" @click="doCancel">取消</el-button>
       </div>
     </div>
-    <el-table
-      :data="tableData"
-      border
-      style="width: 100%"
-    >
-      <el-table-column
-        prop="topic"
-        label="题目"
-      />
-      <el-table-column prop="type" label="类型" width="100">
+    <el-table :data="tableData" border style="width: 100%">
+      <el-table-column prop="topic" label="题目">
         <template slot-scope="scope">
-          <el-tag
-            type="primary"
-            disable-transitions
-          >{{ $ConstSelect.translate(scope.row.type, 'QuestionTypeList') }}</el-tag>
+          <div v-html="scope.row.topic" />
         </template>
       </el-table-column>
-      <el-table-column
-        prop="answer"
-        label="答案"
-      >
+      <el-table-column prop="tags" label="分类" width="200">
+        <template slot-scope="scope">
+          <!-- <el-tag v-for="item in getTagesArr(scope.row.tags)" :key="item" type="primary" disable-transitions style="margin-right: 10px;">{{ item }}</el-tag> -->
+          <el-tag v-if="scope.row.tags" type="primary" disable-transitions style="margin-right: 10px;">{{ scope.row.tags }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="type" label="类型" width="100">
+        <template slot-scope="scope">
+          <el-tag type="primary" disable-transitions>{{ $ConstSelect.translate(scope.row.type, 'QuestionTypeList') }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="answer" label="答案">
         <template slot-scope="scope">
           <el-tag v-for="(answer, index) in answerTags(scope.row)" :key="index" type="primary" style="margin-right: 10px;">{{ answer }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            @click="edit(scope.$index, scope.row)"
-          >编辑</el-button>
-          <el-button
-            size="mini"
-            type="danger"
-            @click="doDelete(scope.$index, scope.row)"
-          >删除</el-button>
+          <el-button size="mini" @click="edit(scope.$index, scope.row)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="doDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -73,9 +54,10 @@
 </template>
 
 <script>
-import { UrlConfig } from '@/scripts/ConstDic';
-import { importQuestionBand } from '@/api/race';
-import { getCompanyList } from '@/api/company';
+// import { UrlConfig } from '@/scripts/ConstDic';
+// import { importQuestionBand } from '@/api/race';
+import { importQuestion, listQuestionAll } from '@/api/questionBank.js';
+// import { getCompanyList } from '@/api/company';
 export default {
     data() {
         return {
@@ -98,14 +80,18 @@ export default {
     mounted() {
         this.handlePreDataPaging();
         this.loading = false;
-        getCompanyList().then(resp => {
-            this.companyList = resp.data;
-        });
+        // getCompanyList().then(resp => {
+        //     this.companyList = resp.data;
+        // });
     },
     methods: {
+        getTagesArr(tags) {
+            return tags ? tags.split(',') : '';
+        },
         edit(index, row) {
             const number = (this.currentPage - 1) * this.pageSize + index;
-            this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${number}`, query:{ draft: true }});
+            // this.$router.push({path: `${UrlConfig.bank.questionUpdate}/${number}`, query:{ draft: true }});
+            this.$router.push({path: `/teaching/questionUpdate/${number}`, query:{ draft: true }});
         },
         handlePreDataPaging() {
             const preData = this.$store.state.race.preTheoryData;
@@ -167,7 +153,53 @@ export default {
             this.currentPage = val;
             this.handlePreDataPaging();
         },
-        doSave() {
+        async doSave() {
+            const nameMap = {};
+            const repetMap = {};
+            const mapType = {
+                select: '单选题',
+                multi: '多选题',
+                judge: '判断题',
+                fill: '填空题',
+                answer: '问答题'
+            };
+            const allRes = await listQuestionAll();
+            let banklist = [];
+            if (allRes.code == 200 && allRes.data) {
+                banklist = allRes.data;
+            }
+            banklist.forEach(item => {
+                const strName = `【${mapType[item.type]}】${item.topic}`;
+                nameMap[strName] = item;
+            });
+            this.$store.state.race.preTheoryData.forEach(item => {
+                const strName = `【${mapType[item.type]}】${item.topic}`;
+                if (nameMap[strName]) {
+                    repetMap[strName] = item;
+                } else {
+                    nameMap[strName] = item;
+                }
+            });
+            if (Object.keys(repetMap).length) {
+                const test = `以下题目重复或与题库有重复，是否继续提交？`;
+                const messageData = [test];
+                const h = this.$createElement;
+                Object.keys(repetMap).forEach((item, index) => {
+                    messageData.push(h('p', null, `${index + 1}.${item}`));
+                });
+                this.$confirm('有题目重复，是否继续提交？', '提 示', {
+                    message: h('div', null, messageData),
+                    confirmButtonText: '确 定',
+                    cancelButtonText: '取 消',
+                    type: 'warning'
+                }).then(() => {
+                    this.submitData();
+                }).catch( () => {});
+            } else {
+                this.submitData();
+            }
+        },
+        submitData() {
             this.loading = true;
             let selectNum = 0;
             let judgeNum = 0;
@@ -193,7 +225,7 @@ export default {
                     break;
                 }
             });
-            importQuestionBand(this.$store.state.race.preTheoryData, this.companyId).then(resp => {
+            importQuestion(this.$store.state.race.preTheoryData).then(resp => {
                 this.$store.dispatch('race/setPreTheoryData', []);
                 // this.$message.success('导入题库成功!');
                 this.$alert(`<strong>本次导入：</strong><br><strong>${judgeNum}道判断题;</strong><br><strong>${selectNum}道选择题;</strong><br><strong>${multiNum}道多选题;</strong><br>`, '导入题库成功!', {
diff --git a/src/views/competitionManage/bankList/previewAnswer.vue b/src/views/competitionManage/bankList/previewAnswer.vue
new file mode 100644
index 000000000..a840e5821
--- /dev/null
+++ b/src/views/competitionManage/bankList/previewAnswer.vue
@@ -0,0 +1,190 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="860px" :close-on-click-modal="false" :before-close="doClose">
+    <div class="ql-editor" v-html="$escapeHTML(`【${mapType[type] || ''}】题 目:  ${form.topic}`)" />
+    <template v-if="checkType(form, 'judge')">
+      <div class="answer">
+        答 案:
+        <div>
+          <el-radio-group v-model="active">
+            <el-radio v-for="(el,i) in options" :key="i" class="option" :label="el.id"> {{ el.content }} </el-radio>
+          </el-radio-group>
+        </div>
+      </div>
+
+    </template>
+    <template v-else-if="checkType(form, 'select')">
+      <div v-for="(el,i) in options" :key="i" class="option" :label="$str2number(el.id)">
+        <span>{{ $asc2chart(i+65) }}. </span>
+        <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
+      </div>
+      <div class="answer">
+        答 案:
+        <div>
+          <el-radio-group v-model="active">
+            <el-radio v-for="(el,i) in options" :key="i" class="option" :label="el.id"> {{ $asc2chart(65+i) }} </el-radio>
+          </el-radio-group>
+        </div>
+      </div>
+    </template>
+    <template v-else-if="checkType(form, 'multi')">
+      <div v-for="(el,i) in options" :key="i" class="option" :label="$str2number(el.id)">
+        <span>{{ $asc2chart(i+65) }}. </span>
+        <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
+      </div>
+      <div class="answer">
+        答 案:
+        <el-checkbox-group v-model="active">
+          <el-checkbox v-for="(el,i) in options" :key="i" class="option" :label="el.id">{{ $asc2chart(65+i) }} </el-checkbox>
+        </el-checkbox-group>
+      </div>
+    </template>
+    <template v-else-if="checkType(form, 'fill')">
+      <div class="answer">
+        答 案:
+        <div v-for="(el, i) in options" :key="i" class="fillType">
+          <div class="fillTypeName">{{ `第${i + 1}空` }}</div>
+          <el-input v-model="active[i]" class="fillTypeInput" type="textarea" :autosize="{ minRows: 1, maxRows: 4}" placeholder="请输入答案" />
+        </div>
+      </div>
+    </template>
+    <template v-else-if="checkType(form, 'answer')">
+      <div class="answer">
+        答 案:
+        <div>
+          <el-input v-model="active" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入答案" />
+        </div>
+      </div>
+    </template>
+    <div v-if="showAnswer" class="show-answer">
+      <span :class="isCorrect? 'correct': 'error'">{{ isCorrect ? '答案正确！' : '答案错误！' }}</span>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="submit(true)">提交</el-button>
+      <el-button @click="show = false">关闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import {getQuestionInfo, testAnswer } from '@/api/questionBank.js';
+export default {
+    props: {
+        questionId: {
+            type:[Number, String],
+            required: true
+        }
+    },
+    data() {
+        return {
+            active: '',
+            show: false,
+            showAnswer: false,
+            isCorrect: false,
+            form: {
+                type: '',
+                optionList: []
+            }
+        };
+    },
+    computed: {
+        title() {
+            return '详 情';
+        },
+        options() {
+            return this.form.optionList;
+        },
+        type() {
+            return this.form.type;
+        },
+        mapType() {
+            const obj = {};
+            const list = this.$ConstSelect.QuestionTypeList;
+            list.forEach(item => {
+                obj[item.value] = item.label;
+            });
+            return obj;
+        }
+    },
+    watch: {
+        questionId(val) {
+            this.showAnswer = false;
+            this.getQuestionInfo();
+        },
+        type(val) {
+            if (val == 'judge' || val == 'judge') {
+                this.active = 0;
+            } else if (val == 'multi' || val == 'fill') {
+                this.active = [];
+            } else {
+                this.active = '';
+            }
+        }
+    },
+    methods: {
+        checkType(option, type) {
+            return option.type == type;
+        },
+        appendIndex(str, index) {
+            return `${index + 1}. ${str}`;
+        },
+        doShow(node) {
+            // this.form = node.row || {};
+            this.show = true;
+        },
+        getQuestionInfo() {
+            if (!this.questionId) { return; }
+            getQuestionInfo(this.questionId, {random: false}).then(res => {
+                console.log(res, '---res===');
+                this.form = res.data;
+            }).catch(err => {
+                console.log(err, '---err=====');
+                this.form.optionList = [];
+            });
+        },
+        submit(val) {
+            console.log(this.active, this.questionId, this.form, '====');
+            let data = this.active;
+            if (!Array.isArray(data)) {
+                data = [data];
+            }
+            testAnswer(this.questionId, data).then(res => {
+                if (val) {
+                    this.showAnswer = true;
+                    this.isCorrect = res.data;
+                }
+                // this.doClose();
+            }).catch(err => {
+                console.log(err, '===err====');
+            });
+        },
+        doClose(done) {
+            this.show = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.option {
+		line-height: 22px;
+		padding-left: 20px;
+	}
+
+	.answer {
+		line-height: 32px;
+		color: #000;
+		padding-left: 15px;
+	}
+	.show-answer {
+		padding: 15px;
+		span {
+			font-size: 18px;
+		}
+		.correct {
+			color: green;
+		}
+		.error {
+			color: red;
+		}
+	}
+</style>
diff --git a/src/views/competitionManage/bankList/question-create-page.vue b/src/views/competitionManage/bankList/question-create-page.vue
index 2a4275618..2f7408aa3 100644
--- a/src/views/competitionManage/bankList/question-create-page.vue
+++ b/src/views/competitionManage/bankList/question-create-page.vue
@@ -2,7 +2,7 @@
   <div class="page">
     <div class="page__container">
       <el-card class="page__container-body">
-        <question-form ref="info" :option="formModel" :remove="true" @modify="doModify" @companyIdChange="companyIdChange" />
+        <question-form ref="info" :option="formModel" :remove="true" @modify="doModify" @companyIdChange="companyIdChange" @tagsChange="tagsChange" />
       </el-card>
       <div class="page__container-footer">
         <el-button type="primary" :is-create="true" @click="create">提 交</el-button>
@@ -31,10 +31,12 @@ export default {
                 id: '',
                 topic: '',
                 type: 'select',
-                answer: 0,
+                tags: '',
+                answer: '',
                 optionList: []
             },
-            companyId: null
+            companyId: null,
+            tagsArr: []
         };
     },
     computed: {
@@ -62,10 +64,23 @@ export default {
         companyIdChange(value) {
             this.companyId = value;
         },
+        tagsChange(list) {
+            this.tagsArr = list;
+        },
+        hasNullOption() { // 有空选项
+            const s = this.formModel.optionList.find(item => {
+                return item.content == '';
+            });
+            return s;
+        },
         create() {
             this.$refs.info.validate().then(valid => {
                 if (valid) {
-                    this.formModel.companyId = parseInt(this.companyId);
+                    if (this.hasNullOption()) {
+                        this.$message.warning('选项不能为空！');
+                        return;
+                    }
+                    // this.formModel.tags = this.tagsArr.join(',');
                     createQuestion(this.formModel).then(resp => {
                         authUtils.setSessionStorage(this.path, JSON.stringify({
                             type: this.formModel.type
diff --git a/src/views/competitionManage/bankList/question-form.vue b/src/views/competitionManage/bankList/question-form.vue
index 8b3cd803a..8606ce897 100644
--- a/src/views/competitionManage/bankList/question-form.vue
+++ b/src/views/competitionManage/bankList/question-form.vue
@@ -1,16 +1,22 @@
 <template>
   <div>
     <el-form ref="form" :model="option" :rules="rules" label-width="80px">
-      <el-form-item v-if="!$route.query.draft && !isProject" label="单 位" prop="companyId">
+      <!-- <el-form-item v-if="!$route.query.draft && !isProject" label="单 位" prop="companyId">
         <el-select v-model="companyId" placeholder="请选择单位" clearable @change="companyIdChange">
           <el-option v-for="it in companyList" :key="it.id" :label="it.name" :value="it.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="类 型" prop="type">
         <el-select v-model="option.type" :disabled="update" placeholder="请选择试题类型" @change="onTypeChnage">
           <el-option v-for="it in QuestionTypeList" :key="it.value" :label="it.label" :value="it.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="分 类">
+        <el-select v-model="option.tags" filterable allow-create default-first-option placeholder="请选择分类">
+          <!-- <el-select v-model="tagsArr" multiple filterable allow-create default-first-option placeholder="请选择分类" @change="tagsChange"> -->
+          <el-option v-for="item in labelList" :key="item" :label="item" :value="item" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="问 题" prop="topic">
         <item-rich v-model="option.topic" @modify="onModify({model: option, prop: 'topic'})" />
       </el-form-item>
@@ -32,6 +38,7 @@ import ItemOptions from './item-options';
 import ItemAnswer from './item-answer';
 import { getCompanyList } from '@/api/company';
 import { getSessionStorage } from '@/utils/auth';
+import { getLabelList } from '@/api/questionBank.js';
 
 export default {
     components: {
@@ -60,12 +67,15 @@ export default {
     data() {
         return {
             companyList: [],
-            companyId: null
+            companyId: null,
+            tagsArr: [],
+            labelList: []
         };
     },
     computed: {
         isSelect() {
-            return this.remove && this.option.type == 'select';
+            const selectArr = ['select', 'multi'];
+            return this.remove && selectArr.includes(this.option.type);
         },
         isProject() {
             const project = getSessionStorage('project');
@@ -111,7 +121,7 @@ export default {
             return this.option.optionList;
         },
         QuestionTypeList() {
-            return this.$ConstSelect.QuestionTypeList;
+            return this.$ConstSelect.QuestionTypeList.filter(item => { return !['fill', 'answer'].includes(item.value); });
         },
         rules() {
             return {
@@ -119,10 +129,10 @@ export default {
                     { required: true, message: '请输入试题内容', trigger: 'blur' }
                 ],
                 type: [
-                    { required: true, message: '请输入试题类型', trigger: 'change' }
+                    { required: true, message: '请输入试题类型', trigger: 'blur' }
                 ],
                 answer: [
-                    { required: true, message: '请选择正确答案', trigger: 'change' }
+                    { required: true, message: '请选择正确答案', trigger: 'blur' }
                 ]
             };
         }
@@ -133,6 +143,13 @@ export default {
             this.companyList = resp.data;
         });
     },
+    created() {
+        getLabelList().then(res => {
+            this.labelList = res.data || [];
+        }).catch(err => {
+            console.log(err);
+        });
+    },
     methods: {
         validate() {
             return new Promise((resolve, reject) => {
@@ -144,6 +161,9 @@ export default {
         companyIdChange(e) {
             this.$emit('companyIdChange', e);
         },
+        tagsChange(list) {
+            this.$emit('tagsChange', list);
+        },
         onTypeChnage(type) {
             if (this.templateMap[type] && !this.update) {
                 this.option.optionList = this.templateMap[type]();
@@ -171,6 +191,11 @@ export default {
                     this.option.optionList[0] = {content: answer, correct:true};
                 }
             }
+            if (Array.isArray(answer)) {
+                this.option.answer = answer.join(',');
+            } else {
+                this.option.answer = answer + '';
+            }
         },
         onModify(node) {
             this.$emit('modify', node);
diff --git a/src/views/competitionManage/bankList/question-update-page.vue b/src/views/competitionManage/bankList/question-update-page.vue
index 30b124fcf..d5e8df242 100644
--- a/src/views/competitionManage/bankList/question-update-page.vue
+++ b/src/views/competitionManage/bankList/question-update-page.vue
@@ -2,7 +2,7 @@
   <div class="page">
     <div class="page__container">
       <el-card class="page__container-body">
-        <question-form ref="info" :option="formModel" :remove="true" :update="true" @modify="doModify" @companyIdChange="companyIdChange" />
+        <question-form ref="info" :option="formModel" :remove="true" :update="true" @modify="doModify" @companyIdChange="companyIdChange" @tagsChange="tagsChange" />
       </el-card>
     </div>
     <div class="page__container-footer">
@@ -30,10 +30,12 @@ export default {
                 id: '',
                 topic: '',
                 type: 'select',
-                answer: 0,
+                tags: '',
+                answer: '',
                 optionList: []
             },
-            optionList: []
+            optionList: [],
+            tagsArr: []
         };
     },
     computed: {
@@ -55,11 +57,17 @@ export default {
                 setTimeout(() => {
                     this.formModel = deepAssign({}, this.$store.state.race.preTheoryData[this.questionId]);
                     this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
+                    const tagVal = this.formModel.tags ? this.formModel.tags.split(',') : '';
+                    this.$refs.info.tagsArr = tagVal;
+                    this.tagsArr = tagVal;
                 }, 500);
             } else {
                 getQuestionInfo(this.questionId).then(resp => {
                     this.formModel = resp.data;
                     this.formModel.answer = this.formModel.optionList.findIndex(ele => ele.correct);
+                    const tagVal = this.formModel.tags ? this.formModel.tags.split(',') : '';
+                    this.$refs.info.tagsArr = tagVal;
+                    this.tagsArr = tagVal;
                 });
             }
         },
@@ -69,16 +77,32 @@ export default {
         companyIdChange(value) {
             this.companyId = value;
         },
+        tagsChange(list) {
+            this.tagsArr = list;
+        },
         doModify(node) {
             this.$refs.rich.doShow(node);
         },
+        hasNullOption() { // 有空选项
+            const s = this.formModel.optionList.find(item => {
+                return item.content == '';
+            });
+            return s;
+        },
         update() {
             this.$refs.info.validate().then(valid => {
+                if (this.hasNullOption()) {
+                    this.$message.warning('选项不能为空！');
+                    return;
+                }
                 if (this.$route.query.draft && valid) {
                     this.$store.state.race.preTheoryData[this.questionId] = this.formModel;
                     this.doBack();
                 } else if (valid) {
-                    this.formModel.companyId = parseInt(this.companyId);
+                    // this.formModel.tags = this.tagsArr;
+                    // if (Array.isArray(this.tagsArr)) {
+                    //     this.formModel.tags = this.tagsArr.join(',');
+                    // }
                     updateOption(this.formModel).then(resp => {
                         this.doBack();
                     }).catch(error => {
diff --git a/src/views/components/pay/index.vue b/src/views/components/pay/index.vue
index fd884f856..0237b8e5f 100644
--- a/src/views/components/pay/index.vue
+++ b/src/views/components/pay/index.vue
@@ -124,6 +124,7 @@ export default {
         },
         // 完成跳转处理
         finish(data) {
+            console.log('finish');
             this.active = 0;
             const type = this.$route.query.permissionType;
             if (type === PermissionType.LESSON) {
diff --git a/src/views/demonstration/deomonList/index.vue b/src/views/demonstration/deomonList/index.vue
index 786e1b5ed..57a27d470 100644
--- a/src/views/demonstration/deomonList/index.vue
+++ b/src/views/demonstration/deomonList/index.vue
@@ -70,7 +70,7 @@ export default {
             try {
                 launchFullscreen();
                 const query = { lineCode: data.map.lineCode, mapId: data.map.id, group: data.group};
-                this.$router.push({path:'/jointTrainingNew', query:query});
+                this.$router.push({path:'/display/joint', query:query});
             } catch (e) {
                 console.error(e);
             } finally {
diff --git a/src/views/demonstration/deomonTopic/index.vue b/src/views/demonstration/deomonTopic/index.vue
deleted file mode 100644
index 05eb09278..000000000
--- a/src/views/demonstration/deomonTopic/index.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    :title="$t('global.synthesisTrainingTitle')"
-    :visible.sync="dialogShow"
-    width="600px"
-    class="inviteRoom"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-  >
-    <div class="inviteJoinRoom">{{ roomName }}{{ $t('global.inviteJoinRoom') }}</div>
-    <span slot="footer" class="dialog-footer">
-      <el-button v-loading="loading" type="primary" @click="handleJoin">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="dialogShow = false">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { launchFullscreen } from '@/utils/screen';
-// 仿真邀请消息
-export default {
-    name: 'DeomonList',
-    data() {
-        return {
-            dialogShow: false,
-            group: '',
-            roomName: '',
-            mapId: '',
-            lineCode: '',
-            loading: false
-        };
-    },
-    methods: {
-        doShow(data) {
-            this.roomName = data.creator.nickname;
-            this.group = data.group;
-            this.mapId = data.mapId || data.map.id;
-            this.lineCode = (data.map || {}).lineCode;
-            this.dialogShow = true;
-            this.loading = false;
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        async handleJoin() {
-            try {
-                this.loading = true;
-                launchFullscreen();
-                const query = { lineCode: this.lineCode, mapId: this.mapId, group: this.group};
-                this.$router.push({path: `/jointTrainingNew`, query: query});
-                this.dialogShow = false;
-            } catch (e) {
-                this.$messageBox(this.$t('tip.enterTrainingRoomFailed'));
-                console.error(e);
-            } finally {
-                this.loading = false;
-                this.dialogShow = false;
-            }
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-    .inviteRoom .inviteJoinRoom{height: 80px;line-height: 80px;font-size: 16px;padding-left: 10px;}
-    .inviteRoom .el-dialog__body {padding: 0px 30px;}
-</style>
diff --git a/src/views/demonstration/detail/index.vue b/src/views/demonstration/detail/index.vue
index 0760e5a83..181836943 100644
--- a/src/views/demonstration/detail/index.vue
+++ b/src/views/demonstration/detail/index.vue
@@ -88,11 +88,11 @@ export default {
     },
     watch: {
         '$route': function (val, oldval) {
-            this.loadInitData();
+            // this.loadInitData();
         }
     },
     async mounted() {
-        this.loadInitData();
+        // this.loadInitData();
     },
     methods: {
         async loadInitData() {
@@ -167,8 +167,8 @@ export default {
             const data = { mapId: this.courseModel.mapId, prdType: this.currentPrdType };
             createSimulationNew(data).then(resp => {
                 const query = { lineCode: this.courseModel.lineCode, group: resp.data, mapId: this.courseModel.mapId};
-                this.$store.dispatch('app/transitionAnimations');
-                this.$router.push({ path: `/jointTrainingNew`, query: query });
+				this.$store.dispatch('app/transitionAnimations');
+                this.$router.push({ path: `/display/joint`, query: query });
                 launchFullscreen();
             }).catch(error => {
                 if (error.code == 10003) {
@@ -243,7 +243,7 @@ export default {
                     if (this.currentPrdType === '02' && this.courseModel.lineCode === '14') {
                         this.$router.push({ path: `/displayBaSiDi/demon`, query: query });
                     } else {
-                        this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
+                        this.$router.push({ path: `${UrlConfig.display}/demon`, query: query });
                     }
                     // this.$router.push({ path: `${UrlConfig.displayNew}/demon`, query: query });
                     launchFullscreen();
diff --git a/src/views/designPlatform/demonMenu.vue b/src/views/designPlatform/demonMenu.vue
deleted file mode 100644
index 9d2b68c31..000000000
--- a/src/views/designPlatform/demonMenu.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <div>
-    <div class="display_top_draft">
-      <!--      <div class="btn_hover" @click="menuClick">菜单</div>-->
-      <el-button-group ref="button_group_box" class="button_group_box">
-        <el-button size="small" @click="showList">实训列表</el-button>
-      </el-button-group>
-      <!--      <el-radio-group v-model="demoMode" :disabled="trainingSwitch" class="mode" size="small" style="margin-left: 20px;" @change="changeMode">-->
-      <!--        <el-radio-button :label="TrainingMode.TEACH">{{ $t('display.lesson.teachingMode') }}</el-radio-button>-->
-      <!--        <el-radio-button :label="TrainingMode.PRACTICE">{{ $t('display.lesson.practiceMode') }}</el-radio-button>-->
-      <!--        <el-radio-button :label="TrainingMode.TEST">{{ $t('display.lesson.testMode') }}</el-radio-button>-->
-      <!--      </el-radio-group>-->
-      <!--      <span v-if="demoMode === TrainingMode.TEST" class="display-score">{{ $t('display.lesson.score') }}{{ trainingScore }}</span>-->
-    </div>
-    <TrainingList ref="trainingList" @editBlob="editBlob" />
-  </div>
-</template>
-<script>
-import TrainingList from './trainingList.vue';
-import { ScriptMode } from '@/scripts/ConstDic';
-export default {
-    name:'DemonMenu',
-    components:{
-        TrainingList
-    },
-    props:{
-    },
-    data() {
-        return {
-            hoverBtn: false,
-            btnWidth: -600,
-            demoMode: ScriptMode.TEACH,
-            TrainingMode: ScriptMode
-        };
-    },
-    computed:{
-        group() {
-            return this.$route.query.group;
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        lineCode() {
-            return this.$route.query.lineCode;
-        },
-        trainingSwitch() {
-            return this.$store.state.trainingNew.trainingSwitch;
-        },
-        trainingScore() {
-            return this.$store.state.trainingNew.trainingScore;
-        }
-    },
-    mounted() {
-        this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode);
-    },
-    methods:{
-        // menuClick() {
-        //     this.hoverBtn = !this.hoverBtn;
-        //     if (this.hoverBtn) {
-        //         this.btnWidth = 0; // 默认宽度
-        //     } else {
-        //         this.btnWidth = -600;
-        //     }
-        // },
-        changeMode(val) {
-            this.demoMode = val;
-            this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode);
-        },
-        showList() {
-            this.$refs.trainingList.doShow();
-        },
-        editBlob() {
-
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.display_top_draft{
-	position: absolute;
-	left: 5px;
-	top: 15px;
-	height: 32px;
-	overflow: hidden;
-	//padding-left: 44px;
-	z-index: 35;
-	.btn_hover{
-		position: absolute;
-		left: 0;
-		top: 0;
-		z-index: 2;
-		color: #4e4d4d;
-		font-size: 14px;
-		background: #fff;
-		padding: 8px;
-		border-radius: 5px;
-		display: block;
-		cursor: pointer;
-		float: left;
-		height: 32px;
-	}
-	.button_group_box{
-		float: left;
-		transition: all 0.5s;
-		overflow: hidden;
-	}
-}
-.teach_mode {
-	position: absolute;
-	left: 5px;
-	top: 55px;
-	height: 32px;
-	overflow: hidden;
-	z-index: 35;
-}
-.display-score {
-	background-color: black;
-	display: -moz-inline-box;
-	display: inline-block;
-	text-align: left;
-	border: 1px solid lightskyblue;
-	width: 100px;
-	height: 32px;
-	line-height: 24px;
-	border-radius: 4px;
-	padding-left: 2px;
-	margin-left: 10px;
-	font-family: "Microsoft" !important;
-	font-size: 18px !important;
-	color: #fff;
-}
-</style>
diff --git a/src/views/designPlatform/trainingDesign.vue b/src/views/designPlatform/trainingDesign.vue
deleted file mode 100644
index 697e0505e..000000000
--- a/src/views/designPlatform/trainingDesign.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div class="train">
-    <menu-demon ref="menuDemon" />
-    <training-jlmap refs="trainingJlmap" />
-    <training-tip ref="trainingTip" />
-    <training-position-tip ref="trainingPositionTip" />
-    <training-menu v-if="trainingDetail" ref="trainingMenu" :offset-bottom="offsetBottom" />
-    <div class="trainBack">
-      <el-button-group>
-        <el-button v-if="record" v-loading="loading" type="danger" :disabled="loading" size="small" @click="init">初始化</el-button>
-        <el-button v-if="!isPause && record" size="small" type="primary" @click="pauseScript">暂停</el-button>
-        <el-button v-if="isPause && record" size="small" type="primary" @click="executePlayScript">恢复</el-button>
-        <el-button type="primary" size="small" @click="back">返回</el-button>
-      </el-button-group>
-    </div>
-  </div>
-</template>
-<script>
-import { clearSimulation, executeScriptNew, simulationPause, exitRunPlan } from '@/api/simulation';
-import { endTrainingStep } from '@/api/jmap/training';
-import TrainingJlmap from './trainingJlmap';
-import MenuDemon from '@/views/trainingManage/demonMenu.vue';
-import TrainingTip from './trainingTip';
-import TrainingPositionTip from './trainingPositionTip';
-import TrainingMenu from './trainingMenu';
-
-export default {
-    name: 'TrainingDesign',
-    components: {
-        MenuDemon,
-        TrainingTip,
-        TrainingJlmap,
-        TrainingPositionTip,
-        TrainingMenu
-    },
-    data() {
-        return {
-            loading: false,
-            offsetBottom: 50
-        };
-    },
-    computed: {
-        record() { // 编制
-            return this.$route.query.record;
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        teachMode() {
-            return 'TEACHING_MODE';
-        },
-        trainingSwitch() {
-            return this.$store.state.trainingNew.trainingSwitch;
-        },
-        trainingDetail() {
-            return this.$store.state.trainingNew.trainingDetail;
-        },
-        isPause() {
-            return this.$store.state.trainingNew.simulationPause;
-        }
-    },
-    watch: {
-        '$store.state.trainingNew.stepOverCount': function(val) {
-            this.nextStep();
-        }
-    },
-    beforeDestroy() {
-        this.$store.dispatch('socket/clearTrainingOverCount');
-        this.$store.dispatch('trainingNew/clearStepOverCount');
-        this.$store.dispatch('trainingNew/setTrainingDetail', null);
-        this.$store.dispatch('trainingNew/trainingEnd');
-        this.$store.dispatch('trainingNew/clearStepOrder');
-        this.$store.dispatch('trainingNew/clearOperateOrder');
-        this.$store.dispatch('trainingNew/changeTeachMode', '');
-        this.$store.dispatch('trainingNew/setSimulationPause', false);
-    },
-    mounted() {
-        this.handleOffsetBottom();
-    },
-    methods: {
-        handleOffsetBottom() {
-            setTimeout(() => {
-                const menuBottom = document.getElementById('menuButtons_box');
-                const buttonWidth = this.width - 1200;
-                const tipInfoBox = document.getElementById('tipInfoBox');
-                if (menuBottom && buttonWidth < 780) {
-                    this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
-                }
-                if (tipInfoBox) {
-                    this.offsetBottom += tipInfoBox.offsetHeight;
-                }
-            }, 500);
-        },
-        init() {
-            this.loading = true;
-            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);
-                        this.$store.dispatch('map/initSimulationButton');
-                    });
-                });
-                setTimeout(() => {
-                    this.loading = false;
-                }, 1500);
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox(this.$t('display.demon.endSimulationFail'));
-            });
-        },
-        pauseScript() {
-            simulationPause(this.group).then(resp => {
-                this.$store.dispatch('trainingNew/setSimulationPause', true);
-            }).catch(() => {
-                this.$messageBox(this.$t('scriptRecord.pauseFail'));
-            });
-        },
-        executePlayScript() {
-            executeScriptNew(this.group).then(resp => {
-                this.$store.dispatch('trainingNew/setSimulationPause', false);
-            }).catch(() => {
-                this.$messageBox(this.$t('scriptRecord.recoverFail'));
-            });
-        },
-        async back() {
-            if (this.$route.query.group) {
-                await clearSimulation(this.$route.query.group);
-            }
-        },
-        nextStep() {
-            const stepList = JSON.parse(this.$store.state.trainingNew.trainingDetail.stepJson);
-            const index = this.$store.state.trainingNew.stepOrder - 1 >= 0 ? this.$store.state.trainingNew.stepOrder - 1 : 0;
-            const step = stepList[index];
-            endTrainingStep(this.group, step.id).then(resp => {
-            }).catch(() => {
-                this.$message.error('进入下一步实训失败！');
-            });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .train {
-        width: 100%;
-		overflow: hidden;
-        position: relative;
-    }
-	.trainMask{
-        opacity: 1;
-        background: #000;
-        position: absolute;
-        right: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 9;
-    }
-	.trainBack {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-		z-index: 19;
-    }
-
-</style>
diff --git a/src/views/designPlatform/trainingJlmap.vue b/src/views/designPlatform/trainingJlmap.vue
deleted file mode 100644
index 2bc8ad917..000000000
--- a/src/views/designPlatform/trainingJlmap.vue
+++ /dev/null
@@ -1,704 +0,0 @@
-<template>
-  <div class="train">
-    <div v-show="maskOpen || prdType == '02'" class="trainMask" />
-    <component :is="menus" v-show="prdType !== '02'" :selected="selected" />
-    <jlmap-visual ref="jlmapVisual" @onSelect="clickEvent" @onMenu="onContextmenu" />
-    <voice-chat-box v-if="lineCode == '16'" ref="chatbox" :group="group" :user-role="userRole" />
-    <chat-box v-else ref="chatbox" :group="group" :user-role="userRole" />
-    <div v-if="lineCode === '16'" v-show="prdType === '02'" style="position:absolute;width: 100%;top:0;left:0;z-index:10">
-      <dispatcher-station ref="dispatcherStation" />
-    </div>
-    <div class="fault-button">
-      <el-button-group>
-        <el-button v-if="lineCode === '16' && project !== 'teaching' && prdType === '01' " :id="goCTCDom.domId" size="small" @click="goCtc">车务终端</el-button>
-        <el-button v-if="lineCode === '16' && project !== 'teaching' && prdType === '01'" :id="goRpManageDom.domId" size="small" @click="goRpManage">车务管理终端</el-button>
-        <el-button v-if="lineCode ==='16' && prdType === '01'" :id="trainTicketDom.domId" size="small" @click="showTrainTicket">路票</el-button>
-        <el-button v-if="showRegisterBookBtn" :id="registerBookDom.domId" size="small" @click="showRegisterBook">簿册</el-button>
-      </el-button-group>
-      <el-button :id="faultModeDom.domId" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
-    </div>
-    <train-ticket ref="trainTicket" />
-    <register-book ref="registerBook" />
-  </div>
-</template>
-<script>
-import JlmapVisual from '@/views/newMap/jlmapNew/index';
-import {loadMapDataById } from '@/utils/loaddata';
-import { clearSimulation } from '@/api/simulation';
-import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
-import { getToken, getSessionStorage } from '@/utils/auth';
-import chatBox from '@/views/newMap/chatView/chatBox.vue';
-import VoiceChatBox from '@/views/newMap/chatView/voiceChatBox.vue';
-import { getDeviceMenuByDeviceType, MouseEvent } from '@/scripts/ConstDic';
-import deviceType from '@/jmapNew/constant/deviceType.js';
-import { EventBus } from '@/scripts/event-bus';
-import { getSimulationMemberList, getAllSimulationUser } from '@/api/simulation';
-import { getMemberListCommon, getUserListCommon } from '@/api/rtSimulation';
-import Vue from 'vue';
-import {mapGetters} from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import TrainTicket from '@/views/newMap/trainTicket/index.vue';
-import RegisterBook from '@/views/newMap/registerBook/index';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import DispatcherStation from '@/views/newMap/jointTrainingNew/dispatcherStation.vue';
-
-export default {
-    name: 'TrainingDesign',
-    components: {
-        JlmapVisual,
-        chatBox,
-        VoiceChatBox,
-        TrainTicket,
-        RegisterBook,
-        DispatcherStation
-    },
-    data() {
-        return {
-            selected: null,
-            menus: null,
-            maskOpen: false,
-            centralizedstationList: [],
-            centralizedStationMap: {},
-            userRole: '',
-            deviceCode: ''
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'map',
-            'bigScreenConfig',
-            'stationList',
-            'sectionList',
-            'signalList',
-            'trainList',
-            'trainWindowList'
-        ]),
-        goCTCDom() {
-            return OperationEvent.TrainingDesign.menuButton.goCtc;
-        },
-        goRpManageDom() {
-            return OperationEvent.TrainingDesign.menuButton.goRpManage;
-        },
-        trainTicketDom() {
-            return OperationEvent.TrainingDesign.menuButton.trainTicket;
-        },
-        registerBookDom() {
-            return OperationEvent.TrainingDesign.menuButton.registerBook;
-        },
-        faultModeDom() {
-            return OperationEvent.TrainingDesign.menuButton.faultMode;
-        },
-        prdType() {
-            return this.$store.state.training.prdType;
-        },
-        lineCode() {
-            return this.$route.query.lineCode;
-        },
-        showRegisterBookBtn() {
-            const roleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_SIGNALER', 'STATION_SWITCH_MAN', 'STATION_MASTER', 'STATION_WORKER', 'DEVICE_MANAGER'];
-            return this.$route.query.lineCode === '16' && roleList.includes(this.$store.state.training.userRole);
-        },
-        faultMode() {
-            return this.$store.state.training.operatemode === OperateMode.FAULT;
-        },
-        project() {
-            return getSessionStorage('project');
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        userId() {
-            return this.$store.state.user.id;
-        }
-    },
-    watch: {
-        $route() {
-            this.$nextTick(() => {
-                this.initLoadData();
-            });
-        },
-        '$store.state.socket.trainingReloadCount': function () {
-            if (this.$store.state.trainingNew.trainingDetail && this.$store.state.trainingNew.trainingDetail.type === 'SCENE') {
-                this.initMemberUserInfo();
-            }
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.setWindowSize();
-        },
-        '$store.state.map.mapViewLoadedCount':function() {
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            if (this.$route.query.group && !this.$route.path.includes('displayIscs')) {
-                this.subscribe();
-            }
-        },
-        '$store.state.socket.equipmentStatus': function (val) {
-            if (val.length && this.$route.query.group) {
-                this.statusMessage(val);
-            }
-        },
-        '$store.state.socket.simulationOver':function(val) {
-            this.back();
-        },
-        '$store.state.map.mapDataLoadedCount': function () {
-            const lineCode = this.$jlmap.lineCode;
-            if (lineCode) {
-                this.menus = this.$theme.loadMenuComponent(lineCode);
-                this.$store.commit('training/notifyGetCommandDefinition', lineCode);
-            }
-            this.initMemberUserInfo();
-        },
-        '$store.state.map.map': function (map) {
-            if (map) {
-                this.setCentralizedstationList(map); // 获取集中站列表
-            }
-        },
-        '$store.state.socket.simulationRoleList':function(list) {
-            if (list && list.length) { // 人员变化监控
-                this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: list, userId: this.userId });
-                this.checkRoleChange(list);
-            }
-        },
-        '$store.state.socket.memberChangeCount': function () { // 仿真成员变更
-            this.initMemberUserInfo();
-        }
-    },
-    async beforeDestroy() {
-        await this.$store.dispatch('map/mapClear');
-        this.$store.dispatch('training/setPrdType', '');
-    },
-    mounted() {
-        this.$store.dispatch('training/setPrdType', '01');
-        this.setWindowSize();
-        this.initLoadData();
-    },
-    methods: {
-        changeOperateMode() {
-            let mode = OperateMode.FAULT;
-            if (this.faultMode) {
-                mode = OperateMode.NORMAL;
-            }
-            this.$store.dispatch('training/changeOperateMode', { mode: mode });
-            const operate = {
-                operation: this.faultModeDom.operation,
-                param: { mode: mode },
-                userOperationType: 'leftClick'
-            };
-            this.$store.dispatch('training/nextNew', operate);
-        },
-        goCtc() {
-            const operate = {
-                operation: this.goCTCDom.operation,
-                userOperationType: 'leftClick'
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const routeData = this.$router.resolve({
-                        path:'/displayNew/demon',
-                        query:{
-                            lineCode:this.$route.query.lineCode,
-                            group: this.$route.query.group,
-                            prdType: '01',
-                            mapId:this.$route.query.mapId,
-                            project: this.project,
-                            newApi: false,
-                            ctc: true,
-                            try: this.$route.query.try || 0,
-                            token: getToken(),
-                            noPreLogout: true
-                        }
-                    });
-                    window.open(routeData.href, '_blank');
-                }
-            });
-        },
-        goRpManage() {
-            const operate = {
-                operation: this.goRpManageDom.operation,
-                userOperationType: 'leftClick'
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const routeData = this.$router.resolve({
-                        path:'/bigTrainRunplanManage',
-                        query:{
-                            group: this.$route.query.group,
-                            mapId:this.$route.query.mapId,
-                            project: this.project,
-                            prdType: this.prdType,
-                            lineCode:this.$route.query.lineCode,
-                            // stationCode:this.$store.state.training.roleDeviceCode,
-                            // token:getToken(),
-                            noPreLogout: true
-                        }
-                    });
-                    window.open(routeData.href, '_blank');
-                }
-            });
-        },
-        showTrainTicket() {
-            const operate = {
-                operation: this.trainTicketDom.operation,
-                userOperationType: 'leftClick'
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    const stationSupervisorList = [];
-                    for (const memberId in this.$store.state.training.memberData) {
-                        const item = this.$store.state.training.memberData[memberId];
-                        if (item.type === 'STATION_SUPERVISOR') {
-                            const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
-                            const memberData = { labelName: '值班员-' + device.name + (item.name ? `-${item.name }` : ''), id:item.id, userId:item.userId };
-                            stationSupervisorList.push(memberData);
-                        }
-                    }
-                    EventBus.$emit('trainTicketMember', stationSupervisorList);
-                    this.$refs.trainTicket.doShow();
-                }
-            });
-        },
-        showRegisterBook() {
-            const operate = {
-                operation: this.registerBookDom.operation,
-                userOperationType: 'leftClick'
-            };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$refs.registerBook.doShow();
-                }
-            });
-        },
-        // 获取设备数据
-        getDeviceByEm(em) {
-            var device = this.$store.getters['map/getDeviceByCode'](em.deviceCode) || null;
-            if (device) {
-                device._viewVal = em.val;
-            }
-            return device;
-        },
-        // 根据皮肤类型转换激活的菜单类型
-        getSelectedByLineCode(device) {
-            const switchSectionIsWitchLineCodeList = ['03'];
-            const lineCode = this.$store.getters['map/lineCode'];
-            if (switchSectionIsWitchLineCodeList.includes(lineCode) && device._type == deviceType.Section) {
-                const section = this.$store.getters['map/getDeviceByCode'](device._code);
-                if (section) {
-                    device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode);
-                }
-            }
-            // 过滤道岔相关区段变成道岔model
-            if (device._type == 'Section' && device.type == '03') {
-                device = this.$store.getters['map/getDeviceByCode'](device.switch.code);
-            }
-
-            return device;
-        },
-        clickEvent(em) {
-            this.$store.dispatch('map/setTrainWindowShow', false);
-            var device = { _type: em.deviceType, _code: em.deviceCode, _event: MouseEvent.Left };
-
-            const lineCode = this.$store.getters['map/lineCode'];
-            if (em.deviceType === 'StationStand' && lineCode === '01') {
-                const menu = getDeviceMenuByDeviceType(device._type) || [];
-                this.$store.dispatch('menuOperation/setPopMenu', { position: { x: em.clientX, y: em.clientY }, menu: menu });
-            }
-
-            if (em.deviceCode) {
-                device = this.getDeviceByEm(em);
-            }
-            this.selected = { ...device, _event: MouseEvent.Left };
-            this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
-            this.$store.dispatch('menuOperation/setLeftClickCount');
-            if (this.$route.query.lineCode == '07') {
-                this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType});
-            }
-            this.$store.dispatch('training/emitTipFresh');
-            if (this.$store.state.map.selectDevice && this.$store.state.map.selectDevice.flag && device._type) {
-                if (device._type.toUpperCase() == this.$store.state.map.selectDevice.type.toUpperCase()) {
-                    EventBus.$emit('selectDevice', device);
-                } else {
-                    const name = this.typeObj[this.$store.state.map.selectDevice.type];
-                    const info = '选择的设备类型不正确' + (name ? `，请选择${name}类型` : '');
-                    this.$message.info(info);
-                }
-            }
-
-        },
-        onContextmenu(em) {
-            var menu = null;
-            var device = null;
-            const point = { x: em.clientX, y: em.clientY };
-            const lineCode = this.$store.getters['map/lineCode'];
-            if (em.subType === 'TrainWindow') {
-                if (lineCode != '06') {
-                    device = { _type: deviceType.TrainWindow, code: em.deviceCode, _event: MouseEvent.Right };
-                    this.$store.dispatch('map/setTrainWindowShow', true);
-                }
-            } else if (em.subType == 'button' && em.deviceType == 'Station') { // 宁波一号线右键显示控制模式
-                const equipment = this.getDeviceByEm(em);
-                this.$store.dispatch('menuOperation/setSelected', {device:equipment, subType: em.subType});
-                menu = getDeviceMenuByDeviceType('StationControl');
-                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-                this.$store.dispatch('training/emitTipFresh');
-                device = this.getDeviceByEm(em);
-                this.selected = { ...device, _event: MouseEvent.Right};
-                return;
-            } else if (em.subType == 'light' && em.deviceType == 'Station') { // 宁波一号线右键显示强制点灯
-                const equipment = this.getDeviceByEm(em);
-                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
-                menu = getDeviceMenuByDeviceType('StationLight');
-                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-                this.$store.dispatch('training/emitTipFresh');
-                device = this.getDeviceByEm(em);
-                this.selected = { ...device, _event: MouseEvent.Right};
-                return;
-            } else if (em.subType == 'preReset' && em.deviceType == 'Station') { // 宁波一号线右键显示计轴复位
-                const equipment = this.getDeviceByEm(em);
-                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
-                menu = getDeviceMenuByDeviceType('StationPreReset');
-                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-                this.$store.dispatch('training/emitTipFresh');
-                device = this.getDeviceByEm(em);
-                this.selected = { ...device, _event: MouseEvent.Right};
-                return;
-            } else if (em.subType == 'enabled' && em.deviceType == 'Switch') {
-                menu = getDeviceMenuByDeviceType('Enabled');
-                const equipment = this.getDeviceByEm(em);
-                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
-                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-                device = this.getDeviceByEm(em);
-                this.selected = { ...device, _event: MouseEvent.Right};
-                return;
-            } else if (em.subType === 'enabled' && em.deviceType === 'Signal') {
-                menu = getDeviceMenuByDeviceType('Enabled');
-                const equipment = this.getDeviceByEm(em);
-                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
-                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu});
-                device = this.getDeviceByEm(em);
-                this.selected = { ...device, _event: MouseEvent.Right};
-                return;
-            } else if (em.deviceCode && !this.isScreen) {
-                device = this.getDeviceByEm(em);
-            }
-            if (device) {
-                device = this.getSelectedByLineCode(device);
-                this.selected = { ...device, _event: MouseEvent.Right};
-                if (!this.buttonOperation) {
-                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
-                    if (!this.checkShouldPop(device)) {
-                        this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: null });
-                    } else {
-                        if (em.deviceType === 'StationStand' && lineCode === '01') {
-                            return;
-                        }
-                        menu = getDeviceMenuByDeviceType(device._type);
-                        this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-                    }
-                } else if (this.$route.query.ctc) {
-                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
-                    menu = getDeviceMenuByDeviceType(device._type);
-                    this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-                }
-            } else {
-                menu = getDeviceMenuByDeviceType('Cancel');
-                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
-            }
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        checkShouldPop(device) {
-            const lineCode = this.$store.getters['map/lineCode'];
-            if (device) {
-                if (device._type === 'Signal') {
-                    return device._viewVal === '3';
-                } else if (device._type === 'StationControl' && lineCode == '01') { // 中控模式显示范围
-                    return device._viewVal === '1';
-                } else {
-                    return true;
-                }
-            }
-        },
-        initLoadData() { // 加载地图数据
-            if (this.$route.query.group) {
-                loadMapDataById(this.mapId, 'simulation');
-            } else {
-                this.endViewLoading();
-            }
-        },
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        async statusMessage(list) {
-            await this.$store.dispatch('training/updateMapState', list);
-            await this.$store.dispatch('socket/setEquipmentStatus');
-        },
-        setWindowSize() {
-            const width = this.width;
-            const height = this.height;
-            this.$store.dispatch('config/resize', { width, height });
-        },
-        async back() {
-            if (this.$route.query.group) {
-                await clearSimulation(this.$route.query.group);
-                this.clearSubscribe();
-            }
-            this.$store.dispatch('training/over').then(() => {
-                history.go(-1);
-            });
-        },
-        subscribe() {
-            // this.clearSubscribe();
-            const topic = `${displayTopic}\/${this.$route.query.group}`;
-            const subscription = this.$stomp.subscribeMap.get(topic);
-            if (!subscription || !subscription.sub) {
-                const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-                creatSubscribe(topic, header);
-            }
-
-        },
-        clearSubscribe() {
-            clearSubscribe(`${displayTopic}\/${this.$route.query.group}`);
-        },
-        setCentralizedstationList(map) {
-            this.centralizedstationList = [];
-            (map.stationList || []).forEach(item => {
-                if (item.centralized) {
-                    this.centralizedstationList.push({value: item.code, name: item.name});
-                    this.centralizedStationMap[item.code] = item.code;
-                    item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
-                        this.centralizedStationMap[ele] = item.code;
-                    });
-                }
-            });
-        },
-        checkRoleChange(data) {
-            data.forEach(item => {
-                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId) {
-                    this.userRole = item.type || 'AUDIENCE';
-                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
-                    this.$store.dispatch('training/setUserRole', this.userRole);
-                    this.deviceCode = item.deviceCode;
-                    this.setSimulationPrdType(this.centralizedStationMap[item.deviceCode]);
-                }
-            });
-        }, // 设置prdType和role
-        setSimulationPrdType(deviceCode) {
-            // Dispatcher 行调 STATION_SUPERVISOR 车站 Audience 观众 Driver 司机 MAINTAINER 通号
-            let tempData;
-            let dataZoom;
-            switch (this.userRole) {
-            case 'DISPATCHER':
-                this.$store.dispatch('training/setPrdType', '02');
-                this.$store.dispatch('training/setRoles', 'DISPATCHER');
-                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                this.setShowStation('');
-                break;
-            case 'STATION_SUPERVISOR':
-                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-                this.$store.dispatch('training/setPrdType', '01');
-                this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
-                this.stationRoleShow(deviceCode);
-                break;
-            case 'STATION_ASSISTANT':
-                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-                this.$store.dispatch('training/setPrdType', '01');
-                this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT');
-                this.stationRoleShow(deviceCode);
-                break;
-            case 'STATION_SIGNALER': // 车站信号员
-                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-                this.$store.dispatch('training/setPrdType', '01');
-                this.$store.dispatch('training/setRoles', 'STATION_SIGNALER');
-                this.stationRoleShow(deviceCode);
-                break;
-            case 'STATION_SWITCH_MAN': // 车站扳道员
-                if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-                this.$store.dispatch('training/setPrdType', '01');
-                this.$store.dispatch('training/setRoles', 'STATION_SWITCH_MAN');
-                this.stationRoleShow(deviceCode);
-                break;
-            case 'DEPOT_DISPATCHER':
-                this.$store.dispatch('training/setPrdType', '09');
-                this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
-                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                if (this.mapViewLoadedOver) {
-                    const showStation = this.centralizedStationMap[deviceCode];
-                    const list = [];
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    for (const key in mapDevice) {
-                        list.push(mapDevice[key]);
-                    }
-                    this.$jlmap.updateShowStation(list, showStation);
-                }
-                tempData = this.$store.state.map.map.displayList.find(item => { return item.stationCodeList.includes(deviceCode); });
-                dataZoom = { offsetX: tempData.offsetX, offsetY: tempData.offsetY, scaleRate: tempData.scaleRate };
-                this.$store.commit('map/setDataZoom', dataZoom);
-                this.$jlmap.setDepot(dataZoom);
-                break;
-            case 'DRIVER':
-                this.$store.dispatch('training/setPrdType', '04');
-                this.$store.dispatch('training/setRoles', 'DRIVER');
-                this.setShowStation('');
-                break;
-            case 'MAINTAINER':
-                this.$store.dispatch('training/setPrdType', '');
-                this.$store.dispatch('training/setRoles', 'MAINTAINER');
-                this.setShowStation('');
-                break;
-            case 'RAIL_CTC':
-                this.$store.dispatch('training/setPrdType', '10');
-                this.$store.dispatch('training/setRoles', 'RAIL_CTC');
-                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                this.setShowStation(deviceCode);
-                break;
-            default:
-                this.$store.dispatch('training/setPrdType', '');
-                this.$store.dispatch('training/setRoles', 'AUDIENCE');
-                this.setShowStation('');
-            }
-            if (this.$route.query.type === 'ILW') {
-                this.$store.dispatch('training/setPrdType', '');
-                this.$store.dispatch('training/setRoles', 'AUDIENCE');
-            }
-        },
-        stationRoleShow(deviceCode) {
-            if (this.lineCode === '14') {
-                const list = [];
-                const mapDevice = this.$store.state.map.mapDevice;
-                this.$jlmap.setMap(this.$store.state.map.map, this.$store.state.map.mapDevice, {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData});
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
-                }
-                this.$jlmap.updateShowMode(list, '02');
-            }
-            if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation');
-                if (picture) {
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    const list = [];
-                    const deviceList = [];
-                    for (const key in mapDevice) {
-                        list.push(mapDevice[key]);
-                        deviceList.push(key);
-                    }
-                    this.$jlmap.updateShowStation(list, '');
-                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
-                    this.$jlmap.updatePicture(deviceList);
-                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
-                    this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[deviceCode]);
-                } else {
-                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                    this.setShowStation(deviceCode);
-                }
-            } else {
-                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
-                this.setShowStation(deviceCode);
-            }
-        },
-        setShowStation(stationCode) {
-            const showStation = this.centralizedStationMap[stationCode];
-            const list = [];
-            const mapDevice = this.$store.state.map.mapDevice;
-            for (const key in mapDevice) {
-                list.push(mapDevice[key]);
-            }
-            this.$jlmap.updateShowStation(list, showStation);
-            this.$jlmap.setCenter(showStation);
-        },
-        async getTrainDetail() {
-            try {
-                await loadMapDataById(this.mapId, 'Group');
-                await this.$store.dispatch('training/setMapDefaultState');
-            } catch (error) {
-                this.$messageBox(this.$t('error.getMapDataFailed'));
-                this.endViewLoading();
-            }
-        },
-        initMemberUserInfo() {
-            if (this.$route.query.newApi + '' === 'true') {
-                getMemberListCommon(this.group).then(resp => {
-                    this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.userId });
-                    const member = resp.data.find(elem => elem.userId == this.userId);
-                    if (member) {
-                        this.userRole = member.type || 'AUDIENCE';
-                        this.$store.dispatch('training/setRoleDeviceCode', member.deviceCode);
-                        this.$store.dispatch('training/setUserRole', this.userRole);
-                        this.deviceCode = member.deviceCode;
-                        this.setSimulationPrdType(this.centralizedStationMap[member.deviceCode]);
-                    }
-                    getUserListCommon(this.group).then(res => {
-                        this.$store.dispatch('training/setSimulationUserList', res.data);
-                    }).catch(() => {
-                        this.$messageBox('获取所有仿真用户失败！');
-                    });
-                }).catch(() => {
-                    this.$messageBox('获取仿真成员列表失败！');
-                });
-            } else {
-                // 获取仿真成员列表
-                getSimulationMemberList(this.group).then(resp => {
-                    this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.userId });
-                    const member = resp.data.find(elem => elem.userId == this.userId);
-                    if (member) {
-                        this.userRole = member.type || 'AUDIENCE';
-                        this.$store.dispatch('training/setRoleDeviceCode', member.deviceCode);
-                        this.$store.dispatch('training/setUserRole', this.userRole);
-                        this.deviceCode = member.deviceCode;
-                        this.setSimulationPrdType(this.centralizedStationMap[member.deviceCode]);
-                    }
-                    getAllSimulationUser(this.group).then(res => {
-                        this.$store.dispatch('training/setSimulationUserList', res.data);
-                    }).catch(() => {
-                        this.$messageBox('获取所有仿真用户失败！');
-                    });
-                }).catch(() => {
-                    this.$messageBox('获取仿真成员列表失败！');
-                });
-            }
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.train {
-	width: 100%;
-	overflow: hidden;
-	position: relative;
-}
-.trainMask{
-	opacity: 1;
-	background: #000;
-	position: absolute;
-	right: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 9;
-}
-.trainBack {
-	position: absolute;
-	float: right;
-	right: 15px;
-	bottom: 15px;
-	z-index: 19;
-}
-.fault-button{
-	position: absolute;
-	top: 15px;
-	right: 10px;
-}
-</style>
diff --git a/src/views/designPlatform/trainingList.vue b/src/views/designPlatform/trainingList.vue
deleted file mode 100644
index 250e38ba4..000000000
--- a/src/views/designPlatform/trainingList.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag title="实训" :visible.sync="dialogVisible" width="1000px" :before-close="doClose" center>
-    <div>
-      <el-card class="box-card">
-        <div style="margin-bottom: 10px;font-size: 16px;">{{ `当前实训名称：${training.name || ''}` }}</div>
-        <div style="font-size: 16px;">{{ `当前实训描述：${training.description || ''}` }}</div>
-      </el-card>
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="单操实训" name="first">
-          <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-        </el-tab-pane>
-        <el-tab-pane label="场景实训" name="second">
-          <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryListScene" />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getPublishSingleList, getPublishTrainingDetail, loadPublishTraining, getPublishScenesList } from '@/api/jmap/training';
-import Cookies from 'js-cookie';
-import ConstConfig from '@/scripts/ConstConfig';
-
-export default {
-    name: 'TrainingList',
-    components:{
-    },
-    props: {},
-    data() {
-        return {
-            dialogVisible: false,
-            activeName: 'first',
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            training: {},
-            queryForm: {
-                labelWidth: '100px',
-                reset: true,
-                show:false
-            },
-            prdTypeMap: {
-                DISPATCHER: '02',
-                STATION_SUPERVISOR: '01',
-                STATION_ASSISTANT: '01',
-                DEPOT_DISPATCHER: '09',
-                DRIVER: '04',
-                RAIL_CTC: '10'
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                paginationHiden: true,
-                indexShow: true,
-                height: 500,
-                columns: [
-                    {
-                        title: this.$t('trainingManage.name'),
-                        prop: 'name'
-                    },
-                    {
-                        title: this.$t('trainingManage.description'),
-                        prop: 'description'
-                    },
-                    {
-                        title: this.$t('trainingManage.type'),
-                        prop: 'type',
-                        type: 'tag',
-                        columnValue: (row) => { return this.covertData(row); },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: this.$t('trainingManage.labelJson'),
-                        prop: 'labelJson'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('trainingManage.operate'),
-                        width: '150',
-                        buttons: [
-                            {
-                                name: '加载',
-                                handleClick: this.loadScript,
-                                type: 'primary',
-                                showControl:(row) => { return row.id; }
-                            }
-                        ]
-                    }
-                ]
-            },
-            queryListScene: {
-                query: this.queryFunctionScene,
-                selectCheckShow: false,
-                paginationHiden: true,
-                indexShow: true,
-                height: 500,
-                columns: [
-                    {
-                        title: this.$t('trainingManage.name'),
-                        prop: 'name'
-                    },
-                    {
-                        title: this.$t('trainingManage.description'),
-                        prop: 'description'
-                    },
-                    {
-                        title: this.$t('trainingManage.type'),
-                        prop: 'type',
-                        type: 'tag',
-                        columnValue: (row) => { return this.covertData(row); },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: this.$t('trainingManage.labelJson'),
-                        prop: 'labelJson'
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('trainingManage.operate'),
-                        width: '150',
-                        buttons: [
-                            {
-                                name: '加载',
-                                handleClick: this.loadScript,
-                                type: 'primary',
-                                showControl:(row) => { return row.id; }
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-        group() {
-            return this.$route.query.group;
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        teachMode() {
-            return this.$store.state.trainingNew.teachMode;
-        },
-        trainingSwitch() {
-            return this.$store.state.trainingNew.trainingSwitch;
-        }
-    },
-    methods: {
-        queryFunction() {
-            return getPublishSingleList(this.mapId);
-        },
-        queryFunctionScene() {
-            return getPublishScenesList(this.mapId);
-        },
-        doShow() {
-            this.getListData();
-            this.dialogVisible = true;
-        },
-        doClose() {
-            this.dialogVisible = false;
-        },
-        async loadScript(index, data) {
-            if (this.trainingSwitch) {
-                this.$message.error('请先结束当前实训后再加载新的实训！');
-                return;
-            }
-            try {
-                const detailResp = await getPublishTrainingDetail(data.id);
-                this.training = detailResp.data;
-                if (detailResp.data.mapLocationJson) {
-                    const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
-                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
-                }
-                if (detailResp.data.playerIdJson) {
-                    const playerId = JSON.parse(detailResp.data.playerIdJson)[0];
-                    if (playerId) {
-                        const member = this.$store.state.training.memberData[playerId];
-                        this.$store.dispatch('training/setPrdType', this.prdTypeMap[member.type]);
-                        this.$store.dispatch('training/setRoles', member.type);
-                    }
-                }
-                this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
-                this.$store.dispatch('trainingNew/setTrainingScore', '');
-                await loadPublishTraining(this.group, data.id, {mode: this.teachMode});
-                this.$message.success('加载实训成功！');
-            } catch (e) {
-                this.$message.error('加载实训失败！');
-            }
-        },
-        covertData(row) {
-            const releaseReview = ConstConfig.ConstSelect.trainingType;
-            const lastData = Object.assign({}, row);
-            if (Cookies.get('user_lang') == 'en') {
-                releaseReview.forEach(function(element) {
-                    const rolename = element.value;
-                    if (lastData.type == rolename) {
-                        lastData.type = element.enlabel;
-                    }
-                });
-            } else {
-                releaseReview.forEach(function(element) {
-                    const rolename = element.value;
-                    if (lastData.type == rolename) {
-                        lastData.type = element.label;
-                    }
-                });
-            }
-            return lastData.type;
-        },
-        getListData() {
-            this.$refs.queryListPage && this.$refs.queryListPage.commitQuery();
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-/deep/ .el-dialog--center .el-dialog__body{
-    padding: 10px 25px 10px 25px;
-}
-.box-card{
-	padding: 10px;
-	font-size: 14px;
-}
-.trainingHeader {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 10px 5px;
-	.flexNull {
-		flex: 1;
-	}
-}
-</style>
diff --git a/src/views/designPlatform/trainingPositionTip.vue b/src/views/designPlatform/trainingPositionTip.vue
deleted file mode 100644
index 0edb941ca..000000000
--- a/src/views/designPlatform/trainingPositionTip.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <div v-if="tipShow">
-    <pop-tip v-show="popShow" :position="position" :tip="tip" />
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import PopTip from './poptip';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
-import { getDomOffset } from '@/utils/index';
-import { ScriptMode } from '@/scripts/ConstDic';
-
-export default {
-    name: 'TrainingTips',
-    components: { PopTip },
-    data() {
-        return {
-            tipShow: false,
-            popShow: false,
-            position: {
-                x: 0,
-                y: 0
-            },
-            tip: ''
-        };
-    },
-    computed: {
-        ...mapGetters([
-            'canvasWidth',
-            'canvasHeight'
-        ]),
-        trainingDetail() {
-            return this.$store.state.trainingNew.trainingDetail;
-        },
-        teachMode() {
-            return this.$store.state.trainingNew.teachMode;
-        }
-    },
-    watch: {
-        '$store.state.socket.trainingStepTip': function(val) {
-            if (val && this.trainingDetail.type === 'SINGLE') {
-                const member = this.$store.state.training.memberData[val.memberId];
-                this.$nextTick(function() {
-                    this.$store.dispatch('trainingNew/clearOperateOrder');
-                    this.$store.dispatch('trainingNew/stepOrderIncrease');
-                    if (member.userId == this.$store.state.user.id) {
-                        this.tipInit();
-                    }
-                });
-            }
-        },
-        '$store.state.socket.trainingOverCount': function(val) {
-            this.tip = '';
-            this.popShow = false;
-            this.tipShow = false;
-            this.position = { x: 0, y: 0 };
-        },
-        '$store.state.trainingNew.trainingSwitch': function(val) {
-            this.tip = '';
-            this.popShow = false;
-            this.tipShow = false;
-            this.position = { x: 0, y: 0 };
-        }
-    },
-    methods: {
-        tipInit() {
-            if (this.teachMode === ScriptMode.TEACH) {
-                this.tipShow = true;
-                const offset = this.$store.state.config.canvasOffset;
-                const trainingDetail = this.$store.state.trainingNew.trainingDetail;
-                const stepOrder = this.$store.state.trainingNew.stepOrder;
-                const steps = JSON.parse(trainingDetail.stepJson);
-                if (steps && steps.length) {
-                    const step = steps[stepOrder - 1];
-                    const distance = 5;
-                    this.tip = this.$store.state.socket.trainingStepTip.content;
-                    if (step && step.tipPosition && step.tipPosition.deviceCode) {
-                        const position = this.getShapeTipPoint(step.tipPosition);
-                        if (position) {
-                            this.position = {
-                                x: position.x + offset.x,
-                                y: position.y + offset.y - distance
-                            };
-                            this.popTipShow();
-                        }
-                    } else if (step && step.tipPosition && step.tipPosition.domId) {
-                        const position = this.getOtherTipPoint(step.tipPosition);
-                        if (position) {
-                            this.position = position;
-                            this.position.y -= distance;
-                            this.popTipShow();
-                        }
-                    } else {
-                        this.popTipHide();
-                    }
-                } else {
-                    this.tipShow = false;
-                }
-            } else {
-                this.tipShow = false;
-            }
-        },
-        popTipShow() {
-            this.popShow = true;
-        },
-        popTipHide() {
-            this.popShow = false;
-        },
-        // 获取地图设备提示位置
-        getShapeTipPoint(tipPosition) {
-            var position = null;
-            // 单独处理 自动折返
-            const newTipPosition = Object.assign({}, tipPosition);
-            if (newTipPosition.deviceCode.includes('Cycle')) {
-                const buttonList = this.$store.state.map.map.cycleButtonList;
-                if (buttonList && buttonList.length > 0) {
-                    buttonList.forEach(element => {
-                        if (element.cycleCode == newTipPosition.code) {
-                            newTipPosition.deviceCode = element.code;
-                        }
-                    });
-                }
-            }
-            let subDeviceType = '';
-            if (newTipPosition.subType) { subDeviceType = newTipPosition.subType; } else { subDeviceType = newTipPosition.type; }
-            position = this.$jlmap.getShapeTipPoint({
-                code: newTipPosition.deviceCode,
-                subDeviceType: subDeviceType
-            });
-            if (position) {
-                if (position.x < 0) {
-                    position.x = 0;
-                }
-                if (position.x > this.canvasWidth) {
-                    position.x = this.canvasWidth;
-                }
-                if (position.y < 0) {
-                    position.y = 0;
-                }
-                if (position.y > this.canvasHeight) {
-                    position.y = this.canvasHeight;
-                }
-            }
-            return position;
-        },
-        // 获取地图菜单按钮和对话框按钮提示显示位置
-        getOtherTipPoint(tipPosition) {
-            const domId = OperationHandler.getDomIdByOperation(tipPosition.domId);
-            const btnDom = document.getElementById(domId);
-            if (btnDom) {
-                const offset = getDomOffset(btnDom);
-                if (offset.x == 0 && offset.y == 0) {
-                    return null;
-                }
-
-                let align = 'bottom';
-                if (this.tipAlignIsTop(tipPosition, domId)) {
-                    align = 'top';
-                }
-
-                return {
-                    align: align,
-                    x: offset.x + btnDom.clientWidth / 2,
-                    y: offset.y
-                };
-            }
-            return null;
-        },
-        tipAlignIsTop(step, domId) {
-            // 如果是tip框则箭头朝上
-            // if (step.type.toUpperCase() === 'bar'.toUpperCase()) {
-            //     return true;
-            // }
-            const Dom = document.getElementById(domId);
-            if (Dom.parentElement.id == 'menuButtons_box') { // 现地操作按钮提示位置判断
-                return false;
-            }
-
-            if (/{TOP}/.test(domId)) {
-                return true;
-            }
-            if (/{BOTTOM}/.test(domId)) {
-                return false;
-            }
-            // 如果domId中不含以下关键字，则箭头朝上
-            const keyList = ['choose', 'select'];
-            for (var key in keyList) {
-                if (domId.toUpperCase().indexOf(keyList[key].toUpperCase()) !== -1) {
-                    return false;
-                }
-            }
-            // 其他情况默认朝下
-            return true;
-        }
-    }
-};
-</script>
diff --git a/src/views/designPlatform/trainingPreview.vue b/src/views/designPlatform/trainingPreview.vue
deleted file mode 100644
index 87b2d2ed4..000000000
--- a/src/views/designPlatform/trainingPreview.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <div class="train">
-    <menu-demon ref="menuDemon" />
-    <training-jlmap refs="trainingJlmap" />
-    <training-tip ref="trainingTip" />
-    <training-position-tip ref="trainingPositionTip" />
-    <!--    <scene-play-role ref="scenePlayRole" @startTraining="startTraining" />-->
-    <training-menu v-if="trainingDetail" ref="trainingMenu" :offset-bottom="offsetBottom" />
-    <div class="trainBack">
-      <el-button-group>
-        <!--        <el-button v-if="!trainingSwitch && trainingDetail" type="success" @click="handlerStart">开始</el-button>-->
-        <!--        <el-button v-if="trainingSwitch" type="danger" @click="handlerEnd">结束</el-button>-->
-        <el-button type="primary" @click="back">返回</el-button>
-      </el-button-group>
-    </div>
-  </div>
-</template>
-<script>
-import { clearSimulation } from '@/api/simulation';
-import { startTraining, endTraining, endTrainingStep } from '@/api/jmap/training';
-import MenuDemon from './demonMenu.vue';
-import TrainingTip from './trainingTip';
-import TrainingPositionTip from './trainingPositionTip';
-import TrainingJlmap from './trainingJlmap';
-// import ScenePlayRole from './scenePlayRole';
-import TrainingMenu from './trainingMenu';
-export default {
-    name: 'TrainingDesign',
-    components: {
-        MenuDemon,
-        TrainingTip,
-        TrainingJlmap,
-        TrainingPositionTip,
-        // ScenePlayRole,
-        TrainingMenu
-    },
-    props: {
-        widthLeft: {
-            type: Number,
-            default: 0
-        }
-    },
-    data() {
-        return {
-            // maskOpen: false,
-            trainingObj: null,
-            starting: false,
-            selected: null,
-            menus: null,
-            offsetBottom: 15
-        };
-    },
-    computed: {
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        teachMode() {
-            return this.$store.state.trainingNew.teachMode;
-        },
-        trainingSwitch() {
-            return this.$store.state.trainingNew.trainingSwitch;
-        },
-        trainingDetail() {
-            return this.$store.state.trainingNew.trainingDetail;
-        }
-    },
-    watch: {
-        '$store.state.trainingNew.stepOverCount': function(val) {
-            this.nextStep();
-        }
-    },
-    async beforeDestroy() {
-        this.$store.dispatch('socket/clearTrainingOverCount');
-        this.$store.dispatch('trainingNew/clearStepOverCount');
-        this.$store.dispatch('trainingNew/setTrainingDetail', null);
-        this.$store.dispatch('trainingNew/trainingEnd');
-        this.$store.dispatch('trainingNew/clearStepOrder');
-        this.$store.dispatch('trainingNew/clearOperateOrder');
-        this.$store.dispatch('trainingNew/changeTeachMode', '');
-    },
-    mounted() {
-        this.$store.dispatch('trainingNew/setTrainingScore', '');
-        this.handleOffsetBottom();
-    },
-    methods: {
-        handleOffsetBottom() {
-            setTimeout(() => {
-                const menuBottom = document.getElementById('menuButtons_box');
-                const tipInfoBox = document.getElementById('tipInfoBox');
-                const buttonWidth = this.width - 1200;
-                if (menuBottom && buttonWidth < 780) {
-                    this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
-                }
-                if (tipInfoBox) {
-                    this.offsetBottom += tipInfoBox.offsetHeight;
-                }
-            }, 500);
-        },
-        overallTranslation(flag) {
-            const panel = document.getElementById('leftSlider');
-            if (flag) {
-                panel.style.transform = 'translateX(400px)';
-            } else {
-                panel.style.transform = '';
-            }
-        },
-        async back() {
-            if (this.$route.query.group) {
-                await clearSimulation(this.$route.query.group);
-            }
-        },
-        handlerStart() {
-            if (this.trainingDetail.type === 'SCENE') {
-                this.$refs.scenePlayRole.doShow();
-            } else {
-                this.startTraining();
-            }
-        },
-        startTraining() {
-            startTraining(this.group, {mode: this.teachMode}).then(() => {
-                this.$store.dispatch('trainingNew/trainingStart');
-                this.$store.dispatch('trainingNew/setTrainingScore', '');
-            }).catch(() => {
-                this.$message.error('开始实训失败！');
-            });
-        },
-        nextStep() {
-            const stepList = JSON.parse(this.$store.state.trainingNew.trainingDetail.stepJson);
-            const step = stepList[this.$store.state.trainingNew.stepOrder - 1];
-            endTrainingStep(this.group, step.id).then(resp => {
-            }).catch(() => {
-                this.$message.error('进入下一步实训失败！');
-            });
-        },
-        handlerEnd() {
-            endTraining(this.group).then((resp) => {
-                this.$store.dispatch('trainingNew/trainingEnd');
-                this.$store.dispatch('socket/clearTrainingStepTip');
-                this.$store.dispatch('trainingNew/clearStepOrder');
-                this.$store.dispatch('trainingNew/setTrainingScore', resp.data);
-            }).catch(() => {
-                this.$message.error('结束实训失败！');
-            });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .train {
-        width: 100%;
-		overflow: hidden;
-        position: relative;
-    }
-	.trainMask{
-        opacity: 1;
-        background: #000;
-        position: absolute;
-        right: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 9;
-    }
-	.trainBack {
-        position: absolute;
-        float: right;
-        right: 15px;
-        bottom: 15px;
-		z-index: 19;
-    }
-</style>
diff --git a/src/views/dispatcherLoger/addDispatcherLogerRunplan.vue b/src/views/dispatcherLoger/addDispatcherLogerRunplan.vue
index 1dd21c59a..59c9dbf49 100644
--- a/src/views/dispatcherLoger/addDispatcherLogerRunplan.vue
+++ b/src/views/dispatcherLoger/addDispatcherLogerRunplan.vue
@@ -324,7 +324,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/dispatcherLoger/deleteDispatcherLoger.vue b/src/views/dispatcherLoger/deleteDispatcherLoger.vue
index 1f357064d..7beb4c842 100644
--- a/src/views/dispatcherLoger/deleteDispatcherLoger.vue
+++ b/src/views/dispatcherLoger/deleteDispatcherLoger.vue
@@ -99,7 +99,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
             this.$emit('clearRpRow');
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/dispatcherLoger/index.vue b/src/views/dispatcherLoger/index.vue
index f994a6062..e76913ad9 100644
--- a/src/views/dispatcherLoger/index.vue
+++ b/src/views/dispatcherLoger/index.vue
@@ -375,6 +375,7 @@ export default {
             this.isShow = false;
             this.rpMenuPopShow = false;
             this.clearRpRow();
+            this.$emit('close');
         },
         // 大铁 调度台 发布所有行车计划
         sendRunplan() {
diff --git a/src/views/dispatcherStationManage/dispatchCmd.vue b/src/views/dispatcherStationManage/dispatchCmd.vue
index c6f0ac8c7..c49d851ba 100644
--- a/src/views/dispatcherStationManage/dispatchCmd.vue
+++ b/src/views/dispatcherStationManage/dispatchCmd.vue
@@ -966,6 +966,7 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+            this.$emit('close');
         },
         tabClick() {
             console.log('tabClick');
diff --git a/src/views/drts/scene/trainingResult.vue b/src/views/drts/scene/trainingResult.vue
index 3405096df..341fab432 100644
--- a/src/views/drts/scene/trainingResult.vue
+++ b/src/views/drts/scene/trainingResult.vue
@@ -95,7 +95,7 @@ export default {
             resultMap: {},
             loading: false,
             audioPlayId: '',
-            baseUrl:this.$store.state.user.resourcesUrl
+            baseUrl:this.$store.state.user.ossUrl
         };
     },
     watch: {
diff --git a/src/views/drts/scene/voiceTraining.vue b/src/views/drts/scene/voiceTraining.vue
index d4cdff366..1bd709269 100644
--- a/src/views/drts/scene/voiceTraining.vue
+++ b/src/views/drts/scene/voiceTraining.vue
@@ -84,7 +84,7 @@ export default {
             recordSendingId: null,
             audioDataMap: {},
             audioPlayId: '',
-            baseUrl:this.$store.state.user.resourcesUrl
+            baseUrl:this.$store.state.user.ossUrl
         };
     },
     watch: {
diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue
index 80ccd2b96..5406f3488 100644
--- a/src/views/editor/index.vue
+++ b/src/views/editor/index.vue
@@ -56,7 +56,7 @@ export default {
             });
 
             uploadFile(action, that.formData).then(resp => {
-                const imgUrl = this.$store.state.user.resourcesUrl + resp.data;
+                const imgUrl = this.$store.state.user.ossUrl + resp.data;
                 insertImgFn(imgUrl);
             }).catch(error => { console.log(error); });
         };
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index d17fcdec5..e0ee45aab 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -199,9 +199,9 @@ export default {
                         this.$store.dispatch('app/transitionAnimations');
                     }
                     if (this.$route.query.subSystem) {
-                        this.$router.push({ path: `${UrlConfig.displayNew}/exam`, query: query });
+                        this.$router.push({ path: `${UrlConfig.display}/exam`, query: query });
                     } else {
-                        this.$router.replace({ path: `${UrlConfig.displayNew}/exam`, query: query });
+                        this.$router.replace({ path: `${UrlConfig.display}/exam`, query: query });
                     }
                     launchFullscreen();
                 }).catch(error => {
diff --git a/src/views/functionManage/index.vue b/src/views/functionManage/index.vue
new file mode 100644
index 000000000..bff6cacce
--- /dev/null
+++ b/src/views/functionManage/index.vue
@@ -0,0 +1,113 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </div>
+</template>
+
+<script>
+import { getAbilityPage, autoCreate } from '@/api/functionManage';
+import { getPublishMapListOnline } from '@/api/jmap/map';
+
+export default {
+    name: 'FunctionManage',
+    components: {
+    },
+    data() {
+        return {
+            mapList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '100px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: this.$t('orderAuthor.ability') + this.$t('orderAuthor.name')
+                    },
+                    mapId: {
+                        type: 'select',
+                        label: this.$t('orderAuthor.map'),
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('orderAuthor.ability') + this.$t('orderAuthor.name'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('orderAuthor.belongsToMap'),
+                        prop: 'mapName',
+                        type: 'tag',
+                        columnValue: (row) => { return row.mapName || ''; },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('orderAuthor.founder'),
+                        width: '160',
+                        prop: 'nickName'
+                    },
+                    {
+                        title: this.$t('orderAuthor.creationTime'),
+                        width: '160',
+                        prop: 'createTime'
+                    },
+                    {
+                        title: this.$t('orderAuthor.updateTime'),
+                        width: '160',
+                        prop: 'updateTime'
+                    }
+                ],
+                actions: [
+                    { text: this.$t('orderAuthor.oneClickSync'), handler: this.create }
+                ]
+            }
+        };
+    },
+
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            // 获取地图
+            this.mapList = [];
+            getPublishMapListOnline().then(res => {
+                res.data.forEach(elem => {
+                    this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                    this.mapList.push({ value: elem.id, label: elem.name });
+                });
+            }).catch(error=>{
+                console.error(error, '获取发布地图');
+            });
+        },
+        queryFunction(params) {
+            return getAbilityPage(params);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        create() {
+            autoCreate().then(res => {
+                console.log(res);
+            }).catch(err => {
+                console.log(err);
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/ibp/ibpsystem/index.vue b/src/views/ibp/ibpsystem/index.vue
index 499cb29e6..71e32ab5a 100644
--- a/src/views/ibp/ibpsystem/index.vue
+++ b/src/views/ibp/ibpsystem/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div>
     <div :id="ibpId" v-loading="loading" :style="{ width: canvasWidth+'px', height: canvasHeight +'px',background:'#000' }" class="ibp-canvas" />
-    <el-button-group class="ibp-button">
-      <el-button v-if="moreScreen" type="primary" @click="switchOffset">切换</el-button>
-      <el-button v-if="showBackButton" type="primary" @click="back">{{ $t('global.back') }}</el-button>
-      <el-button v-if="$route.query.noPreLogout" type="primary" @click="quit">退出</el-button>
-    </el-button-group>
+    <!-- <el-button-group class="ibp-button"> -->
+    <!-- <el-button v-if="moreScreen" type="primary" @click="switchOffset">切换</el-button> -->
+    <!--      <el-button v-if="showBackButton" type="primary" @click="back">{{ $t('global.back') }}</el-button>-->
+    <!--      <el-button v-if="$route.query.noPreLogout" type="primary" @click="quit">退出</el-button>-->
+    <!-- </el-button-group> -->
 
-    <template v-for="alarm in alarmList" >
-      <audio :key="alarm.code" :id="`buzzer_${alarm.code}`" controls loop="loop">
-      <source :src="buzzerAudio" type="audio/mpeg">
+    <template v-for="alarm in alarmList">
+      <audio :id="`buzzer_${alarm.code}`" :key="alarm.code" controls loop="loop">
+        <source :src="buzzerAudio" type="audio/mpeg">
       </audio>
     </template>
   </div>
@@ -20,8 +20,7 @@ import Vue from 'vue';
 import IbpPan from '@/ibp/ibpPan';
 import { parser } from '@/ibp/utils/parser';
 import { mapGetters } from 'vuex';
-import { exitFullscreen } from '@/utils/screen';
-import { handlerIbpEvent, handleIbpPress, handleIbpRelease } from '@/api/simulation';
+import { handleIbpPress, handleIbpRelease } from '@/api/simulation';
 import { IbpOperation } from '@/scripts/ConstDic';
 import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
 import { getToken } from '@/utils/auth';
@@ -29,6 +28,7 @@ import { getIbpInfoByStation } from '@/api/ibp';
 import { getSimulationInfoNew, getIbpInitialState } from '@/api/simulation';
 import BuzzerAudio from '@/assets/buzzer.mp3';
 import { getStationList } from '@/api/runplan';
+import { EventBus } from '@/scripts/event-bus';
 
 const pressedKeys = new Set();
 export default {
@@ -113,6 +113,7 @@ export default {
             await this.setMoveInit(false);
             this.showBackButton = false;
         }
+        EventBus.$on('switchOffset', this.switchOffset);
     },
     beforeDestroy() {
         if (this.$route.query.noPreLogout) {
@@ -120,12 +121,14 @@ export default {
             this.$ibp.setClockStart(false);
         }
         this.ibpDestroy();
+        this.$store.dispatch('ibp/setMoreScreen', false);
+        EventBus.$off('switchOffset');
     },
     preResetBtn: null,
     methods: {
         initIbp(offsetX = 0) {
             this.ibpDestroy();
-            this.loading = true;
+            // this.loading = true;
             this.$ibp = new IbpPan({
                 dom: document.getElementById(this.ibpId),
                 config: {
@@ -193,10 +196,11 @@ export default {
                     const data = parser(ibpDatas, {width: this.canvasWidth, height: this.canvasHeight}); // ibp 绘图编译数据
                     this.initIbp(this.offsetX);
                     this.moreScreen = ibpDatas.background && ibpDatas.background.width > 1920;
+                    this.$store.dispatch('ibp/setMoreScreen', this.moreScreen);
                     this.setIbp(data, ibpDatas);
                     this.$store.dispatch('ibp/setIbpData', ibpDatas);
                     this.handleBanOpenScreenDoorStatus();
-                    this.preResetBtn = this.$ibp.$painter.ibpInstanceLevel.SquareButton.children().find(e=>e.model.mean === IbpOperation.PRERESET_Z.event); //计轴预复零按钮
+                    this.preResetBtn = this.$ibp.$painter.ibpInstanceLevel.SquareButton.children().find(e=>e.model.mean === IbpOperation.PRERESET_Z.event); // 计轴预复零按钮
                     this.alarmList = this.$ibp.$painter.ibpInstanceLevel.Alarm.children().map(e=>e.model);
                 } else {
                     // 无数据
@@ -235,26 +239,26 @@ export default {
         onSelected(em) {
 
         },
-        onKeyboardAction(e){
+        onKeyboardAction(e) {
             if (this.preResetBtn) {
                 if (e.type === 'keydown' && e.key === 'Control') {
-                    pressedKeys.add(e.key)
+                    pressedKeys.add(e.key);
                     this.preResetBtn.press();
                     handleIbpPress(this.$route.query.group, this.stationCode, this.preResetBtn._code).catch(error => { this.$message.error(error.message); });
-                } else if (e.type === 'keyup' && e.key === 'Control'){
-                    pressedKeys.delete(e.key)
+                } else if (e.type === 'keyup' && e.key === 'Control') {
+                    pressedKeys.delete(e.key);
                     this.preResetBtn.release();
                     handleIbpRelease(this.$route.query.group, this.stationCode, this.preResetBtn._code).catch(error => { this.$message.error(error.message); });
                 }
             }
         },
         onMouseDown(em) {
-            if (["SquareButton", "Key"].includes(em.deviceType)){
+            if (['SquareButton', 'Key'].includes(em.deviceType)) {
                 handleIbpPress(this.$route.query.group, this.stationCode, em.deviceCode).catch(error => { this.$message.error(error.message); });
             }
         },
         onMouseUp(em) {
-            if (["SquareButton"].includes(em.deviceType)){
+            if (['SquareButton'].includes(em.deviceType)) {
                 handleIbpRelease(this.$route.query.group, this.stationCode, em.deviceCode).catch(error => { this.$message.error(error.message); });
             }
         },
@@ -293,22 +297,22 @@ export default {
             const height = this.size ? this.size.height : this.$store.state.app.height;
             this.$store.dispatch('config/resize', { width: width, height: height });
         },
-        back() {
-            this.group = this.$route.query.group;
-            this.$store.dispatch('training/over').then(() => {
-                if (this.$route.query.projectDevice) {
-                    this.$store.dispatch('LogOut').then(() => {
-                        location.reload();
-                    });
-                } else {
-                    history.go(-1);
-                    exitFullscreen();
-                }
-            });
-        },
-        quit() {
-            window.close();
-        },
+        // back() {
+        //     this.group = this.$route.query.group;
+        //     this.$store.dispatch('training/over').then(() => {
+        //         if (this.$route.query.projectDevice) {
+        //             this.$store.dispatch('LogOut').then(() => {
+        //                 location.reload();
+        //             });
+        //         } else {
+        //             history.go(-1);
+        //             exitFullscreen();
+        //         }
+        //     });
+        // },
+        // quit() {
+        //     window.close();
+        // },
         ibpDestroy() {
             if (this.$ibp) {
                 this.$ibp.dispose();
diff --git a/src/layout/components/userInfo.vue b/src/views/info/personalInfo.vue
similarity index 53%
rename from src/layout/components/userInfo.vue
rename to src/views/info/personalInfo.vue
index afaa705d2..281e9ed24 100644
--- a/src/layout/components/userInfo.vue
+++ b/src/views/info/personalInfo.vue
@@ -1,271 +1,261 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    :title="$t('global.personalDetails')"
-    :visible.sync="visible"
-    width="470px"
-    :close-on-click-modal="false"
-    :before-close="doClose"
-    class="userInfo_box"
-  >
-    <div>
-      <div class="form_box">
-        <div class="title">{{ $t('global.compellation') }}:</div>
-        <div class="content_box_info">
-          <div v-show="nameShow" class="show_box">
-            <span>{{ userInfo.name }}</span>
-            <i class="el-icon-edit" @click="switcherName" />
-          </div>
-          <div v-show="!nameShow" class="flex_box">
-            <el-input
-              v-model="editInfo.name"
-              :placeholder="$t('global.enterName')"
-              maxlength="20"
-              size="mini"
-              class="input_box"
-            />
-            <div class="button_box">
-              <el-button
-                size="mini"
-                class="button_box"
-                :disabled="!editInfo.name"
-                @click="saveName"
-              >{{ $t('global.save') }}</el-button>
-              <el-button
-                size="mini"
-                class="button_box"
-                type="text"
-                @click="switcherName"
-              >{{ $t('global.cancel') }}</el-button>
-            </div>
-          </div>
-        </div>
+  <div style="width: 100%;height: 100%;text-align: left;padding: 50px;">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>个人信息</span>
       </div>
-      <div class="form_box">
-        <div class="title">{{ $t('global.nickName') }}:</div>
-        <div class="content_box_info">
-          <div v-show="nickNameShow" class="show_box">
-            <span>{{ userInfo.nickname }}</span>
-            <i class="el-icon-edit" @click="switcherNickname" />
-          </div>
-          <div v-show="!nickNameShow" class="flex_box">
-            <el-input
-              v-model="editInfo.nickname"
-              :placeholder="$t('global.enterNickname')"
-              maxlength="20"
-              size="mini"
-              class="input_box"
-            />
-            <div class="button_box">
-              <el-button
-                size="mini"
-                class="button_box"
-                :disabled="!editInfo.nickname"
-                @click="saveNickName"
-              >{{ $t('global.save') }}</el-button>
-              <el-button
-                size="mini"
-                class="button_box"
-                type="text"
-                @click="switcherNickname"
-              >{{ $t('global.cancel') }}</el-button>
+      <div style="width: 100%;">
+        <div class="form_box">
+          <div class="title">{{ $t('global.compellation') }}:</div>
+          <div class="content_box_info">
+            <div v-show="nameShow" class="show_box">
+              <span>{{ userInfo.name }}</span>
+              <i class="el-icon-edit" @click="switcherName" />
             </div>
-          </div>
-        </div>
-      </div>
-      <div class="form_box">
-        <div class="title">{{ $t('global.mobile') }}:</div>
-        <div class="content_box_info">
-          <div v-show="mobileShow" class="show_box">
-            <span>{{ geTel(userInfo.mobile) }}</span>
-            <i class="el-icon-edit" @click="switcherMobile" />
-          </div>
-          <div v-show="!mobileShow" class="flex_box">
-            <el-input
-              v-model="editInfo.mobile"
-              :placeholder="$t('global.enterMobile')"
-              maxlength="11"
-              size="mini"
-              class="input_box"
-            />
-            <el-select v-model="nationCode" size="mini" class="selectCountry">
-              <el-option
-                v-for="item in countryList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
-            </el-select>
-            <el-input
-              v-model="mobileCode"
-              :placeholder="$t('global.verificationCode')"
-              size="mini"
-              class="code_box"
-              style="margin-top: 10px;"
-            />
-            <el-button
-              size="mini"
-              style="margin-top: 10px; margin-right: 10px;"
-              :disabled="mobileCodeTime != 0"
-              @click="sendMobileCode"
-            >
-              {{ $t('global.sendCode') }}
-              <span
-                v-if="mobileCodeTime"
-              >{{ mobileCodeTime }}</span>
-            </el-button>
-            <div class="button_box" style="margin-top: 10px;">
-              <el-button
-                size="mini"
-                class="button_box"
-                :disabled="!mobileCode"
-                @click="saveMobile"
-              >{{ $t('global.save') }}</el-button>
-              <el-button
-                size="mini"
-                class="button_box"
-                type="text"
-                @click="switcherMobile"
-              >{{ $t('global.cancel') }}</el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="form_box">
-        <div class="title">{{ $t('global.email') }}:</div>
-        <div class="content_box_info">
-          <div v-show="emailShow" class="show_box">
-            <span>{{ userInfo.email }}</span>
-            <i class="el-icon-edit" @click="switcherEmail" />
-          </div>
-          <div v-show="!emailShow" class="flex_box">
-            <el-input
-              v-model="editInfo.email"
-              :placeholder="$t('global.enterEmail')"
-              size="mini"
-              class="input_box"
-            />
-            <el-input
-              v-model="emailCode"
-              :placeholder="$t('global.verificationCode')"
-              size="mini"
-              class="code_box"
-              style="margin-top: 10px;"
-            />
-            <el-button
-              size="mini"
-              style="margin-top: 10px; margin-right: 10px;"
-              :disabled="emailCodeTime != 0"
-              @click="sendEmailCode"
-            >
-              {{ $t('global.sendCode') }}
-              <span
-                v-if="emailCodeTime"
-              >{{ emailCodeTime }}</span>
-            </el-button>
-            <div class="button_box" style="margin-top: 10px;">
-              <el-button
-                size="mini"
-                class="button_box"
-                :disabled="!emailCode"
-                @click="saveEmail"
-              >{{ $t('global.save') }}</el-button>
-              <el-button
-                size="mini"
-                class="button_box"
-                type="text"
-                @click="switcherEmail"
-              >{{ $t('global.cancel') }}</el-button>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="form_box">
-        <div class="title">{{ $t('global.passWord') }}:</div>
-        <div class="content_box_info">
-          <div v-show="passwordShow" class="show_box">
-            <span>******</span>
-            <i class="el-icon-edit" @click="switcherPassWord" />
-          </div>
-          <div v-show="!passwordShow" class="flex_box">
-            <div class="passWord_box">
-              <span>{{ $t('global.newPassWord') }}:</span>
+            <div v-show="!nameShow" class="flex_box">
               <el-input
-                v-model="newPassWord1"
-                :placeholder="$t('global.enterPassWord')"
+                v-model="editInfo.name"
+                :placeholder="$t('global.enterName')"
                 maxlength="20"
-                show-password
                 size="mini"
                 class="input_box"
               />
-            </div>
-            <div style="height: 28px; line-height: 28px; margin-bottom: 10px;">
-              <el-input
-                v-model="passWordCode"
-                :placeholder="$t('global.verificationCode')"
-                size="mini"
-                class="code_box"
-              />
-              <el-button
-                size="mini"
-                style="margin-right: 10px;"
-                :disabled="passWordCodeTime != 0"
-                @click="sendPassWordCode"
-              >
-                {{ $t('global.sendMobileCode') }}
-                <span
-                  v-if="passWordCodeTime"
-                >{{ passWordCodeTime }}</span>
-              </el-button>
-            </div>
-            <div class="button_box" style="width: 150px;">
-              <el-button
-                size="mini"
-                class="button_box"
-                :disabled="!passWordCode"
-                @click="savePassWord"
-              >{{ $t('global.save') }}</el-button>
-              <el-button
-                size="mini"
-                class="button_box"
-                type="text"
-                @click="switcherPassWord"
-              >{{ $t('global.cancel') }}</el-button>
+              <div class="button_box">
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  :disabled="!editInfo.name"
+                  @click="saveName"
+                >{{ $t('global.save') }}</el-button>
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  type="text"
+                  @click="switcherName"
+                >{{ $t('global.cancel') }}</el-button>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-    </div>
-    <!--<div class="form_box">-->
-    <!--<div class="title">单位:</div>-->
-    <!--<div class="content_box_info">-->
-    <!--<div class="show_box">-->
-    <!--<span>{{ userInfo.companyId }}</span>-->
-    <!--</div>-->
-    <!--</div>-->
-    <!--</div>-->
-    <div v-if="!wmOpenId" class="form_box">
-      <div class="title">绑定微信:</div>
-      <div class="content_box_info">
-        <el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateBindQrCode">生成微信二维码</el-button>
-        <div v-if="binding && !bindSuccess" class="login-code-box" @click="generateBindQrCode">
-          <qrcode-vue
-            v-loading="loadingCode"
-            :value="loginUrl"
-            :class-name="qrcodeClassName"
-            :size="150"
-            :element-loading-text="this.$t('login.clickRefresh')"
-            element-loading-spinner="el-icon-refresh"
-            element-loading-background="rgba(255, 255, 255, 0.9)"
-          />
+        <div class="form_box" style="background: #f3efef;">
+          <div class="title">{{ $t('global.nickName') }}:</div>
+          <div class="content_box_info">
+            <div v-show="nickNameShow" class="show_box">
+              <span>{{ userInfo.nickname }}</span>
+              <i class="el-icon-edit" @click="switcherNickname" />
+            </div>
+            <div v-show="!nickNameShow" class="flex_box">
+              <el-input
+                v-model="editInfo.nickname"
+                :placeholder="$t('global.enterNickname')"
+                maxlength="20"
+                size="mini"
+                class="input_box"
+              />
+              <div class="button_box">
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  :disabled="!editInfo.nickname"
+                  @click="saveNickName"
+                >{{ $t('global.save') }}</el-button>
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  type="text"
+                  @click="switcherNickname"
+                >{{ $t('global.cancel') }}</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="form_box">
+          <div class="title">{{ $t('global.mobile') }}:</div>
+          <div class="content_box_info">
+            <div v-show="mobileShow" class="show_box">
+              <span>{{ geTel(userInfo.mobile) }}</span>
+              <i class="el-icon-edit" @click="switcherMobile" />
+            </div>
+            <div v-show="!mobileShow" class="flex_box">
+              <el-input
+                v-model="editInfo.mobile"
+                :placeholder="$t('global.enterMobile')"
+                maxlength="11"
+                size="mini"
+                class="input_box"
+              />
+              <el-select v-model="nationCode" size="mini" class="selectCountry">
+                <el-option
+                  v-for="item in countryList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+              <el-input
+                v-model="mobileCode"
+                :placeholder="$t('global.verificationCode')"
+                size="mini"
+                class="code_box"
+                style="margin-top: 10px;"
+              />
+              <el-button
+                size="mini"
+                style="margin-top: 10px; margin-right: 10px;"
+                :disabled="mobileCodeTime != 0"
+                @click="sendMobileCode"
+              >
+                {{ $t('global.sendCode') }}
+                <span
+                  v-if="mobileCodeTime"
+                >{{ mobileCodeTime }}</span>
+              </el-button>
+              <div class="button_box" style="margin-top: 10px;">
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  :disabled="!mobileCode"
+                  @click="saveMobile"
+                >{{ $t('global.save') }}</el-button>
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  type="text"
+                  @click="switcherMobile"
+                >{{ $t('global.cancel') }}</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="form_box" style="background: #f3efef;">
+          <div class="title">{{ $t('global.email') }}:</div>
+          <div class="content_box_info">
+            <div v-show="emailShow" class="show_box">
+              <span>{{ userInfo.email }}</span>
+              <i class="el-icon-edit" @click="switcherEmail" />
+            </div>
+            <div v-show="!emailShow" class="flex_box">
+              <el-input
+                v-model="editInfo.email"
+                :placeholder="$t('global.enterEmail')"
+                size="mini"
+                class="input_box"
+              />
+              <el-input
+                v-model="emailCode"
+                :placeholder="$t('global.verificationCode')"
+                size="mini"
+                class="code_box"
+                style="margin-top: 10px;"
+              />
+              <el-button
+                size="mini"
+                style="margin-top: 10px; margin-right: 10px;"
+                :disabled="emailCodeTime != 0"
+                @click="sendEmailCode"
+              >
+                {{ $t('global.sendCode') }}
+                <span
+                  v-if="emailCodeTime"
+                >{{ emailCodeTime }}</span>
+              </el-button>
+              <div class="button_box" style="margin-top: 10px;">
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  :disabled="!emailCode"
+                  @click="saveEmail"
+                >{{ $t('global.save') }}</el-button>
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  type="text"
+                  @click="switcherEmail"
+                >{{ $t('global.cancel') }}</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="form_box">
+          <div class="title">组织:</div>
+          <div class="content_box_info">{{ userInfo.companyName }}</div>
+        </div>
+        <div class="form_box" style="background: #f3efef;">
+          <div class="title">{{ $t('global.passWord') }}:</div>
+          <div class="content_box_info">
+            <div v-show="passwordShow" class="show_box">
+              <span>******</span>
+              <i class="el-icon-edit" @click="switcherPassWord" />
+            </div>
+            <div v-show="!passwordShow" class="flex_box">
+              <div class="passWord_box">
+                <span>{{ $t('global.newPassWord') }}:</span>
+                <el-input
+                  v-model="newPassWord1"
+                  :placeholder="$t('global.enterPassWord')"
+                  maxlength="20"
+                  show-password
+                  size="mini"
+                  class="input_box"
+                />
+              </div>
+              <div style="height: 28px; line-height: 28px; margin-bottom: 10px;">
+                <el-input
+                  v-model="passWordCode"
+                  :placeholder="$t('global.verificationCode')"
+                  size="mini"
+                  class="code_box"
+                />
+                <el-button
+                  size="mini"
+                  style="margin-right: 10px;"
+                  :disabled="passWordCodeTime != 0"
+                  @click="sendPassWordCode"
+                >
+                  {{ $t('global.sendMobileCode') }}
+                  <span
+                    v-if="passWordCodeTime"
+                  >{{ passWordCodeTime }}</span>
+                </el-button>
+              </div>
+              <div class="button_box" style="width: 150px;">
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  :disabled="!passWordCode"
+                  @click="savePassWord"
+                >{{ $t('global.save') }}</el-button>
+                <el-button
+                  size="mini"
+                  class="button_box"
+                  type="text"
+                  @click="switcherPassWord"
+                >{{ $t('global.cancel') }}</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-if="!wmOpenId" class="form_box">
+          <div class="title">绑定微信:</div>
+          <div class="content_box_info">
+            <el-button v-if="!binding&&!bindSuccess" type="primary" size="small" style="position: absolute;" @click="generateBindQrCode">生成微信二维码</el-button>
+            <div v-if="binding && !bindSuccess" class="login-code-box" @click="generateBindQrCode">
+              <qrcode-vue
+                v-loading="loadingCode"
+                :value="loginUrl"
+                :class-name="qrcodeClassName"
+                :size="150"
+                :element-loading-text="this.$t('login.clickRefresh')"
+                element-loading-spinner="el-icon-refresh"
+                element-loading-background="rgba(255, 255, 255, 0.9)"
+              />
+            </div>
+            <div v-if="bindSuccess"><span>绑定微信成功</span></div>
+          </div>
         </div>
-        <div v-if="bindSuccess"><span>绑定微信成功</span></div>
       </div>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doClose">{{ $t('global.close') }}</el-button>
-    </span>
-  </el-dialog>
+    </el-card>
+  </div>
 </template>
 
 <script>
@@ -286,13 +276,12 @@ import QrcodeVue from 'qrcode.vue';
 import { setInterval, clearInterval } from 'timers';
 import { checkLoginStatus } from '@/api/login';
 import { getSessionStorage } from '@/utils/auth';
-// import { getCompanyList } from '@/api/company';
 
 export default {
+    name: 'PersonalInfo',
     components: { QrcodeVue },
     data() {
         return {
-            visible: false,
             loginUrl: '',
             loadingCode: false,
             sessionId: '',
@@ -306,7 +295,8 @@ export default {
                 mobile: '',
                 email: '',
                 passWord: '',
-                companyId: ''
+                companyId: '',
+                companyName: ''
             },
             editInfo: {
                 name: '',
@@ -360,6 +350,18 @@ export default {
             return this.$store.state.user;
         }
     },
+    mounted() {
+        this.initData();
+    },
+    beforeDestroy() {
+        this.binding = false;
+        this.bindSuccess = false;
+        this.nameShow = true;
+        this.nickNameShow = true;
+        this.mobileShow = true;
+        this.emailShow = true;
+        this.passwordShow = true;
+    },
     methods: {
         geTel(tel) {
             const reg = /^(\d{3})\d{4}(\d{4})$/;
@@ -369,49 +371,29 @@ export default {
                 return '';
             }
         },
-        doShow() {
-            this.visible = true;
+        initData() {
             this.binding = false;
             this.bindSuccess = false;
             this.project = getSessionStorage('project');
-            // const token = getToken() || getDesignToken();
             const token = getToken();
-            getInfo(token)
-                .then(response => {
-                    const user = response.data;
-                    this.userInfo = {
-                        name: user.name,
-                        nickname: user.nickname,
-                        mobile: user.mobile,
-                        email: user.email,
-                        passWord: '',
-                        companyId: user.companyId
-                    };
-                    this.wmOpenId = user.wmOpenId || '';
-                    this.oldPassWord = user.password;
-                    this.nationCode = user.nationCode ? user.nationCode : '86';
-                    this.nationCodeInit = user.nationCode
-                        ? user.nationCode
-                        : '86';
-                })
-                .catch(error => {
-                    console.log(error, '请求个人信息失败');
-                });
-            // getCompanyList().then(resp => {
-            //     this.companyList = resp.data;
-            // }).catch((error) => {
-            //     console.log(error, '获取公司列表信息失败');
-            // });
-        },
-        doClose() {
-            this.visible = false;
-            this.binding = false;
-            this.bindSuccess = false;
-            this.nameShow = true;
-            this.nickNameShow = true;
-            this.mobileShow = true;
-            this.emailShow = true;
-            this.passwordShow = true;
+            getInfo(token).then(response => {
+                const user = response.data;
+                this.userInfo = {
+                    name: user.name,
+                    nickname: user.nickname,
+                    mobile: user.mobile,
+                    email: user.email,
+                    passWord: '',
+                    companyId: user.companyId,
+                    companyName: user.companyName
+                };
+                this.wmOpenId = user.wmOpenId || '';
+                this.oldPassWord = user.password;
+                this.nationCode = user.nationCode ? user.nationCode : '86';
+                this.nationCodeInit = user.nationCode ? user.nationCode : '86';
+            }).catch(error => {
+                console.log(error, '请求个人信息失败');
+            });
         },
         switcherName() {
             this.editInfo.name = this.userInfo.name;
@@ -458,17 +440,7 @@ export default {
                 }
             }
         },
-        // handleCompany(companyId) {
-        //     let name = '';
-        //     this.companyList.forEach(item => {
-        //         if (item.id == companyId) {
-        //             name = item.name;
-        //         }
-        //     });
-        //     return name;
-        // },
         switcherMobile() {
-            // this.editInfo.mobile = this.userInfo.mobile;
             this.mobileShow = !this.mobileShow;
         },
         async saveMobile() {
@@ -659,63 +631,63 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scope>
 .flex_box {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
 }
 .form_box {
-    width: 100%;
-    overflow: hidden;
-    margin-bottom: 10px;
-    display: flex;
+	width: 100%;
+	padding: 10px 25px;
+	overflow: hidden;
+	display: flex;
 
-    .selectCountry {
-        width: 90px;
-        height: 28px;
-        line-height: 28px;
-    }
-    .title {
-        width: 80px;
-        text-align: left;
-        font-size: 14px;
-        height: 28px;
-        line-height: 28px;
-    }
-    .content_box_info {
-        flex:1;
-        margin: 0;
-        .el-icon-edit {
-            cursor: pointer;
-        }
-    }
-    .show_box {
-        height: 28px;
-        line-height: 28px;
-    }
-    .input_box {
-        font-size: 14px;
-        width: 200px;
-        margin-right: 10px;
-        flex: none;
-        line-height: 0;
-    }
-    .code_box {
-        font-size: 14px;
-        width: 150px;
-        margin-right: 15px;
-        flex: none;
-        line-height: 0;
-    }
-    .button_box {
-        line-height: 0;
-        height: 28px;
-    }
+	.selectCountry {
+		width: 90px;
+		height: 28px;
+		line-height: 28px;
+	}
+	.title {
+		width: 120px;
+		text-align: left;
+		font-size: 14px;
+		height: 28px;
+		line-height: 28px;
+	}
+	.content_box_info {
+		flex:1;
+		margin: 0;
+		.el-icon-edit {
+			cursor: pointer;
+		}
+	}
+	.show_box {
+		height: 28px;
+		line-height: 28px;
+	}
+	.input_box {
+		font-size: 14px;
+		width: 200px;
+		margin-right: 10px;
+		flex: none;
+		line-height: 0;
+	}
+	.code_box {
+		font-size: 14px;
+		width: 150px;
+		margin-right: 15px;
+		flex: none;
+		line-height: 0;
+	}
+	.button_box {
+		line-height: 0;
+		height: 28px;
+	}
 
-    .passWord_box {
-        height: 28px;
-        line-height: 28px;
-        margin-bottom: 10px;
-    }
+	.passWord_box {
+		height: 28px;
+		line-height: 28px;
+		margin-bottom: 10px;
+	}
 	.login-qrcode {
 		width: 150px;
 	}
@@ -723,8 +695,8 @@ export default {
 </style>
 <style rel="stylesheet/scss" lang="scss">
 .userInfo_box {
-    .el-dialog__body {
-        padding: 0 20px;
-    }
+	.el-dialog__body {
+		padding: 0 20px;
+	}
 }
 </style>
diff --git a/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue b/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
index b10c18dcc..7f91fc720 100644
--- a/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
+++ b/src/views/iscs/iscsSystem/config/broadcast/centerHome.vue
@@ -243,7 +243,7 @@ export default {
                     type: 'BGM'
                 };
                 sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
-                    const bgmUrl = this.$store.state.user.resourcesUrl + this.bgmResources[0].url;
+                    const bgmUrl = this.$store.state.user.ossUrl + this.bgmResources[0].url;
                     const audio = document.getElementById('voice');
                     audio.src = bgmUrl;
                     audio.play();
@@ -307,7 +307,7 @@ export default {
                 type: this.videoMode
             };
             sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
-                this.voiceUrl = this.$store.state.user.resourcesUrl + voice.url;
+                this.voiceUrl = this.$store.state.user.ossUrl + voice.url;
                 const audio = document.getElementById('voice');
                 audio.src = this.voiceUrl;
                 audio.play();
diff --git a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
index 2ef98d8e4..22a1b2448 100644
--- a/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
+++ b/src/views/iscs/iscsSystem/config/broadcast/stationHome.vue
@@ -473,7 +473,7 @@ export default {
                 const audio = document.getElementById(position.toLowerCase() + '_voice');
                 if (!audio) { return; }
                 audio.pause();
-                audio.src = this.$store.state.user.resourcesUrl + info.url;
+                audio.src = this.$store.state.user.ossUrl + info.url;
                 audio.play();
                 const _that = this;
                 audio.addEventListener('ended', function() {
diff --git a/src/views/iscs/iscsSystem/menuBar.vue b/src/views/iscs/iscsSystem/menuBar.vue
index f017a23af..10bcfd3ef 100644
--- a/src/views/iscs/iscsSystem/menuBar.vue
+++ b/src/views/iscs/iscsSystem/menuBar.vue
@@ -340,7 +340,7 @@ export default {
             // };
             this.tempClassA = index;
             this.tempClassB = -1;
-            // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
             //     if (valid) {
             //         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
             //     }
diff --git a/src/views/iscs/iscsSystem/stationNav.vue b/src/views/iscs/iscsSystem/stationNav.vue
index d56187e81..ea60d17c1 100644
--- a/src/views/iscs/iscsSystem/stationNav.vue
+++ b/src/views/iscs/iscsSystem/stationNav.vue
@@ -45,7 +45,7 @@
       <div class="bottom-box-in">
         <div v-for="button in buttonList" :key="button.id" class="eachButtonTop">
           <div class="eachButton" :class="buttonId==button.id?'active':''" @click="showSubMenu(button)">
-            <img :src="button.icon" class="eachButtonIcon">
+            <img :src="button.icon" class="eachButtonIco n">
             <span class="eachButtonText">{{ button.name }}</span>
           </div>
           <div v-if="button.children&&button.children.length>0" class="childGroup" :class="isActive(button)">
diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/centerHome.vue b/src/views/iscs/iscsSystemNew/config/broadcast/centerHome.vue
new file mode 100644
index 000000000..7f91fc720
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/broadcast/centerHome.vue
@@ -0,0 +1,627 @@
+<template>
+  <div class="boradcast_box">
+    <div style="margin: 20px auto 0;text-align: center;font-size: 20px;color: #9EEBEF;">语音广播</div>
+    <div style="overflow: hidden;">
+      <div class="area-selection">
+        <el-row><div style="margin-top: 10px;margin-bottom: 5px; color: #9EEBEF;">特定区域</div></el-row>
+        <el-row><el-button v-for="(item, index) in verticalHeader" :key="index" class="area-selection-button" :class="{'active': item.active}" @click="selectedBatch(item)">{{ item.title }}</el-button></el-row>
+      </div>
+      <div class="broadcast-form">
+        <div style="width: 120px; height: 300px; float: left; position: absolute; top: 20px;">
+          <div v-for="(item,i) in verticalHeader" :key="i" :style="{top: i * 31.5 +'px'}" class="left-header">{{ item.name }}</div>
+        </div>
+        <div style="float: left; overflow-x: auto; width: 100%; height: 314px;">
+          <div v-for="(item,i) in verticalHeader" :key="i" :style="{width: tableWidth+'px'}" class="iscs-pa-table">
+            <div style="position: relative; left: 80px;">
+              <div v-for="(it, j) in stationList" :key="j" class="table-grid">
+                <el-button v-if="item.type==='header'" class="pa-table-header" @click="selectedStation(it.code)">
+                  <div style="cursor: default;">{{ it.name }}</div>
+                </el-button>
+                <div v-if="checkHasDevice(item, it, i + '-' + j)">
+                  <div class="pa-table-content" @click="clickArea(i,j)">
+                    <div class="pa-table-content-inside" :style="{background: selectedAreaList.includes(i + '-' + j)? '#2EFF74':'#CDCDCD'}" />
+                  </div>
+                  <div :id="'state-' +i + '-' + j" class="pa-tabel-state-box">{{ deviceMap[i+ '-' +j].state }}</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div style="float: right; width: 11%; margin-right: 1%;margin-top: 63px;">
+        <div class="broadcast-mode">
+          <el-row>
+            <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">实时广播</div></el-col>
+            <el-col :span="12"><el-button class="broadcast-mode-button">广播</el-button></el-col>
+          </el-row>
+        </div>
+        <div class="broadcast-operations">
+          <el-row>
+            <el-col :span="12"><div style="height: 80px;text-align: center; background: #000088;color: #fff;padding-top: 30px">预备<br>广播</div></el-col>
+            <el-col :span="12">
+              <el-button class="broadcast-mode-button" @click="selectedVideoMode('RECORDING')">
+                <div class="pa-check-box" :style="{background: videoMode==='RECORDING'?'#2EFF74':'#CDCDCD'}" />
+                <div style="position: relative; left: 5px;display: inline-block;">普通预录</div>
+              </el-button>
+              <br>
+              <el-button class="broadcast-mode-button" @click="selectedVideoMode('EMERGENCY_RECORDING')">
+                <div class="pa-check-box" :style="{background: videoMode==='EMERGENCY_RECORDING'?'#2EFF74':'#CDCDCD'}" />
+                <div style="position: relative; left: 5px;display: inline-block; color: #f00;">紧急预录</div>
+              </el-button>
+            </el-col>
+          </el-row>
+          <el-row style="padding-bottom: 10px">
+            <el-col :span="12">
+              <el-button class="broadcast-mode-button" @click="showBroadcastContent">广播内容</el-button>
+            </el-col>
+            <el-col :span="12">
+              <el-button class="broadcast-mode-button" @click="stopBroadcast">广播停止</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="background-music">
+          <el-row>
+            <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">背景音乐</div></el-col>
+          </el-row>
+          <el-row style="padding-bottom: 10px">
+            <el-col :span="12"><el-button class="broadcast-mode-button" @click="playBgm">播放音乐</el-button></el-col>
+            <el-col :span="12"><el-button class="broadcast-mode-button" @click="stopBgm">停止音乐</el-button></el-col>
+          </el-row>
+        </div>
+      </div>
+    </div>
+    <div>
+      <div class="pa-grey-box" />
+      <div class="pa-statements">
+        <state-table />
+      </div>
+    </div>
+    <voice-broadcast ref="voiceBroadcast" :resources-list="resourcesList" @releaseBroadcast="releaseBroadcast" />
+    <audio id="voice" controls style="width: 0;height: 0;" />
+  </div>
+</template>
+
+<script>
+import { getByGroupStationList } from '@/api/jmap/map';
+import { queryIscsDeviceCod } from '@/api/iscs';
+import { queryIscsResourcesByGroup } from '@/api/simulation';
+import MusicIcon from '@/assets/iscs_icon/music_icon.png';
+import StateTable from './stateTable';
+import VoiceBroadcast from './voiceBroadcast';
+import { getToken } from '@/utils/auth';
+import { sendCommandNew } from '@/api/jmap/training';
+import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+export default {
+    name: 'CenterHome',
+    components: {
+        StateTable,
+        VoiceBroadcast
+    },
+    data() {
+        return {
+            mes: '1111',
+            voiceUrl: '',
+            verticalHeader: [
+                {name: '车站', title: '全线', key: 'station', type: 'header', active: false},
+                {name: '站厅', title: '全站厅', key: 'stationHall', type: 'checkBox', active: false, position: 'LCD'},
+                {name: '上行站台', title: '全上行站台', key: 'uplinkStation', type: 'checkBox', active: false, position: 'UP_STAND'},
+                {name: '下行站台', title: '全下行站台', key: 'downlinkStation', type: 'checkBox', active: false, position: 'DOWN_STAND'},
+                {name: '办公区', title: '全办公区', key: 'officeArea', type: 'checkBox', active: false, position: 'ADMINISTRATIVE_AREA'},
+                {name: '出入口', title: '全出入口', key: 'passageway', type: 'checkBox', active: false, position: 'GATE'},
+                {name: '换乘通道', title: '全换乘通道', key: 'channel', type: '', active: false, position: 'TRANSFER_CHANNEL'}
+            ],
+            verticalIndexList: ['LCD', 'UP_STAND', 'DOWN_STAND', 'ADMINISTRATIVE_AREA', 'GATE', 'TRANSFER_CHANNEL'],
+            musicIcon: MusicIcon,
+            selectedAreaList: [],
+            stationList: [],
+            iscsDeviceList: [],
+            resourcesList: [],
+            videoMode: 'RECORDING',
+            iscsDeviceMap: {},
+            bgmResources: '',
+            deviceMap: {}
+        };
+    },
+    computed: {
+        tableWidth() {
+            return this.stationList.length * 135 + 80;
+        }
+    },
+    watch: {
+        '$store.state.socket.iscsStatePaMessages': function (list) {
+            if (list && list.length) {
+                list.forEach(item => {
+                    const index = this.iscsDeviceMap[item.code];
+                    if (index) {
+                        this.$set(this.deviceMap[index], 'state', item.state);
+                        const div = document.getElementById('state-' + index);
+                        if (div) {
+                            switch (item.state) {
+                            case '0':
+                                div.style.background = '#CCCCCC';
+                                break;
+                            case '1':
+                                div.style.background = '#FF0000';
+                                break;
+                            case '2':
+                                div.style.background = '#880000';
+                                break;
+                            case '3':
+                                div.style.background = '#0000FF';
+                                break;
+                            case '4':
+                                div.style.background = '#554488';
+                                break;
+                            case '5':
+                                div.style.background = '#44CC55';
+                                break;
+                            case '6':
+                                div.style.background = '#FF00FF';
+                                break;
+                            case '7':
+                                div.style.background = '#887711';
+                                break;
+                            case '8':
+                                div.style.background = '#006600';
+                                break;
+                            case '9':
+                                div.style.background = '#778877';
+                                break;
+                            case '10':
+                                div.style.background = '#555454';
+                                break;
+                            case '11':
+                                div.style.background = '#556688';
+                                break;
+                            case '12':
+                                div.style.background = '#887711';
+                                break;
+                            case '13':
+                                div.style.background = '#115577';
+                                break;
+                            case '♬':
+                                div.style.background = '';
+                                break;
+                            }
+                        }
+                    }
+                });
+            }
+        }
+    },
+    async created () {
+        // 请求当前线路车站列表
+        const res = await getByGroupStationList(this.$route.query.group);
+        if (res.code == 200) {
+            this.stationList = [];
+            res.data.forEach(station => {
+                if (!station.depot) {
+                    this.stationList.push(station);
+                }
+            });
+        }
+        const resp = await queryIscsDeviceCod({ mapId: this.$route.query.mapId, system: 'PA' });
+        if (resp.code == 200) {
+            this.iscsDeviceList = resp.data;
+            this.subscribe();
+        }
+        const params = { system: 'PA', type: 'BGM' };
+        queryIscsResourcesByGroup( this.$route.query.group, params).then(resp => {
+            this.bgmResources = resp.data && resp.data[0] ? resp.data[0].resources : [];
+        }).catch( () => {
+            this.$message.error('获取广播资源列表失败！');
+        } );
+        this.getResourcesList();
+    },
+    beforeDestroy() {
+        this.clearSubscribe();
+    },
+    methods: {
+        getResourcesList() {
+            const params = {system: 'PA', type: this.videoMode };
+            queryIscsResourcesByGroup(this.$route.query.group, params).then(resp => {
+                this.resourcesList = resp.data && resp.data[0] ? resp.data[0].resources : [];
+            }).catch( () => {
+                this.$message.error('获取广播资源列表失败！');
+            } );
+        },
+        playBgm() {
+            const iscsDeviceCodes = [];
+            this.selectedAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            if (this.bgmResources && this.bgmResources[0]) {
+                const params = {
+                    resourceId: this.bgmResources[0].id,
+                    iscsDeviceCodes: iscsDeviceCodes,
+                    type: 'BGM'
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
+                    const bgmUrl = this.$store.state.user.ossUrl + this.bgmResources[0].url;
+                    const audio = document.getElementById('voice');
+                    audio.src = bgmUrl;
+                    audio.play();
+                }).catch(() => {
+                    this.$message.error('背景音乐播放失败！');
+                });
+            } else {
+                this.$message.error('暂无背景音乐数据！');
+            }
+        },
+        stopBgm() {
+            const iscsDeviceCodes = [];
+            this.selectedAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
+                const audio = document.getElementById('voice');
+                audio.pause();
+            }).catch(() => {
+                this.$message.error('背景音乐终止播放失败！');
+            });
+        },
+        stopBroadcast() {
+            const iscsDeviceCodes = [];
+            this.selectedAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
+                const audio = document.getElementById('voice');
+                audio.pause();
+            }).catch(() => {
+                this.$message.error('广播终止播放失败！');
+            });
+        },
+        releaseBroadcast(voice) {
+            const iscsDeviceCodes = [];
+            this.selectedAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            const params = {
+                resourceId: voice.id,
+                iscsDeviceCodes: iscsDeviceCodes,
+                type: this.videoMode
+            };
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
+                this.voiceUrl = this.$store.state.user.ossUrl + voice.url;
+                const audio = document.getElementById('voice');
+                audio.src = this.voiceUrl;
+                audio.play();
+            }).catch(() => {
+                this.$message.error('发布广播失败！');
+            });
+        },
+        clickArea(i, j) {
+            if (this.selectedAreaList.includes(i + '-' + j)) {
+                const index = this.selectedAreaList.indexOf(i + '-' + j);
+                this.selectedAreaList.splice(index, 1);
+            } else {
+                this.selectedAreaList.push(i + '-' + j);
+            }
+        },
+        checkHasDevice(item, station, index) {
+            const device = this.iscsDeviceList.find(elem => elem.station == station.code && elem.position == item.position);
+            this.deviceMap[index] = device;
+            if (device) { this.iscsDeviceMap[device.code] = index; }
+            return !!device;
+        },
+        selectedBatch(data) {
+            data.active = !data.active;
+            if (data.key == 'station') {
+                this.selectedAll(data);
+            } else {
+                let areaIndex;
+                this.verticalHeader.map((item, index) => {
+                    if (item.key === data.key) {
+                        areaIndex = index;
+                    }
+                });
+                const flag = data.active;
+                for (let j = 0; j < this.stationList.length; j++) {
+                    if (!this.selectedAreaList.includes(areaIndex + '-' + j) && flag) {
+                        this.selectedAreaList.push(areaIndex + '-' + j);
+                    } else if (!flag) {
+                        const index = this.selectedAreaList.indexOf(areaIndex + '-' + j);
+                        this.selectedAreaList.splice(index, 1);
+                    }
+                }
+            }
+        },
+        selectedAll(data) {
+            const flag = data.active;
+            this.selectedAreaList = [];
+            for (let i = 1; i < this.verticalHeader.length; i++) {
+                for (let j = 0; j < this.stationList.length; j++) {
+                    if (flag) {
+                        this.selectedAreaList.push(i + '-' + j);
+                    }
+                }
+            }
+        },
+        checkSelectedStation(stationIndex) {
+            let selectedStationFlag = true;
+            for (let i = 1; i < this.verticalHeader.length; i++) {
+                if (!this.selectedAreaList.includes(i + '-' + stationIndex)) {
+                    selectedStationFlag = false;
+                }
+            }
+            return selectedStationFlag;
+        },
+        selectedStation(stationCode) {
+            let stationIndex;
+            this.stationList.forEach((item, index) => {
+                if (item.code === stationCode) {
+                    stationIndex = index;
+                }
+            });
+            const flag = this.checkSelectedStation(stationIndex);
+            for (let i = 1; i < this.verticalHeader.length; i++) {
+                if (!this.selectedAreaList.includes(i + '-' + stationIndex) && !flag) {
+                    this.selectedAreaList.push(i + '-' + stationIndex);
+                } else if (flag) {
+                    const index = this.selectedAreaList.indexOf(i + '-' + stationIndex);
+                    this.selectedAreaList.splice(index, 1);
+                }
+            }
+        },
+        selectedVideoMode(mode) {
+            this.videoMode = mode;
+            this.getResourcesList();
+        },
+        showBroadcastContent() {
+            this.$refs.voiceBroadcast.doShow();
+        },
+        subscribe() {
+            this.clearSubscribe();
+            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
+            creatSubscribe(getTopic('ISCSPA', this.$route.query.group ), header);
+            this.$store.dispatch('app/animationsClose');
+        },
+        clearSubscribe() {
+            clearSubscribe(getTopic('ISCSPA', this.$route.query.group));
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	/deep/{
+		.el-button{
+			border-radius: 0 !important;
+			color: #333 !important;
+			width: 100% !important;
+		}
+	}
+
+    .area-selection{
+        text-align: center;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        width: 5%;
+        float: left;
+        margin-top: 63px;
+        margin-left: 1%;
+    }
+    .area-selection-button{
+        width: 90%;
+        padding: 6px 0;
+        margin-bottom: 10px;
+        font-size: 10px;
+        background: #CCCCCC;
+        display: inline-block;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #565656;
+        border-bottom: 2px solid #565656;
+        cursor: default;
+		margin-left: 0;
+		&:active,
+        &.active{
+            background: #cccccc;
+			border-top: 2px solid #9c9c9c;
+			border-left: 2px solid #9c9c9c;
+			border-right: 2px solid #fff;
+			border-bottom: 2px solid #fff;
+        }
+    }
+    .broadcast-form{
+        text-align: center;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        width: 80%;
+        height: 340px;
+        margin-left: 10px;
+        float: left;
+        margin-top: 63px;
+        overflow-x: auto;
+        padding-top: 20px;
+        position: relative;
+    }
+    .table-grid{
+        width: 135px;
+        display: inline-block;
+        padding-left: 10px;
+        margin-bottom: 10px;
+        font-size: 12px;
+    }
+    .left-header{
+        width: 120px;
+        height: 32px;
+        display: inline-block;
+        padding-left: 20px;
+        font-size: 14px;
+        text-align: left;
+        color: #A2E8EB;
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: #45607B;
+        z-index: 10;
+    }
+    .pa-table-header{
+        background: #cccccc;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #898888;
+        border-bottom: 2px solid #898888;
+		font-size: 12px;
+		padding: 0;
+		&:active,
+        &.active{
+            background: #cccccc;
+			border-top: 2px solid #9c9c9c;
+			border-left: 2px solid #9c9c9c;
+			border-right: 2px solid #fff;
+			border-bottom: 2px solid #fff;
+        }
+    }
+    .pa-table-content{
+        margin:0 auto;
+        height: 18px;
+        width: 18px;
+        background: #D4D4D4;
+        display: inline-block;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #898888;
+        border-bottom: 2px solid #898888;
+    }
+    .pa-table-content-inside{
+        height: 10px;
+        width: 10px;
+        margin: auto;
+        background:#CCCCCC;
+        position: relative;
+        top: 50%;
+        transform: translateY(-50%);
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #898888;
+        border-bottom: 2px solid #898888;
+    }
+    .pa-grey-box{
+        float: left;
+        margin-left: 5%;
+        margin-top: 10px;
+        top: 500px;
+        width: 78%;
+        height: 240px;
+        background: #DDDDDD;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+    }
+    .pa-statements{
+        float: right;
+        margin-right: 1%;
+        margin-top: 50px;
+        width: 15%;
+        height: 30%;
+        font-size: 12px;
+        color: #fff;
+    }
+    .broadcast-mode{
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        font-size: 12px;
+        margin-bottom: 13px;
+    }
+    .broadcast-mode-button{
+        height: 30px;
+        text-align: center;
+        background: #CCCCCC;
+        width: 85%;
+        line-height: 28px;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #898888;
+        border-bottom: 2px solid #898888;
+        cursor: default;
+		padding: 0;
+		&:active,
+        &.active{
+            background: #cccccc;
+			border-top: 2px solid #9c9c9c;
+			border-left: 2px solid #9c9c9c;
+			border-right: 2px solid #fff;
+			border-bottom: 2px solid #fff;
+        }
+    }
+    .broadcast-operations{
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        font-size: 12px;
+        background: #778899;
+        margin-bottom: 13px;
+    }
+    .pa-check-box{
+        position: relative;
+        display: inline-block;
+        left: 3px;
+        width: 12px;
+        height: 12px;
+        background: #2EFF74;
+        border-top: 2px solid #898888;
+        border-left: 2px solid #898888;
+        border-right: 2px solid #fff;
+        border-bottom: 2px solid #fff;
+    }
+    .background-music{
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        font-size: 12px;
+        background: #778899;
+    }
+    ::-webkit-scrollbar {
+        width: 2px;
+        height: 6px;
+    }
+	.iscs-pa-table {
+		height: 32px;
+	}
+	.pa-tabel-state-box{
+		display: inline-block;
+		margin-left: 5px;
+		width: 20px;
+		text-align: center;
+		height: 18px;
+		line-height: 18px;
+		transform: translateY(-25%);
+		color: #000;
+	}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/homeScreen.vue b/src/views/iscs/iscsSystemNew/config/broadcast/homeScreen.vue
new file mode 100644
index 000000000..df709e5dc
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/broadcast/homeScreen.vue
@@ -0,0 +1,41 @@
+<template>
+  <div style="height: 100%; overflow-y: auto;">
+    <center-home v-if="currentSystem === 'center' || stationId === 'controlCenter'" />
+    <station-home v-else-if="currentSystem === 'local' || stationId" :station-id="stationId" />
+  </div>
+</template>
+
+<script>
+import CenterHome from './centerHome';
+import StationHome from './stationHome';
+export default {
+    name: 'HomeScreen',
+    components: {
+        CenterHome,
+        StationHome
+    },
+    props: {
+        stationId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            currentSystem: ''
+        };
+    },
+    // watch:{
+    //     $route() {
+    //         this.currentSystem = this.$route.query.currentSystem;
+    //     }
+    // },
+    mounted() {
+    //     this.currentSystem = this.$route.query.currentSystem;
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/realTimeBroadcast.vue b/src/views/iscs/iscsSystemNew/config/broadcast/realTimeBroadcast.vue
new file mode 100644
index 000000000..845e3c6f8
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/broadcast/realTimeBroadcast.vue
@@ -0,0 +1,119 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :visible.sync="visible"
+    width="600px"
+    :before-close="doClose"
+    class="iscs-voice-broadcast-dialog"
+  >
+    <div>
+      <div class="dialog-header">实时广播</div>
+      <div class="secondary-title">信息内容</div>
+      <el-input
+        v-model="messageContent"
+        type="textarea"
+        :row="4"
+        placeholder="请输入内容"
+      />
+      <div class="release-button" @click="releaseRealTime">发布</div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'RealTimeBroadcast',
+    props: {
+        resourcesList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            visible: false,
+            messageContent: ''
+        };
+    },
+    methods:{
+        doClose() {
+            this.visible = false;
+        },
+        doShow() {
+            this.visible = true;
+        },
+        releaseRealTime() {
+            this.visible = false;
+            this.$emit('releaseRealTime', this.messageContent);
+            this.messageContent = '';
+        }
+    }
+};
+</script>
+
+<style scoped>
+.dialog-header{
+	text-align: center;
+	font-size: 28px;
+	margin-bottom: 15px;
+}
+.information-description-box{
+	height: 100px;
+	width: 100%;
+	background: #DCDCDC;
+	border-left: 2px solid #898888;
+	overflow-x: auto;
+	overflow-y: auto;
+}
+.information-box{
+	white-space: nowrap;
+	background: #DCDCDC;
+	margin-top: 2px;
+	cursor: pointer;
+}
+.secondary-title{
+	text-align: center;
+	width: 100%;
+	font-size: 18px;
+	background: #A9A9A9;
+	border-top: 2px solid #898888;
+	border-left: 2px solid #898888;
+	border-right: 2px solid #fff;
+	border-bottom: 2px solid #fff;
+}
+.information-context-box{
+	background: #DCDCDC;
+	width: 100%;
+	height: 200px;
+	overflow-y: auto;
+}
+.release-button{
+	position: absolute;
+	right: 20px;
+	background: #CCCCCC;
+	color: #000;
+	font-weight: bold;
+	margin-top: 10px;
+	padding: 7px 15px;
+	border-top: 2px solid #fff;
+	border-left: 2px solid #fff;
+	border-right: 2px solid #454541;
+	border-bottom: 2px solid #454541;
+	cursor: pointer;
+}
+</style>
+<style>
+.iscs-voice-broadcast-dialog .el-dialog__body{
+	background: #A9A9A9;
+	padding-top: 10px;
+	padding-bottom: 60px;
+}
+.iscs-voice-broadcast-dialog .el-dialog__headerbtn{
+	top: 10px;
+}
+.iscs-voice-broadcast-dialog .el-dialog__header{
+	background-image: linear-gradient(#FFE4C4, #F4A460, #FFE4C4);
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/stateTable.vue b/src/views/iscs/iscsSystemNew/config/broadcast/stateTable.vue
new file mode 100644
index 000000000..fda5e22b0
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/broadcast/stateTable.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #CCCCCC;color: #000; text-align: center">0</div></el-col>
+      <el-col :span="9"><div>没有占用</div></el-col>
+      <el-col :span="3"><div style="background: #887711;color: #000; text-align: center">7</div></el-col>
+      <el-col :span="9"><div>总调话筒口播</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #FF0000;color: #000; text-align: center">1</div></el-col>
+      <el-col :span="9"><div>车站消防广播</div></el-col>
+      <el-col :span="3"><div style="background: #006600;color: #000; text-align: center">8</div></el-col>
+      <el-col :span="9"><div>行调话筒口播</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #880000;color: #000; text-align: center">2</div></el-col>
+      <el-col :span="9"><div>联动消防广播</div></el-col>
+      <el-col :span="3"><div style="background: #778877;color: #000; text-align: center">9</div></el-col>
+      <el-col :span="9"><div>中心普通预录</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #0000FF;color: #000; text-align: center">3</div></el-col>
+      <el-col :span="9"><div>环调话筒广播</div></el-col>
+      <el-col :span="3"><div style="background: #555454;color: #000; text-align: center">10</div></el-col>
+      <el-col :span="9"><div>车站普通预录</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #554488;color: #000; text-align: center">4</div></el-col>
+      <el-col :span="9"><div>中心紧急预录</div></el-col>
+      <el-col :span="3"><div style="background: #556688;color: #000; text-align: center">11</div></el-col>
+      <el-col :span="9"><div>ATS预录</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #44CC55;color: #000; text-align: center">5</div></el-col>
+      <el-col :span="9"><div>车站话筒口播</div></el-col>
+      <el-col :span="3"><div style="background: #887711;color: #000; text-align: center">12</div></el-col>
+      <el-col :span="9"><div>故障</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="background: #FF00FF;color: #000; text-align: center">6</div></el-col>
+      <el-col :span="9"><div>车站紧急预录</div></el-col>
+      <el-col :span="3"><div style="background: #115577;color: #000; text-align: center">13</div></el-col>
+      <el-col :span="9"><div>设备通讯失败</div></el-col>
+    </el-row>
+    <el-row style="margin-bottom: 10px" :gutter="10">
+      <el-col :span="3"><div style="color: #000;font-size: 16px">♬</div></el-col>
+      <el-col :span="9"><div>背景音乐</div></el-col>
+      <el-col :span="3"><div style="background: #FFFFFF;width: 22px;height: 13px;"><div class="pa-check-box-small" /></div></el-col>
+      <el-col :span="9"><div>被选择</div></el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import MusicIcon from '@/assets/iscs_icon/music_icon.png';
+export default {
+    name: 'StateTable',
+    data() {
+        return {
+            musicIcon: MusicIcon
+        };
+    }
+};
+</script>
+
+<style scoped>
+    .pa-check-box-small{
+        position: relative;
+        left: 6px;
+        top: 2px;
+        width: 10px;
+        height:9px;
+        background: #27FF27;
+        border-top: 1px solid #FFF;
+        border-left: 1px solid #FFF;
+        border-right: 1px solid #898888;
+        border-bottom: 1px solid #898888;
+    }
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue b/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue
new file mode 100644
index 000000000..977d94846
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/broadcast/stationHome.vue
@@ -0,0 +1,944 @@
+<template>
+  <div>
+    <div style="position: absolute; left: 38%; top: 15%;font-size: 20px;color: #9EEBEF;">语音广播</div>
+    <div class="area-selection">
+      <el-row style="background: #000077;text-align: center;color: #fff;font-size: 13px;height: 20px;line-height: 20px">
+        <el-col :span="3" :offset="5"><div>站厅</div></el-col>
+        <el-col :span="3"><div>上行站台</div></el-col>
+        <el-col :span="3"><div>下行站台</div></el-col>
+        <el-col :span="3"><div>办公区</div></el-col>
+        <el-col :span="3"><div>出入口</div></el-col>
+        <el-col :span="3"><div>换乘通道</div></el-col>
+      </el-row>
+      <el-row style="border-bottom: 3px solid #fff;height: 60px;">
+        <el-col :span="5">
+          <div class="broadcast-mode-button" style="width: 70px;left: 5%;" @click="selecteAllArea">
+            <div class="pa-check-box" :style="{background: enableAreaList.length === 6 ? '#2EFF74':'#CDCDCD'}" />
+            <div style="position: relative; left: 1px;display: inline-block;">全车站</div>
+          </div>
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('LCD')" class="broadcast-mode-button" @click="selectedArea('LCD')">
+            <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('LCD')? '#2EFF74':'#CDCDCD'}" />
+            <div id="LCD" class="pa-state-box">{{ deviceMap['LCD'].state }}</div>
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('UP_STAND')" class="broadcast-mode-button" @click="selectedArea('UP_STAND')">
+            <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('UP_STAND')? '#2EFF74':'#CDCDCD'}" />
+            <div id="UP_STAND" class="pa-state-box">{{ deviceMap['UP_STAND'].state }}</div>
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('DOWN_STAND')" class="broadcast-mode-button" @click="selectedArea('DOWN_STAND')">
+            <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('DOWN_STAND')? '#2EFF74':'#CDCDCD'}" />
+            <div id="DOWN_STAND" class="pa-state-box">{{ deviceMap['DOWN_STAND'].state }}</div>
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('ADMINISTRATIVE_AREA')" class="broadcast-mode-button" @click="selectedArea('ADMINISTRATIVE_AREA')">
+            <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('ADMINISTRATIVE_AREA')? '#2EFF74':'#CDCDCD'}" />
+            <div id="ADMINISTRATIVE_AREA" class="pa-state-box">{{ deviceMap['ADMINISTRATIVE_AREA'].state }}</div>
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('GATE')" class="broadcast-mode-button" @click="selectedArea('GATE')">
+            <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('GATE')? '#2EFF74':'#CDCDCD'}" />
+            <div id="GATE" class="pa-state-box">{{ deviceMap['GATE'].state }}</div>
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('TRANSFER_CHANNEL')" class="broadcast-mode-button" @click="selectedArea('TRANSFER_CHANNEL')">
+            <div class="pa-check-box" style="right: 10px;" :style="{background: enableAreaList.includes('TRANSFER_CHANNEL')? '#2EFF74':'#CDCDCD'}" />
+            <div id="TRANSFER_CHANNEL" class="pa-state-box">{{ deviceMap['TRANSFER_CHANNEL'].state }}</div>
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="5"><div class="broadcast-atc-button">ATC广播</div></el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('LCD')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('LCD')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('LCD')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('UP_STAND')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('UP_STAND')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('UP_STAND')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('DOWN_STAND')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('DOWN_STAND')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('DOWN_STAND')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('ADMINISTRATIVE_AREA')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('ADMINISTRATIVE_AREA')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('ADMINISTRATIVE_AREA')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('GATE')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('GATE')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('GATE')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+        <el-col :span="3">
+          <div v-if="checkHasDevice('TRANSFER_CHANNEL')" class="broadcast-use-button" :style="{color: atcBroadcast.includes('TRANSFER_CHANNEL')? '#2EFF74':'#CDCDCD'}">
+            {{ this.atcBroadcast.includes('TRANSFER_CHANNEL')? '启用':'未启用' }}
+          </div>
+          <div v-else style="width: 10px;height: 10px;" />
+        </el-col>
+      </el-row>
+    </div>
+    <div class="pre-taped-broadcast">
+      <el-row style="background: #000077;color: #fff;font-size: 13px;height: 28px;line-height: 28px">
+        <el-col><div style="position: relative;left: 5px;">预录制广播</div></el-col>
+      </el-row>
+      <el-row :gutter="10">
+        <el-col :span="2">
+          <div class="broadcast-mode-button" style="left: 5%;width: 80px;top: 20px;" @click="selectedVideoMode('RECORDING')">
+            <div class="pa-check-box" :style="{background: videoMode === 'RECORDING'? '#2EFF74': '#CDCDCD'}" />
+            <div style="position: relative; left: 1px;display: inline-block;">普通预录</div>
+          </div>
+          <div class="broadcast-mode-button" style="left: 5%;width: 80px;margin-top: 15px" @click="selectedVideoMode('EMERGENCY_RECORDING')">
+            <div class="pa-check-box" :style="{background: videoMode === 'EMERGENCY_RECORDING'? '#2EFF74': '#CDCDCD'}" />
+            <div style="position: relative; left: 1px;display: inline-block;">紧急预录</div>
+          </div>
+          <div class="broadcast-mode-button" style="left: 5%;width: 80px;margin-top: 30px">
+            <div style="position: relative; left: 1px;display: inline-block;" @click="releaseBroadcast">播放</div>
+          </div>
+        </el-col>
+        <el-col :span="6">
+          <div>
+            <div class="information-description">信息描述</div>
+            <div style="overflow-y: auto;height: 150px;background: #fff;">
+              <div
+                v-for="(item,index) in resourcesList"
+                :key="index"
+                :style="{background: messageIndex === index? '#4169cc':'#fff'}"
+                class="information-description-box"
+                @click="chooseMessage(index)"
+              >
+                {{ item.name }}
+              </div>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="16">
+          <div>
+            <div class="information-description">广播内容</div>
+            <div style="overflow-y: auto;height: 150px;background: #fff;">
+              <div class="broadcast-content">{{ resourcesList[messageIndex] ? resourcesList[messageIndex].desc: '' }}</div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="time-control-pa-home">
+      <el-row :gutter="50">
+        <el-col :span="2">
+          <div class="time-control-button">时间控制</div>
+        </el-col>
+        <el-col :span="20">
+          <el-row :gutter="20" style="margin-top: 5px; font-size: 13px">
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">排定描述</div>
+            </el-col>
+            <el-col :span="22">
+              <el-input v-model="addModel.desc" size="mini" style="width: 100%" /></el-col>
+          </el-row>
+          <el-row style="margin-top: 5px; font-size: 13px">
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">开始时间</div>
+            </el-col>
+            <el-col :span="5">
+              <el-date-picker
+                v-model="addModel.startTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期时间"
+                size="mini"
+              />
+            </el-col>
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">结束时间</div>
+            </el-col>
+            <el-col :span="5">
+              <el-date-picker
+                v-model="addModel.endTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期时间"
+                size="mini"
+              />
+            </el-col>
+            <el-col :span="2">
+              <div style="width: 65px;color: #FFF;text-align: center;height: 28px;line-height: 28px">延时时间</div>
+            </el-col>
+            <el-col :span="5">
+              <el-time-picker
+                v-model="addModel.delayTime"
+                value-format="HH:mm:ss"
+                placeholder="选择时间"
+                size="mini"
+              />
+            </el-col>
+            <el-col :span="1">
+              <div class="time-control-button-small" @click="setToday">今日</div>
+            </el-col>
+            <el-col :span="1">
+              <div class="time-control-button-small" @click="setOnce">一次</div>
+            </el-col>
+            <el-col :span="1">
+              <div class="time-control-button-small" style="width: 43px;" @click="setNoEnd">无截至</div>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
+          <div class="time-control-button-small" style="height: 50px;width: 50px; position: relative;top: 10px;right: 30px;line-height: 14px;padding-top: 10px;padding-left: 10px" @click="setTimerBroadcast">设定<br>确认</div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="pa-grey-box">
+      <template v-for="(item, index) in timedList">
+        <el-row :key="index" style="display: flex; align-items: center;">
+          <el-col :span="5">{{ item.desc|| '--' }}</el-col>
+          <el-col :span="5">{{ item.startTime|| '--' }}</el-col>
+          <el-col :span="5">{{ item.endTime|| '--' }}</el-col>
+          <el-col :span="5">{{ item.delayTime|| '--' }}</el-col>
+          <el-col :span="4"><el-button type="text" @click="removeTimed(item)">删除</el-button></el-col>
+        </el-row>
+      </template>
+    </div>
+    <div style="position: absolute; left: 73%; top: 67%;width: 13%;height: 30%;font-size: 12px;color: #fff;"><state-table /></div>
+    <div class="broadcast-mode">
+      <el-row>
+        <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">实时广播</div></el-col>
+        <el-col :span="12"><div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;" @click="realTimeBroadCast">广播</div></el-col>
+      </el-row>
+    </div>
+    <div class="broadcast-mode" style="top: 25%;">
+      <el-row>
+        <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">广播中断</div></el-col>
+        <el-col :span="12"><div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;" @click="stopBroadcast">广播停止</div></el-col>
+      </el-row>
+    </div>
+    <div class="broadcast-mode" style="top: 31%;">
+      <el-row>
+        <el-col :span="12"><div style="height: 40px;text-align: center; background: #000088;color: #fff;line-height: 40px">广播监听</div></el-col>
+        <el-col :span="12"><div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;">监听</div></el-col>
+      </el-row>
+    </div>
+    <div class="broadcast-mode" style="top:37%;">
+      <el-row>
+        <el-col :span="12"><div style="height: 80px;text-align: center; background: #000088;color: #fff;line-height: 80px">ATC广播</div></el-col>
+        <el-col :span="12">
+          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;" @click="enableAtcBroadcast">启用</div>
+          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%; margin-top: 5px" @click="stopAtcBroadcast">停用</div>
+        </el-col>
+      </el-row>
+    </div>
+    <div class="broadcast-mode" style="top: 47%;">
+      <el-row>
+        <el-col :span="12"><div style="height: 80px;text-align: center; background: #000088;color: #fff;line-height: 80px">背景音乐</div></el-col>
+        <el-col :span="12">
+          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%;" @click="playBgm">播放音乐</div>
+          <div class="broadcast-mode-button" style="top: 5px; left: 10%;width: 80%; margin-top: 5px" @click="stopBgm">停止音乐</div>
+        </el-col>
+      </el-row>
+    </div>
+    <audio id="lcd_voice" controls style="width: 0;height: 0;" />
+    <audio id="up_stand_voice" controls style="width: 0;height: 0;" />
+    <audio id="down_stand_voice" controls style="width: 0;height: 0;" />
+    <audio id="administrative_area_voice" controls style="width: 0;height: 0;" />
+    <audio id="gate_area_voice" controls style="width: 0;height: 0;" />
+    <audio id="transfer_channel_voice" controls style="width: 0;height: 0;" />
+    <audio id="voice" controls style="width: 0;height: 0;" />
+    <real-time-broadcast ref="realTimeBroadcast" @releaseRealTime="releaseRealTime" />
+  </div>
+</template>
+
+<script>
+import StateTable from './stateTable';
+import { queryIscsDeviceCod } from '@/api/iscs';
+import { queryIscsResourcesByGroup, queryPaTimedList } from '@/api/simulation';
+import { sendCommandNew } from '@/api/jmap/training';
+import { getToken } from '@/utils/auth';
+import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+import RealTimeBroadcast from './realTimeBroadcast';
+export default {
+    name: 'StationHome',
+    components: {
+        StateTable,
+        RealTimeBroadcast
+    },
+    props: {
+        stationId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            addModel: {
+                desc: '',
+                startTime: '',
+                endTime: '',
+                delayTime: ''
+            },
+            enableAreaList: [],
+            atcBroadcast: [],
+            bgmResources: '',
+            videoMode: 'RECORDING',
+            messageIndex: 0,
+            resourcesList: [],
+            iscsDeviceMap: {},
+            iscsDeviceList: [],
+            iscsDeviceState: {},
+            deviceMap: {},
+            timedList: []
+        };
+    },
+    watch: {
+        '$store.state.socket.simulationReset': function(val) {
+            this.initTimedPlayList();
+        },
+        'stationId': function () {
+            const params2 = { mapId: this.$route.query.mapId, system: 'PA', station: this.stationId };
+            queryIscsDeviceCod(params2).then(resp => {
+                this.iscsDeviceList = resp.data;
+                this.iscsDeviceList.forEach(device => {
+                    this.$set(device, 'state', this.iscsDeviceState[device.code] ? this.iscsDeviceState[device.code].state : '0');
+                    this.iscsDeviceMap[device.code] = device;
+                    const div = document.getElementById(device.position);
+                    this.setElementColor(div, device.state);
+                });
+                this.initTimedPlayList();
+            });
+        },
+        '$store.state.socket.iscsStatePaMessages': function (list) {
+            if (list && list.length) {
+                list.forEach(item => {
+                    if (this.iscsDeviceState[item.code]) {
+                        this.iscsDeviceState[item.code] = { ...this.iscsDeviceState[item.code], ...item };
+                    } else {
+                        this.iscsDeviceState[item.code] = item;
+                    }
+                    const device = this.iscsDeviceMap[item.code];
+                    if (device) {
+                        const oldState = parseInt(this.deviceMap[device.position].state);
+                        const newState = parseInt(item.state);
+                        const div = document.getElementById(device.position);
+                        if (!oldState || oldState > newState) {
+                            this.$set(this.deviceMap[device.position], 'state', item.state);
+                            this.setElementColor(div, item.state);
+                            this.playBroadcast(item, device.position);
+                        }
+                        if (!this.atcBroadcast.includes(device.position) && !oldState) {
+                            this.$set(this.deviceMap[device.position], 'state', item.state);
+                            this.setElementColor(div, item.state);
+                        }
+                    }
+                });
+            }
+        }
+    },
+    created() {
+        const params = { system: 'PA', type: 'BGM' };
+        queryIscsResourcesByGroup( this.$route.query.group, params).then(resp => {
+            this.bgmResources = resp.data && resp.data[0] ? resp.data[0].resources : [];
+        }).catch( () => {
+            this.$message.error('获取广播资源列表失败！');
+        } );
+        const params2 = { mapId: this.$route.query.mapId, system: 'PA', station: this.stationId };
+        queryIscsDeviceCod(params2).then(resp => {
+            this.iscsDeviceList = resp.data;
+            this.iscsDeviceList.forEach(device => {
+                this.$set(device, 'state', '0');
+                this.iscsDeviceMap[device.code] = device;
+            });
+            this.subscribe();
+        });
+        this.getResourcesList();
+        this.initTimedPlayList();
+    },
+    beforeDestroy() {
+        this.clearSubscribe();
+    },
+    methods: {
+        setElementColor(div, state) {
+            if (div) {
+                switch (state) {
+                case '0':
+                    div.style.background = '#CCCCCC';
+                    break;
+                case '1':
+                    div.style.background = '#FF0000';
+                    break;
+                case '2':
+                    div.style.background = '#880000';
+                    break;
+                case '3':
+                    div.style.background = '#0000FF';
+                    break;
+                case '4':
+                    div.style.background = '#554488';
+                    break;
+                case '5':
+                    div.style.background = '#44CC55';
+                    break;
+                case '6':
+                    div.style.background = '#FF00FF';
+                    break;
+                case '7':
+                    div.style.background = '#887711';
+                    break;
+                case '8':
+                    div.style.background = '#006600';
+                    break;
+                case '9':
+                    div.style.background = '#778877';
+                    break;
+                case '10':
+                    div.style.background = '#555454';
+                    break;
+                case '11':
+                    div.style.background = '#556688';
+                    break;
+                case '12':
+                    div.style.background = '#887711';
+                    break;
+                case '13':
+                    div.style.background = '#115577';
+                    break;
+                case '♬':
+                    div.style.background = '';
+                    break;
+                }
+            }
+        },
+        getTimeString (full) {
+            const simulationDate = new Date(this.$store.state.socket.simulationTimeSync);
+            console.log(simulationDate, this.$store.state.socket.simulationTimeSync);
+            const year = simulationDate.getFullYear();
+            let month = simulationDate.getMonth() + 1;
+            if (month < 10) {
+                month = '0' + month;
+            }
+            let day = simulationDate.getDate();
+            if (day < 10) {
+                day = '0' + day;
+            }
+            let hour = simulationDate.getHours();
+            if (hour < 10) {
+                hour = '0' + hour;
+            }
+            let minute = simulationDate.getMinutes();
+            if (minute < 10) {
+                minute = '0' + minute;
+            }
+            let second = simulationDate.getSeconds();
+            if (second < 10) {
+                second = '0' + second;
+            }
+            if (full) {
+                return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+            } else {
+                return year + '-' + month + '-' + day;
+            }
+        },
+        setToday() {
+            const dateString = this.getTimeString(false);
+            console.log(dateString, 'today---');
+            this.addModel.startTime = dateString + ' 00:00:00';
+            this.addModel.endTime = dateString + ' 23:59:59';
+            this.addModel.delayTime = '00:01:00';
+        },
+        setOnce() {
+            this.addModel.startTime = this.getTimeString(true);
+            this.addModel.endTime = '';
+            this.addModel.delayTime = '';
+        },
+        setNoEnd() {
+            this.addModel.startTime = this.getTimeString(true);
+            this.addModel.endTime = '';
+            this.addModel.delayTime = '00:01:00';
+        },
+        playBroadcast(info, position) {
+            if (this.stationId === info.stationCode && !['0', '12', '13'].includes(info.state) && this.atcBroadcast.includes(position)) {
+                const audio = document.getElementById(position.toLowerCase() + '_voice');
+                if (!audio) { return; }
+                audio.pause();
+                audio.src = this.$store.state.user.ossUrl + info.url;
+                audio.play();
+                const _that = this;
+                audio.addEventListener('ended', function() {
+                    const device = _that.iscsDeviceMap[info.code];
+                    const div = document.getElementById(device.position);
+                    _that.$set(_that.deviceMap[device.position], 'state', '0');
+                    div.style.background = '#CCCCCC';
+                }, false);
+            }
+        },
+        setTimerBroadcast() {
+            const iscsDeviceCodes = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            if (!this.addModel.desc) {
+                this.$message.error('请填写排定描述！');
+                return;
+            }
+            if (!this.addModel.startTime) {
+                this.$message.error('请选择开始时间！');
+                return;
+            }
+            if (this.resourcesList[this.messageIndex]) {
+                const params = {
+                    resourceId: this.resourcesList[this.messageIndex].id,
+                    iscsDeviceCodes: iscsDeviceCodes,
+                    type: this.videoMode,
+                    desc: this.addModel.desc,
+                    startTime: this.addModel.startTime,
+                    endTime: this.addModel.endTime,
+                    delayTime: this.addModel.delayTime,
+                    stationCode: this.stationId
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Timed_Play', params).then(() => {
+                    this.addModel = { desc: '', startTime: '', endTime: '', delayTime: '' };
+                    this.initTimedPlayList();
+                }).catch(() => {
+                    this.$message.error('设定定时广播失败！');
+                });
+            }
+        },
+        removeTimed(data) {
+            if (data) {
+                const params = {
+                    stationCode: this.stationId,
+                    desc: data.desc
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Remove_Timed_Play', params).then(() => {
+                    this.addModel = { desc: '', startTime: '', endTime: '', delayTime: '' };
+                    this.initTimedPlayList();
+                }).catch(() => {
+                    this.$message.error('设定定时广播失败！');
+                });
+            }
+        },
+        initTimedPlayList() {
+            queryPaTimedList(this.$route.query.group, { stationCode: this.stationId }).then(resp => {
+                this.timedList = resp.data;
+            }).catch(() => { this.$message.error('获取定时广播信息失败！'); });
+        },
+        chooseMessage(index) {
+            this.messageIndex = index;
+        },
+        checkHasDevice(position) {
+            const device = this.iscsDeviceList.find(item => item.position === position);
+            this.deviceMap[position] = device;
+            return !!device;
+        },
+        getResourcesList() {
+            const params = { system: 'PA', type: this.videoMode };
+            queryIscsResourcesByGroup( this.$route.query.group, params).then(resp => {
+                this.resourcesList = resp.data && resp.data[0] ? resp.data[0].resources : [];
+                console.log(resp.data, this.resourcesList);
+            }).catch( () => {
+                this.$message.error('获取广播资源列表失败！');
+            } );
+        },
+        selecteAllArea() {
+            if (this.enableAreaList.length === 6) {
+                this.enableAreaList = [];
+            } else {
+                this.enableAreaList = ['LCD', 'UP_STAND', 'DOWN_STAND', 'ADMINISTRATIVE_AREA', 'GATE', 'TRANSFER_CHANNEL'];
+            }
+        },
+        enableAtcBroadcast() {
+            this.enableAreaList.forEach(item => {
+                if (!this.atcBroadcast.includes(item)) {
+                    this.atcBroadcast.push(item);
+                }
+            });
+        },
+        stopAtcBroadcast() {
+            this.enableAreaList.forEach(item => {
+                const index = this.atcBroadcast.findIndex(elem => item === elem);
+                if (index > -1) {
+                    this.atcBroadcast.splice(index, 1);
+                }
+            });
+        },
+        playBgm() {
+            const iscsDeviceCodes = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择需要发布广播的设备');
+                return;
+            }
+            if (this.bgmResources && this.bgmResources[0]) {
+                const params = {
+                    resourceId: this.bgmResources[0].id,
+                    iscsDeviceCodes: iscsDeviceCodes,
+                    type: 'BGM'
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
+                    // const bgmUrl = this.$store.state.user.resourcesUrl + this.bgmResources[0].url;
+                    // const audio = document.getElementById('voice');
+                    // audio.src = bgmUrl;
+                    // audio.play();
+                }).catch(() => {
+                    this.$message.error('背景音乐播放失败！');
+                });
+            }
+        },
+        stopBgm() {
+            const iscsDeviceCodes = [];
+            const positionList = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                    positionList.push(this.deviceMap[item].position);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
+                positionList.forEach(elem => {
+                    const audio = document.getElementById(elem.toLowerCase() + '_voice');
+                    audio.pause();
+                });
+                const audio = document.getElementById('voice');
+                audio.pause();
+            }).catch(() => {
+                this.$message.error('背景音乐终止播放失败！');
+            });
+        },
+        stopBroadcast() {
+            const iscsDeviceCodes = [];
+            const positionList = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                    positionList.push(this.deviceMap[item].position);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes }).then(resp => {
+                positionList.forEach(elem => {
+                    const audio = document.getElementById(elem.toLowerCase() + '_voice');
+                    audio.pause();
+                });
+                const audio = document.getElementById('voice');
+                audio.pause();
+            }).catch(() => {
+                this.$message.error('广播终止播放失败！');
+            });
+        },
+        realTimeBroadCast() {
+            this.$refs.realTimeBroadcast.doShow();
+        },
+        releaseRealTime(content) {
+            const iscsDeviceCodes = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            const params = {
+                iscsDeviceCodes: iscsDeviceCodes,
+                content: content,
+                type: 'REAL_TIME'
+            };
+            sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(() => {
+            }).catch(() => {
+                this.$message.error('发布广播失败！');
+            });
+        },
+        releaseBroadcast() {
+            const iscsDeviceCodes = [];
+            this.enableAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            if (this.resourcesList[this.messageIndex]) {
+                const params = {
+                    resourceId: this.resourcesList[this.messageIndex].id,
+                    iscsDeviceCodes: iscsDeviceCodes,
+                    type: this.videoMode
+                };
+                sendCommandNew(this.$route.query.group, 'ISCS_PA_Play', params).then(resp => {
+                    // this.voiceUrl = this.$store.state.user.resourcesUrl + this.resourcesList[this.messageIndex].url;
+                    // const audio = document.getElementById('voice');
+                    // audio.src = this.voiceUrl;
+                    // audio.play();
+                }).catch(() => {
+                    this.$message.error('发布广播失败！');
+                });
+            }
+        },
+        selectedArea(area) {
+            if (this.enableAreaList.includes(area)) {
+                const index = this.enableAreaList.indexOf(area);
+                this.enableAreaList.splice(index, 1);
+            } else {
+                this.enableAreaList.push(area);
+            }
+        },
+        selectedVideoMode(mode) {
+            this.videoMode = mode;
+            this.getResourcesList();
+        },
+        subscribe() {
+            this.clearSubscribe();
+            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
+            creatSubscribe(getTopic('ISCSPA', this.$route.query.group ), header);
+            this.$store.dispatch('app/animationsClose');
+        },
+        clearSubscribe() {
+            clearSubscribe(getTopic('ISCSPA', this.$route.query.group));
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+    .area-selection{
+        position: absolute;
+        top: 20%;
+        left: 12%;
+        width: 60%;
+        background: #778899;
+        padding-bottom: 30px;
+        border-top: 3px solid #454541;
+        border-left: 3px solid #454541;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+    }
+    .broadcast-mode-button{
+        height: 30px;
+        text-align: center;
+        background: #CCCCCC;
+        position: relative;
+        top: 13px;
+        width: 50px;
+        left: 30%;
+		cursor: pointer;
+        font-size: 13px;
+        line-height: 28px;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #454541;
+        border-bottom: 2px solid #454541;
+        &.active,
+        &:hover{
+            background: #EBB570;
+            border-top: 2px solid #795B31;
+            border-left: 2px solid #795B31;
+            border-right: 1px solid #fff;
+            border-bottom: 1px solid #fff;
+        }
+    }
+    .pa-check-box{
+        position: relative;
+		left: 2px;
+        display: inline-block;
+        width: 12px;
+        height: 12px;
+        background: #2EFF74;
+        border-top: 2px solid #898888;
+        border-left: 2px solid #898888;
+        border-right: 2px solid #fff;
+        border-bottom: 2px solid #fff;
+    }
+    .broadcast-atc-button{
+        height: 30px;
+        text-align: center;
+        background: #AAAAAA;
+        position: relative;
+        top: 13px;
+        width: 70px;
+        left: 5%;
+        font-size: 13px;
+        line-height: 30px;
+    }
+    .broadcast-use-button{
+        height: 25px;
+        text-align: center;
+        background: #446677;
+        position: relative;
+        top: 16px;
+        width: 50px;
+        left: 30%;
+        font-size: 13px;
+        line-height: 25px;
+        color: #0f0;
+    }
+    .pre-taped-broadcast{
+        position: absolute;
+        top: 37%;
+        height: 230px;
+        left: 12%;
+        width: 60%;
+        background: #778899;
+        padding-bottom: 30px;
+        border-top: 3px solid #454541;
+        border-left: 3px solid #454541;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+    }
+    .information-description{
+        background: #476981;
+        border-top: 1px solid #5D728D;
+        border-left: 1px solid #5D728D;
+        border-right: 1px solid #0C161A;
+        border-bottom: 1px solid #0C161A;
+        font-size: 13px;
+        text-align: center;
+        color: #fff;
+        height: 20px;
+        line-height: 20px;
+        margin-top: 10px;
+    }
+    .information-description-box {
+        background-color: #fff;
+        border-bottom: 1px dotted #000;
+        font-size: 13px;
+        height: 20px;
+        line-height: 20px;
+        overflow:hidden;
+        white-space:nowrap;
+        text-overflow:ellipsis;
+		cursor: pointer;
+    }
+    .broadcast-content{
+        border-bottom: 1px solid #ECECEC;
+        background-color: #fff;
+        font-size: 13px;
+        height: 20px;
+        line-height: 20px;
+        overflow:hidden;
+        white-space:nowrap;
+        text-overflow:ellipsis;
+    }
+    .time-control-pa-home{
+        position: absolute;
+        top: 65%;
+        left: 12%;
+        width: 60%;
+    }
+    .time-control-button{
+        height: 30px;
+        text-align: center;
+        background: #CCCCCC;
+        position: relative;
+        top: 13px;
+        width: 90px;
+        left: 5%;
+        font-size: 13px;
+        line-height: 30px;
+        border-top: 3px solid #fff;
+        border-left: 3px solid #fff;
+        border-right: 3px solid #454541;
+        border-bottom: 3px solid #454541;
+        cursor:default;
+        &.active,
+        &:hover{
+            background: #EBB570;
+            border-top: 2px solid #795B31;
+            border-left: 2px solid #795B31;
+            border-right: 1px solid #fff;
+            border-bottom: 1px solid #fff;
+        }
+    }
+    .time-control-button-small{
+        background: #CCCCCC;
+        width: 32px;
+        font-size: 13px;
+        height: 28px;
+        line-height: 28px;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #454541;
+        border-bottom: 2px solid #454541;
+        cursor:default;
+        &.active,
+        &:hover{
+            background: #EBB570;
+            border-top: 2px solid #795B31;
+            border-left: 2px solid #795B31;
+            border-right: 1px solid #fff;
+            border-bottom: 1px solid #fff;
+        }
+    }
+    .pa-grey-box{
+        position: absolute;
+        left: 12%;
+        top: 74%;
+        width: 60%;
+        height: 18%;
+        background: #DDDDDD;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+    }
+    .broadcast-mode{
+        position: absolute;
+        left: 73%;
+        top: 20%;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        width: 13%;
+        font-size: 12px;
+    }
+	.pa-state-box{
+		position: relative;
+		left: 30px;
+		display: inline-block;
+		color: #000;
+		width: 20px;
+	}
+</style>
+<style>
+    .time-control-pa-home .el-date-editor.el-input, .el-date-editor.el-input__inner{
+        width: 180px;
+    }
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/broadcast/voiceBroadcast.vue b/src/views/iscs/iscsSystemNew/config/broadcast/voiceBroadcast.vue
new file mode 100644
index 000000000..275d6cb44
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/broadcast/voiceBroadcast.vue
@@ -0,0 +1,126 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :visible.sync="visible"
+    width="600px"
+    :before-close="doClose"
+    class="iscs-voice-broadcast-dialog"
+  >
+    <div>
+      <div class="dialog-header">语音广播</div>
+      <div class="secondary-title">信息描述</div>
+      <div class="information-description-box">
+        <div v-for="(item,index) in resourcesList" :key="index">
+          <div class="information-box" :style="{background: messageIndex === index? '#4169cc': '#DCDCDC' }" @click="chooseMessage(index)">{{ item.name }}</div>
+        </div>
+      </div>
+      <div class="secondary-title" style="margin-top: 10px">信息内容显示</div>
+      <div class="information-context-box">{{ resourcesList.length? resourcesList[messageIndex].desc: '' }}</div>
+      <div class="release-button" @click="releaseBroadcast">发布</div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'VoiceBroadcast',
+    props: {
+        resourcesList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            visible: false,
+            messageIndex: 0
+        };
+    },
+    methods:{
+        doClose() {
+            this.visible = false;
+        },
+        chooseMessage(index) {
+            this.messageIndex = index;
+        },
+        doShow() {
+            this.messageIndex = 0;
+            this.visible = true;
+        },
+        releaseBroadcast() {
+            this.visible = false;
+            this.messageIndex = 0;
+            if (this.resourcesList[this.messageIndex]) {
+                this.$emit('releaseBroadcast', this.resourcesList[this.messageIndex]);
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+    .dialog-header{
+        text-align: center;
+        font-size: 28px;
+        margin-bottom: 15px;
+    }
+    .information-description-box{
+        height: 100px;
+        width: 100%;
+        background: #DCDCDC;
+        border-left: 2px solid #898888;
+        overflow-x: auto;
+        overflow-y: auto;
+    }
+    .information-box{
+        white-space: nowrap;
+        background: #DCDCDC;
+        margin-top: 2px;
+		cursor: pointer;
+    }
+    .secondary-title{
+        text-align: center;
+        width: 100%;
+        font-size: 18px;
+        background: #A9A9A9;
+        border-top: 2px solid #898888;
+        border-left: 2px solid #898888;
+        border-right: 2px solid #fff;
+        border-bottom: 2px solid #fff;
+    }
+    .information-context-box{
+        background: #DCDCDC;
+        width: 100%;
+        height: 200px;
+        overflow-y: auto;
+    }
+    .release-button{
+        position: absolute;
+        right: 20px;
+        background: #CCCCCC;
+        color: #000;
+        font-weight: bold;
+        margin-top: 10px;
+        padding: 7px 15px;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #454541;
+        border-bottom: 2px solid #454541;
+        cursor: default;
+    }
+</style>
+<style>
+    .iscs-voice-broadcast-dialog .el-dialog__body{
+        background: #A9A9A9;
+        padding-top: 10px;
+        padding-bottom: 60px;
+    }
+    .iscs-voice-broadcast-dialog .el-dialog__headerbtn{
+        top: 10px;
+    }
+    .iscs-voice-broadcast-dialog .el-dialog__header{
+        background-image: linear-gradient(#FFE4C4, #F4A460, #FFE4C4);
+    }
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pa/radioListeningPA.vue b/src/views/iscs/iscsSystemNew/config/pa/radioListeningPA.vue
new file mode 100644
index 000000000..623d1a819
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pa/radioListeningPA.vue
@@ -0,0 +1,226 @@
+<template>
+  <div class="boradcast_box">
+    <div style="margin: 20px auto 0;text-align: center;font-size: 20px;color: #9EEBEF;">实时监听</div>
+    <div style="overflow: hidden;">
+      <div class="broadcast-form">
+        <div style="width: 120px; height: 300px; float: left; position: absolute; top: 20px;">
+          <div v-for="(item,i) in verticalHeader" :key="i" :style="{top: i * 31.5 +'px'}" class="left-header">{{ item.name }}</div>
+        </div>
+        <div style="float: left; overflow-x: auto; width: 100%; height: 314px;">
+          <div v-for="(item,i) in verticalHeader" :key="i" :style="{width: tableWidth+'px'}" class="iscs-pa-table">
+            <div style="position: relative; left: 80px;">
+              <div v-for="(it, j) in stationList" :key="j" class="table-grid">
+                <el-button v-if="item.type==='header'" class="pa-table-header" @click="selectedStation(it)">
+                  <div style="cursor: default;">{{ it }}</div>
+                </el-button>
+                <div v-if="item.type==='checkBox'">
+                  <div class="pa-table-content" @click="clickArea(i,j)">
+                    <div class="pa-table-content-inside" :style="{background: selectedAreaList.includes(i + '-' + j)? '#2EFF74':'#CDCDCD'}" />
+                  </div>
+                  <div style="display: inline-block;margin-left: 5px;height: 18px;line-height: 18px;transform: translateY(-25%);color: #192780;">0</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom_box">
+        <div class="list-box">
+          <div class="color_box" style="background: #fff;">0</div>
+          <div class="text_box">广播区没有占用</div>
+        </div>
+        <div class="list-box">
+          <div class="color_box" style="background: #1a7913;">5</div>
+          <div class="text_box">广播区占用</div>
+        </div>
+        <div class="list-box">
+          <div class="color_box" style="background: #fff;">
+            <div class="color" />
+          </div>
+          <div class="text_box">被选择</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getByGroupStationList } from '@/api/jmap/map';
+export default {
+    data() {
+        return {
+            verticalHeader: [
+                {name: '车站', title: '全线', key: 'station', type: 'header', active: false},
+                {name: '站厅', title: '全站厅', key: 'stationHall', type: 'checkBox', active: false},
+                {name: '上行站台', title: '全上行站台', key: 'uplinkStation', type: 'checkBox', active: false},
+                {name: '下行站台', title: '全下行站台', key: 'downlinkStation', type: 'checkBox', active: false},
+                {name: '办公区', title: '全办公区', key: 'officeArea', type: 'checkBox', active: false},
+                {name: '出入口', title: '全出入口', key: 'passageway', type: 'checkBox', active: false},
+                {name: '换乘通道', title: '全换乘通道', key: 'channel', type: '', active: false}
+            ],
+            selectedAreaList: [],
+            stationList: []
+        };
+    },
+    computed: {
+        tableWidth() {
+            return this.stationList.length * 135 + 80;
+        }
+    },
+    async created () {
+        // 请求当前线路车站列表
+        const res = await getByGroupStationList(this.$route.query.group);
+        if (res.code == 200) {
+            this.stationList = [];
+            res.data.forEach(station => {
+                if (!station.depot) {
+                    this.stationList.push(station.name);
+                }
+            });
+        }
+    },
+    methods: {
+        checkSelectedStation(stationIndex) {
+            let selectedStationFlag = true;
+            for (let i = 1; i < this.verticalHeader.length; i++) {
+                if (!this.selectedAreaList.includes(i + '-' + stationIndex)) {
+                    selectedStationFlag = false;
+                }
+            }
+            return selectedStationFlag;
+        },
+        selectedStation(station) {
+            let stationIndex;
+            this.stationList.forEach((item, index) => {
+                if (item === station) {
+                    stationIndex = index;
+                }
+            });
+            const flag = this.checkSelectedStation(stationIndex);
+            for (let i = 1; i < this.verticalHeader.length; i++) {
+                if (!this.selectedAreaList.includes(i + '-' + stationIndex) && !flag) {
+                    this.selectedAreaList.push(i + '-' + stationIndex);
+                } else if (flag) {
+                    const index = this.selectedAreaList.indexOf(i + '-' + stationIndex);
+                    this.selectedAreaList.splice(index, 1);
+                }
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	/deep/{
+		.el-button{
+			border-radius: 0 !important;
+			color: #333 !important;
+			width: 100% !important;
+		}
+	}
+	.broadcast-form{
+        text-align: center;
+        border-top: 3px solid #898888;
+        border-left: 3px solid #898888;
+        border-right: 3px solid #fff;
+        border-bottom: 3px solid #fff;
+        width: 80%;
+        height: 340px;
+		margin: 63px auto 30px;
+        overflow-x: auto;
+        padding-top: 20px;
+        position: relative;
+		.left-header{
+			width: 120px;
+			height: 32px;
+			display: inline-block;
+			padding-left: 20px;
+			font-size: 14px;
+			text-align: left;
+			color: #A2E8EB;
+			position: absolute;
+			top: 0;
+			left: 0;
+			background: #45607B;
+			z-index: 10;
+		}
+		.table-grid{
+			width: 135px;
+			display: inline-block;
+			padding-left: 10px;
+			margin-bottom: 10px;
+			font-size: 12px;
+		}
+		.pa-table-header{
+			background: #cccccc;
+			border-top: 2px solid #fff;
+			border-left: 2px solid #fff;
+			border-right: 2px solid #898888;
+			border-bottom: 2px solid #898888;
+			font-size: 12px;
+			padding: 0;
+			&:active,
+			&.active{
+				background: #cccccc;
+				border-top: 2px solid #9c9c9c;
+				border-left: 2px solid #9c9c9c;
+				border-right: 2px solid #fff;
+				border-bottom: 2px solid #fff;
+			}
+		}
+		.pa-table-content{
+			margin:0 auto;
+			height: 18px;
+			width: 18px;
+			background: #D4D4D4;
+			display: inline-block;
+			border-top: 2px solid #fff;
+			border-left: 2px solid #fff;
+			border-right: 2px solid #898888;
+			border-bottom: 2px solid #898888;
+		}
+		.pa-table-content-inside{
+			height: 10px;
+			width: 10px;
+			margin: auto;
+			background:#CCCCCC;
+			position: relative;
+			top: 50%;
+			transform: translateY(-50%);
+			border-top: 2px solid #fff;
+			border-left: 2px solid #fff;
+			border-right: 2px solid #898888;
+			border-bottom: 2px solid #898888;
+		}
+    }
+	.bottom_box{
+		display: table;
+		float: right;
+		margin-right: 14%;
+		.list-box{
+			width: auto;
+			overflow: hidden;
+			margin-bottom: 5px;
+			.color_box{
+				width: 25px;
+				height: 20px;
+				float: left;
+				color: #000;
+				margin-right: 15px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 12px;
+				.color{
+					width: 10px;
+					height: 8px;
+					background: #02c102;
+				}
+			}
+			.text_box{
+				color: #fff;
+				float: left;
+				font-size: 12px;
+				line-height: 19px;
+			}
+		}
+	}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pa/timePreviewPA.vue b/src/views/iscs/iscsSystemNew/config/pa/timePreviewPA.vue
new file mode 100644
index 000000000..e4dceabb2
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pa/timePreviewPA.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="time_preview">
+    <div class="time_preview_header">
+      <div class="preview_header_text">中心广播控制一览</div>
+    </div>
+    <div class="time_preview_content">
+      <el-table cell-class-name="time_preview_column" header-cell-class-name="time_preview_thead" :data="tableData" border style="width:100%;overflow-y: auto;" highlight-current-row height="496">
+        <el-table-column prop="describe" label="信息描述" />
+        <el-table-column prop="startdate" label="开始日期" width="100" />
+        <el-table-column prop="starttime" label="开始时间" width="100" />
+        <el-table-column prop="enddate" label="结束日期" width="100" />
+        <el-table-column prop="endtime" label="结束时间" width="100" />
+        <el-table-column prop="interAmplitude" label="延迟时间" width="100" />
+        <el-table-column prop="grade" label="等级" width="100" />
+        <el-table-column prop="status" label="指定状态" width="180" />
+      </el-table>
+    </div>
+    <div class="time_preview_footer">
+      <div class="preview_footer_top">操作</div>
+      <div class="preview_footer_content">
+        <div class="each_preview_btn">删除</div>
+        <div class="each_preview_btn">停用</div>
+        <div class="each_preview_btn">激活</div>
+        <div class="each_preview_btn">修改</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            tableData:[
+                {describe:'为了您和他人的安全，请不要在车厢内吸烟', startdate: '2018-06-15', starttime:'00:00:00', enddate: '2018-06-15', endtime:'23:59:59', interAmplitude:'00:00:30', grade: '普通', status:'0'},
+                {describe:'手牵手积极防灾，心连心构建和谐家园', startdate: '2018-06-15', starttime:'00:01:32', enddate: '2018-06-15', endtime:'23:59:59', interAmplitude:'00:00:30', grade: '普通', status:'0'},
+                {describe:'严禁携带易燃、易爆、剧毒、放射性、腐蚀性等危险物品', startdate: '2018-06-15', starttime:'00:00:00', enddate: '2018-06-15', endtime:'23:59:59', interAmplitude:'00:00:30', grade: '普通', status:'0'},
+                {describe:'不要轻易给陌生人汇款、转账，谨防上当受骗', startdate: '2018-06-15', starttime:'00:00:00', enddate: '2018-06-15', endtime:'23:59:59', interAmplitude:'00:00:30', grade: '普通', status:'0'}
+            ]
+        };
+    },
+    methods:{
+        indexMethod(index) {
+            return index + 1;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/{
+.time_preview{padding:20px;}
+  .preview_header_text{margin-top:10px;text-align: center;color: #9af1ec;font-size: 18px;padding-bottom: 10px;}
+  .time_preview_content{
+		width: 75%;
+		height:500px;
+		border-top: 2px solid #8c8a89;
+		overflow-y: auto;
+		margin: 20px auto 0;
+		display:flex;
+		border-left: 2px solid #8c8a89;
+		border-right: 2px solid #fff;
+		border-bottom: 2px solid #fff;
+	}
+  .time_preview_footer{width: 75%;margin: 0 auto;border-top: 2px solid #8c8a89;
+    border-left: 2px solid #8c8a89;
+    border-right: 2px solid #fff;
+    border-bottom: 2px solid #fff;background:#aabbbb;}
+  .el-table .time_preview_column .cell{font-size:12px;}
+  .el-table td.time_preview_column{padding:5px 0px;}
+  .preview_footer_top{width: 100%;font-weight:bold;padding:10px 0px;text-align:center;background:#000077;color:#fff;font-size:12px;}
+  .each_preview_btn{
+		width:80px;
+		text-align:center;
+		height:38px;
+		display:flex;
+		align-items: center;
+		justify-content:center;
+		margin-left:4px;
+		font-size:12px;
+		cursor: pointer;
+		vertical-align:top;
+		font-weight:bold;
+		border-top: 3px solid #f9f9f9;
+		border-left: 3px solid #f6f8f8;
+		border-right: 3px solid #565656;
+		border-bottom: 3px solid #565656;
+		background: #cccccc;
+		&:active{
+            background: #cccccc;
+			border-top: 3px solid #9c9c9c;
+			border-left: 3px solid #9c9c9c;
+			border-right: 3px solid #fff;
+			border-bottom: 3px solid #fff;
+        }
+	}
+  .el-table .time_preview_thead{background:#000077;color:#fff;padding: 5px 0px;text-align:center;font-size: 12px;}
+  .preview_footer_content{margin-top:15px;margin-left:20px;margin-bottom:10px;display:flex; justify-content: center; align-items: center;}
+	.current-row>td {
+		background: #91AAC2 !important;
+	}
+}
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pis/emergencyRelease.vue b/src/views/iscs/iscsSystemNew/config/pis/emergencyRelease.vue
new file mode 100644
index 000000000..ad922c621
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pis/emergencyRelease.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="emergency_release">
+    <div class="emergency_release_header">
+      <div class="emergency_header_text">中心PIS紧急信息一览</div>
+      <el-table :data="tableData" :header-cell-style="headerCellStyle" :cell-style="cellStyle" :height="'60%'" style="width: 94%; position: relative;left: 3%;">
+        <el-table-column prop="time" label="时间" width="150" />
+        <el-table-column prop="description" label="信息描述" />
+        <el-table-column prop="level" label="等级" />
+      </el-table>
+      <div style="margin-top: 10px;width: 100%;">
+        <div style="width: 77%;background: #FFF;padding: 2px;display: inline-block;vertical-align:top;margin-left: 3%">
+          <div style="width: 100%;text-align: center;font-size: 13px;padding-top:5px;">显示内容</div>
+          <div style="width:100%; height: 100px; border: 1px solid #000;" />
+        </div>
+        <div style="width: 14%;background: #939FAC; display: inline-block;margin-left: 2%;">
+          <div class="emergency_select_button">区域详细</div>
+          <div style="width: 100%;text-align: center;color: #FFF;font-size: 13px;background: #121A86;height: 30px;line-height: 30px;">紧急信息清除</div>
+          <div class="emergency_select_button">清除</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    name:'EmergencyRelease',
+    data() {
+        return {
+            tableData: [],
+            headerCellStyle: {background: '#121A86', height: '25px', color: '#FFF'},
+            cellStyle: {height:'25px'}
+        };
+    }
+
+};
+</script>
+<style lang="scss" scoped>
+.emergency_release{padding:20px;height: 100%;}
+.emergency_release_header{height: 100%;}
+.emergency_header_text{margin-top:10px;text-align: center;color: #9af1ec;font-size: 18px;padding-bottom: 10px;}
+.emergency_select_button {
+	text-align: center;
+	width: 90px;
+	height: 30px;
+	background: #A9A9A9;
+	border-top: 2px solid #FFF;
+	border-left: 2px solid #FFF;
+	border-right: 2px solid #898888;
+	border-bottom: 2px solid #898888;
+	margin: 10px auto 5px;
+	font-size: 14px;
+	line-height: 30px;
+	cursor:pointer;
+	-webkit-user-select:none;
+	-moz-user-select:none;
+	-ms-user-select:none;
+	user-select:none;
+}
+.emergency_select_button:active {
+	border-top: 2px solid #898888;
+	border-left: 2px solid #898888;
+	border-right: 2px solid #FFF;
+	border-bottom: 2px solid #FFF;
+}
+	/deep/
+	.el-table th{
+		padding: 0;
+	}
+	/deep/
+	.el-table td{
+		padding: 0;
+	}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pis/infoBroadcast.vue b/src/views/iscs/iscsSystemNew/config/pis/infoBroadcast.vue
new file mode 100644
index 000000000..f50753d52
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pis/infoBroadcast.vue
@@ -0,0 +1,400 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :visible.sync="visible"
+    width="800px"
+    :before-close="doClose"
+    class="iscs-voice-broadcast-dialog"
+  >
+    <div>
+      <div class="dialog-header">滚动信息发布</div>
+      <div class="iscs-pis-dialog-info">
+        <el-radio-group v-model="addModel.infoType" @change="getResourcesList">
+          <el-radio label="REAL_TIME">实时信息</el-radio>
+          <el-radio label="RECORDING">普通信息</el-radio>
+          <el-radio label="EMERGENCY_RECORDING" class="iscs-pis-dialog-emergencyInfo">紧急信息</el-radio>
+        </el-radio-group>
+      </div>
+      <div v-show="addModel.infoType !== 'REAL_TIME'" class="secondary-title">{{ this.message[this.addModel.infoType].title }}</div>
+      <div v-show="addModel.infoType !== 'REAL_TIME'" class="information-description-box">
+        <div v-for="(item,index) in resourcesList" :key="index">
+          <div
+            class="information-box"
+            :style="{ background: index == resourceIndex? '#4169cc': '#DCDCDC' }"
+            @click="chooseResources(item, index)"
+          >
+            {{ item.name }}
+          </div>
+        </div>
+      </div>
+      <div v-show="addModel.infoType === 'REAL_TIME'">
+        <el-row>
+          <el-col :span="20">
+            <div>
+              <div class="secondary-title">实时信息显示内容</div>
+              <div class="information-context-box">
+                <el-input
+                  v-model="addModel.infoContent"
+                  type="textarea"
+                  :rows="4"
+                  placeholder="请输入内容"
+                />
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="3" :offset="1">
+            <div class="iscs-pis-dialog-info" style="text-align: left">
+              <div style="margin-bottom: 20px; font-size: 16px; margin-top: 10px;">优先等级</div>
+              <el-radio v-model="addModel.priority" style="margin-bottom: 20px;" label="common">普通</el-radio>
+              <el-radio v-model="addModel.priority" label="emergency">紧急</el-radio>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div v-show="addModel.infoType === 'REAL_TIME'" style="margin-top: 10px">
+        <div style="display: inline;">名称：</div>
+        <input v-model="addModel.infoTitle" class="pis-dialog-input" style="width: 550px;">
+        <!--<input v-model="addModel.infoTime" class="pis-dialog-input" style="width: 140px;">-->
+        <!--<div style="display: inline;">次</div>-->
+      </div>
+      <div v-show="addModel.infoType !== 'REAL_TIME'" style="margin-top: 10px">
+        <div style="display: inline;">名称：</div>
+        <input disabled v-model="resource.name" class="pis-dialog-input" style="width: 550px;">
+        <!--<input v-model="addModel.infoTime" class="pis-dialog-input" style="width: 140px;">-->
+        <!--<div style="display: inline;">次</div>-->
+      </div>
+      <div v-show="addModel.infoType !== 'REAL_TIME'" class="secondary-title" style="margin-top: 10px">{{ addModel.infoType === 'RECORDING'? '普通信息内容显示': '紧急信息内容显示' }}</div>
+      <div v-show="addModel.infoType !== 'REAL_TIME'" class="information-context-box">{{ resource.desc }}</div>
+      <div v-show="addModel.infoType === 'REAL_TIME'" class="information-description-box" style="margin-top: 15px;">
+        <el-row>
+          <el-col :span="6" style="border-right:2px solid #898888; min-height: 100px">
+            <!--<div v-for="(item,index) in resourcesList" :key="index">-->
+            <!--<div class="information-box" @click="selectedRealTimeInfo(item)">{{ item.name }}</div>-->
+            <!--</div>-->
+          </el-col>
+          <el-col>
+            <div>{{ showRealTimeInfo }}</div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="button-group">
+        <!--<el-select v-show="addModel.infoType === 'REAL_TIME'" v-model="value" :disabled="true" placeholder="信息选择" size="mini">-->
+        <!--<el-option-->
+        <!--v-for="item in infoList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"-->
+        <!--/>-->
+        <!--</el-select>-->
+        <!--<div v-show="addModel.infoType === 'REAL_TIME'" class="pis-button">储存</div>-->
+        <div class="button-group-content" :style="{left: addModel.infoType ==='REAL_TIME'?'300px':'550px'}">
+          <div class="pis-button">设定中</div>
+          <div class="pis-button" @click="releaseBroadcast">发布</div>
+          <div class="pis-button" @click="doClose">取消</div>
+        </div>
+      </div>
+      <!--<div class="pis-dialog-form-box">-->
+      <!--<el-form ref="form" :model="form" label-width="95px">-->
+      <!--<el-row>-->
+      <!--<el-col :span="3">-->
+      <!--<div class="pis-button" style="position: relative; top: 10px;left: 5px; padding: 7px 10px ;">导入描述</div>-->
+      <!--</el-col>-->
+      <!--<el-col :span="21">-->
+      <!--<el-form-item prop="description" label-width="0">-->
+      <!--<input v-model="form.description" style="width:600px;">-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <!--<el-row>-->
+      <!--<el-col :span="21">-->
+      <!--<el-row>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item prop="startDate" label="开始日期">-->
+      <!--<el-date-picker-->
+      <!--v-model="form.startDate"-->
+      <!--type="date"-->
+      <!--size="mini"-->
+      <!--placeholder="选择日期"-->
+      <!--/>-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item prop="endTime" label="结束时间">-->
+      <!--<el-time-picker-->
+      <!--v-model="form.endTime"-->
+      <!--arrow-control-->
+      <!--size="mini"-->
+      <!--placeholder="选择时间"-->
+      <!--/>-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <!--<el-row>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item prop="startTime" label="开始时间">-->
+      <!--<el-time-picker-->
+      <!--v-model="form.startTime"-->
+      <!--arrow-control-->
+      <!--size="mini"-->
+      <!--placeholder="选择时间"-->
+      <!--/>-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item prop="endDate" label="结束日期">-->
+      <!--<el-date-picker-->
+      <!--v-model="form.endDate"-->
+      <!--type="date"-->
+      <!--size="mini"-->
+      <!--placeholder="选择日期"-->
+      <!--/>-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <!--<el-row>-->
+      <!--<el-col :span="12">-->
+      <!--<el-form-item prop="durationTime" label="延续时间">-->
+      <!--<el-time-picker-->
+      <!--v-model="form.durationTime"-->
+      <!--arrow-control-->
+      <!--size="mini"-->
+      <!--placeholder="选择时间"-->
+      <!--/>-->
+      <!--</el-form-item>-->
+      <!--</el-col>-->
+      <!--<el-col :span="12">-->
+      <!--<div style="text-align: center;padding-top: 10px;">-->
+      <!--<div class="pis-button">今日</div>-->
+      <!--<div class="pis-button">一次</div>-->
+      <!--<div class="pis-button">无截止</div>-->
+      <!--</div>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <!--</el-col>-->
+      <!--<el-col :span="3">-->
+      <!--<div class="each_operate_button">排定<br>确认</div>-->
+      <!--</el-col>-->
+      <!--</el-row>-->
+      <!--</el-form>-->
+      <!--</div>-->
+    <!--</div>-->
+    </div></el-dialog>
+</template>
+
+<script>
+import { queryIscsResourcesByGroup } from '@/api/simulation';
+export default {
+    name: 'VoiceBroadcast',
+    data() {
+        return {
+            visible: false,
+            value: '',
+            resourcesList: [],
+            resourceIndex: 0,
+            resource: {},
+            addModel: {
+                infoType: 'RECORDING',
+                infoTitle: '',
+                infoTime: '',
+                infoContent: '',
+                priority: 'common'
+            },
+            form: {
+                startDate: '',
+                startTime: '',
+                durationTime: '',
+                endTime: '',
+                endDate: '',
+                description: ''
+            },
+            infoList: [],
+            showRealTimeInfo: '',
+            message: {
+                REAL_TIME: {
+                    title: '实时信息',
+                    infoList:[]
+                },
+                RECORDING: {
+                    title: '普通信息',
+                    infoList:[]
+                },
+                EMERGENCY_RECORDING: {
+                    title: '紧急信息',
+                    infoList:[]
+                }
+            }
+        };
+    },
+    mounted() {
+        this.showRealTimeInfo = '';
+    },
+    methods:{
+        doClose() {
+            this.visible = false;
+        },
+        doShow() {
+            this.visible = true;
+            this.getResourcesList();
+        },
+        releaseBroadcast() {
+            this.visible = false;
+            if (this.addModel.infoType === 'REAL_TIME') {
+                if (!this.addModel.infoTitle) {
+                    this.$message.error('请输入实时信息标题！');
+                } else if (!this.addModel.infoContent) {
+                    this.$message.error('请输入实时信息内容！');
+                } else {
+                    this.$emit('releaseBroadcast', {name: this.addModel.infoTitle, content: this.addModel.infoContent }, this.addModel.infoType);
+                    this.addModel.infoContent = '';
+                    this.addModel.infoTitle = '';
+                }
+            } else if (this.resource) {
+                this.$emit('releaseBroadcast', this.resource, this.addModel.infoType);
+            }
+        },
+        selectedRealTimeInfo(item) {
+            this.showRealTimeInfo = item.content;
+        },
+        chooseResources(item, index) {
+            this.resource = item;
+            this.resourceIndex = index;
+        },
+        getResourcesList() {
+            if (this.addModel.infoType === 'REAL_TIME') {
+                return;
+            }
+            const params = { system: 'PIS', type: this.addModel.infoType };
+            queryIscsResourcesByGroup( this.$route.query.group, params).then(resp => {
+                this.resourceIndex = 0;
+                this.resourcesList = resp.data && resp.data[0] ? resp.data[0].resources : [];
+                this.resource = this.resourcesList[0] ? this.resourcesList[0] : {};
+            }).catch( () => {
+                this.$message.error('获取广播资源列表失败！');
+            } );
+        }
+    }
+};
+</script>
+
+<style scoped>
+    .dialog-header{
+        text-align: center;
+        font-size: 28px;
+        margin-bottom: 15px;
+    }
+    .pis-dialog-form-box{
+        margin-top: 20px;
+        padding: 10px 5px;
+        border-top: 2px solid #898888;
+        border-left: 2px solid #898888;
+        border-right: 2px solid #fff;
+        border-bottom: 2px solid #fff;
+    }
+    .information-description-box{
+        height: 100px;
+        width: 100%;
+        background: #DCDCDC;
+        border-left: 2px solid #898888;
+        overflow-x: auto;
+        overflow-y: auto;
+    }
+    .information-box{
+        white-space: nowrap;
+        background: #DCDCDC;
+        margin-top: 2px;
+		cursor: pointer;
+    }
+    .secondary-title{
+        text-align: center;
+        width: 100%;
+        font-size: 18px;
+        background: #A9A9A9;
+        border-top: 2px solid #898888;
+        border-left: 2px solid #898888;
+        border-right: 2px solid #fff;
+        border-bottom: 2px solid #fff;
+    }
+    .pis-dialog-input{
+        background: #DCDCDC;
+        border-top: 2px solid #898888;
+        border-left: 2px solid #898888;
+        border-right: 2px solid #fff;
+        border-bottom: 2px solid #fff;
+    }
+    .information-context-box{
+        background: #DCDCDC;
+        width: 100%;
+        height: 100px;
+        overflow-y: auto;
+    }
+    .button-group{
+        margin-top: 20px;
+    }
+    .button-group-content{
+        position: relative;
+        left: 550px;
+        display: inline;
+    }
+    .pis-button{
+        background: #CCCCCC;
+        color: #000;
+        display: inline;
+        font-weight: bold;
+        padding: 7px 15px;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #454541;
+        border-bottom: 2px solid #454541;
+        cursor: default;
+    }
+    .iscs-pis-dialog-info{
+        text-align: center;
+        margin-bottom: 10px;
+    }
+    .iscs-pis-dialog-emergencyInfo{
+        color: #F00 !important;
+    }
+    .each_operate_button{
+        position: relative;
+        top: 100px;
+        text-align: center;
+        font-weight: bold;
+        margin-top: 5px;
+        cursor:pointer;
+        color: #000;
+        background: #CCCCCC;
+        display: inline-block;
+        border-top: 2px solid #fff;
+        border-left: 2px solid #fff;
+        border-right: 2px solid #565656;
+        border-bottom: 2px solid #565656;
+        padding: 5px 10px;
+        line-height: 140%;}
+</style>
+<style>
+    .iscs-voice-broadcast-dialog .el-dialog__body{
+        background: #A9A9A9;
+        padding-top: 10px;
+        padding-bottom: 60px;
+    }
+    .iscs-voice-broadcast-dialog .el-dialog__headerbtn{
+        top: 10px;
+    }
+    .iscs-voice-broadcast-dialog .el-dialog__header{
+        background-image: linear-gradient(#FFE4C4, #F4A460, #FFE4C4);
+    }
+    .iscs-pis-dialog-info .el-radio__input.is-checked+.el-radio__label{
+        color: #606266;
+        font-size: 16px;
+    }
+    .iscs-pis-dialog-info .el-radio__input+.el-radio__label {
+        font-size: 16px;
+    }
+    .iscs-pis-dialog-info .iscs-pis-dialog-emergencyInfo .el-radio__input.is-checked+.el-radio__label{
+        color: #F00;
+    }
+    .iscs-voice-broadcast-dialog .information-context-box .el-textarea__inner {
+        background: #DCDCDC;
+        border-radius: 0;
+    }
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pis/lcdControl.vue b/src/views/iscs/iscsSystemNew/config/pis/lcdControl.vue
new file mode 100644
index 000000000..6304bfd68
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pis/lcdControl.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="iscs_lcd_box" style="width: 100%;height: 100%; position: relative;">
+    <div class="lcdControl_title">LCD控制屏</div>
+    <div class="area_select" style="margin-top: 110px;">
+      <div class="area_select_title">特定区域</div>
+      <div class="area_select_button" :class="{'active': activeFlag}" @click="selectedAllArea">全线</div>
+    </div>
+    <div class="area_select" style="margin-top: 200px;">
+      <div>
+        <el-radio v-model="lcdSwitch" :label="true" size="small" border style="margin-left: 12px;margin-bottom: 5px;margin-top: 10px;">开启LCD屏</el-radio>
+        <br>
+        <el-radio v-model="lcdSwitch" :label="false" size="small" border>关闭LCD屏</el-radio>
+      </div>
+      <div class="area_select_button" style="margin-top: 20px;">确定</div>
+    </div>
+
+    <div class="lcd_content_box">
+      <div style="display: inline-block;position:absolute;width: 50px;z-index: 2;background: #45607B;">
+        <div class="lcd_content_box_left_title">车站</div>
+        <div class="lcd_content_box_left_title">选择</div>
+      </div>
+      <div style="width: 100%; overflow-x: auto;white-space: nowrap;height: 100%;">
+        <div style="position: relative; left: 50px;">
+          <div v-for="(station, index) in stationList" :key="index" style="display: inline-block;text-align: center;">
+            <div class="each_station_info" @click="selectedArea(station)">{{ station }}</div>
+            <div class="button_default_content">
+              <div class="button_default" :style="{background:selectedAreaList.includes(station)?'#2EFF74':'#CDCDCD'}" @click="selectedArea(station)" />
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+import { getByGroupStationList } from '@/api/jmap/map';
+export default {
+    name:'LcdControl',
+    data() {
+        return {
+            columns: ['车站', '选择'],
+            stationList: ['会展中心站', '世纪大道站', '交通大学站', '市图书馆站', '中心医院站', '未来路站', '火车站', '人民广场站', '体育中心站'],
+            lcdSwitch: true,
+            activeFlag: false,
+            selectedAreaList:[]
+        };
+    },
+    async created () {
+        // 请求当前线路车站列表
+        try {
+            const res = await getByGroupStationList(this.$route.query.group);
+            if (res.code == 200) {
+                this.stationList = [];
+                res.data.forEach(station => {
+                    if (!station.depot) {
+                        this.stationList.push(station.name);
+                    }
+                });
+            }
+        } catch (e) {
+            this.$message.error('获取车站列表失败！');
+        }
+    },
+    methods: {
+        selectedArea(station) {
+            const index = this.selectedAreaList.indexOf(station);
+            if (index < 0) {
+                this.selectedAreaList.push(station);
+            } else {
+                this.selectedAreaList.splice(index, 1);
+            }
+        },
+        selectedAllArea() {
+            this.activeFlag = !this.activeFlag;
+            if (this.activeFlag) {
+                this.selectedAreaList = [...this.stationList];
+            } else {
+                this.selectedAreaList = [];
+            }
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+	.iscs_lcd_box {
+
+	}
+	.lcdControl_title{
+		width: 100%;
+		text-align: center;
+		font-size: 26px;
+		margin-top: 30px;
+		color: #56E5DE;
+	}
+	.area_select {
+		position: absolute;
+		left: 25%;
+		width: 120px;
+		border-top: 3px solid #898888;
+		border-left: 3px solid #898888;
+		border-right: 3px solid #fff;
+		border-bottom: 3px solid #fff;
+		padding-top: 5px;
+		text-align: center;
+	}
+	.area_select_title {
+		color: #56E5DE;
+		font-size: 12px;
+	}
+	.area_select_button {
+		text-align: center;
+		width: 90px;
+		height: 30px;
+		background: #A9A9A9;
+		border-top: 2px solid #FFF;
+		border-left: 2px solid #FFF;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		margin: 5px 12px 10px;
+		font-size: 14px;
+		line-height: 30px;
+		cursor:pointer;
+		-webkit-user-select:none;
+		-moz-user-select:none;
+		-ms-user-select:none;
+		user-select:none;
+		&:active,
+		&.active {
+		border-top: 2px solid #898888;
+		border-left: 2px solid #898888;
+		border-right: 2px solid #FFF;
+		border-bottom: 2px solid #FFF;
+	}
+	}
+	.each_station_info{
+		vertical-align:top;
+		font-size: 13px;
+		padding: 2px 2px;
+		background: #A9A9A9;
+		border-top: 2px solid #FFF;
+		border-left: 2px solid #FFF;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		margin-right: 5px;
+		cursor:pointer;
+		-webkit-user-select:none;
+		-moz-user-select:none;
+		-ms-user-select:none;
+		user-select:none;
+	}
+	.lcd_content_box{
+		margin-top: 110px;
+		width: 700px;
+		height: 330px;
+		position: absolute;
+		left: 35%;
+		border-top: 3px solid #898888;
+		border-left: 3px solid #898888;
+		border-right: 3px solid #fff;
+		border-bottom: 3px solid #fff;
+		padding-top: 10px;
+	}
+	.lcd_content_box_left_title{
+		vertical-align:top;
+		font-size: 13px;
+		color: #CBFFFF;
+		padding: 5px 10px 10px;
+	}
+	.button_default_content{
+		margin-top: 5px;
+		height: 18px;
+		width: 18px;
+		background: #D4D4D4;
+		display: inline-block;
+		border-top: 2px solid #fff;
+		border-left: 2px solid #fff;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		text-align: center;
+	}
+	.button_default{
+		height: 10px;
+		width: 10px;
+		margin: auto;
+		background:#CCCCCC;
+		position: relative;
+		top: 50%;
+		transform: translateY(-50%);
+		border-top: 2px solid #fff;
+		border-left: 2px solid #fff;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+	}
+</style>
+<style lang="scss">
+	.iscs_lcd_box .el-radio.is-bordered.is-checked {
+		border-top: 2px solid #7CDAF3;
+		border-left: 2px solid #7CDAF3;
+		border-right: 2px solid #0C3A94;
+		border-bottom: 2px solid #0C3A94;
+		background: #089DF6;
+		border-radius: 0;
+		/*width: 80px;*/
+		/*height: 20px;*/
+	}
+	.iscs_lcd_box .el-radio.is-bordered {
+		border-top: 2px solid #FFF;
+		border-left: 2px solid #FFF;
+		border-right: 2px solid #898888;
+		border-bottom: 2px solid #898888;
+		background: #989898;
+		border-radius: 0;
+		color: #FFF;
+		/*width: 80px;*/
+		/*height: 20px;*/
+	}
+	.iscs_lcd_box .el-radio__input.is-checked+.el-radio__label {
+		color: #FFF;
+	}
+	.iscs_lcd_box .el-radio__input.is-checked .el-radio__inner{
+		background: #FFF;
+	}
+	.iscs_lcd_box .el-radio__input.is-checked .el-radio__inner::after{
+		background: #1E84C7;
+	}
+	.iscs_lcd_box .el-radio--small.is-bordered {
+		padding: 8px 5px 0 0;
+	}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pis/mainScreen.vue b/src/views/iscs/iscsSystemNew/config/pis/mainScreen.vue
new file mode 100644
index 000000000..fc91e8d09
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pis/mainScreen.vue
@@ -0,0 +1,683 @@
+<template>
+  <div class="main_screen">
+    <div class="main_screen_header">
+      <div class="screen_header_text">乘客信息</div>
+    </div>
+    <div class="main_screen_content">
+      <div v-show="!isSingleStation" class="screen_left">
+        <div class="screen_left_tab">特定区域</div>
+        <el-row><el-button
+          v-for="(item, index) in verticalHeader"
+          :key="index"
+          class="screen_operate_name"
+          :class="{ active: item.active }"
+          @click="selectedBatch(item)"
+        >{{ item.title }}</el-button></el-row>
+      </div>
+      <div class="screen_main_content">
+        <div v-show="!isSingleStation" class="screen_main_content_inner">
+          <div class="screen_left_text_group">
+            <div v-for="(item, index) in verticalHeader" :key="index" class="each_data_info">{{ item.name }}</div>
+          </div>
+          <div class="screen_right_group">
+            <div class="screen_right_group_in">
+              <div v-for="station in stationList" :key="station.code" class="each_station_info">
+                <div class="each_data_info" @click="selectedStation(station)">
+                  <div class="screen_station_name">{{ station.stationName }}</div>
+                </div>
+                <div v-if="station.children && station.children.length > 0">
+                  <div
+                    v-for="(child, index) in station.children"
+                    :key="station.code + index"
+                    class="each_data_info"
+                    style="display: flex;align-items: center;justify-content: center;"
+                    @click="selectArea(station.code, index)"
+                  >
+                    <div v-if="child.status === 'default'" class="button_default_content">
+                      <div
+                        class="button_default"
+                        :style="{ background: selectedAreaList.includes(station.code + '-' + index) ? '#2EFF74' : '#CDCDCD' }"
+                      />
+                    </div>
+                    <div
+                      v-if="child.status === 'default'"
+                      :class="station.code + '-' + index"
+                      style="width: 14px;height: 14px;margin-left: 5px;"
+                      :style="{ backgroundColor: statusColor['normal'] }"
+                    />
+                    <div>{{ `${station.code}-${index}` }}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-show="isSingleStation" class="screen_main_content_inner_single_station">
+          <div class="header">
+            <div v-for="(item, index) in verticalHeader" :key="index" class="each_data_info">{{ item.name }}</div>
+          </div>
+          <div class="content">
+            <div v-if="currentStation && currentStation.children && currentStation.children.length > 0" class="list">
+              <div class="stationButton" @click="selectedStation(currentStation)">
+                <div class="screen_station_name">全车站</div>
+              </div>
+              <div
+                v-for="(child, index) in currentStation.children"
+                :key="currentStation.code + index"
+                class="each_data_info"
+                style="display: flex;align-items: center;justify-content: center;"
+                @click="selectArea(currentStation.code, index)"
+              >
+                <div v-if="child.status === 'default'" class="button_default_content">
+                  <div
+                    class="button_default"
+                    :style="{ background: selectedAreaList.includes(currentStation.code + '-' + index) ? '#2EFF74' : '#CDCDCD' }"
+                  />
+                </div>
+                <div
+                  v-if="child.status === 'default'"
+                  :class="currentStation.code + '-' + index"
+                  style="width: 14px;height: 14px;margin-left: 5px;"
+                  :style="{ backgroundColor: statusColor['normal'] }"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="screen_right">
+        <div class="each_operate">
+          <div class="each_operate_text">操作</div>
+          <div class="each_operate_button" @click="showInfoBrroadcast">滚动信息<br>发布</div>
+        </div>
+        <div class="each_operate">
+          <div class="each_operate_text">信息清除</div>
+          <div class="each_operate_button" @click="stopBroadcast">清除<br>普通信息</div>
+        </div>
+      </div>
+    </div>
+    <div class="main_screen_footer">
+      <textarea id="screen_footer_text" name="" cols="30" rows="10" />
+      <div class="footer_button_group">
+        <div class="each_footer_button">
+          <div class="each_footer_button_icon screen_status_green" />
+          <div class="each_footer_button_text">正常</div>
+        </div>
+        <div class="each_footer_button">
+          <div class="each_footer_button_icon screen_status_red" />
+          <div class="each_footer_button_text">故障</div>
+        </div>
+        <div class="each_footer_button">
+          <div class="each_footer_button_icon screen_status_blue" />
+          <div class="each_footer_button_text">通信故障</div>
+        </div>
+        <div class="each_footer_button">
+          <div class="each_footer_button_icon screen_status_active" />
+          <div class="each_footer_button_text">选定</div>
+        </div>
+      </div>
+    </div>
+    <audio id="voice" controls style="width: 0;height: 0;" />
+    <info-broadcast ref="infoBroadcast" @releaseBroadcast="releaseBroadcast" />
+  </div>
+</template>
+<script>
+import { getByGroupStationList } from '@/api/jmap/map';
+import { queryIscsDeviceCod } from '@/api/iscs';
+import InfoBroadcast from './infoBroadcast';
+import { sendCommandNew } from '@/api/jmap/training';
+import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+import { getToken } from '@/utils/auth';
+
+export default {
+    name: 'MainScreen',
+    components: {
+        InfoBroadcast
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            verticalHeader: [
+                { name: '车站', title: '全线', key: 'station', type: 'header', active: false },
+                { name: '站厅(LCD)', title: '全站厅(LCD)', key: 'stationHall', type: 'checkBox', active: false },
+                { name: '上行站台', title: '全上行站台', key: 'uplinkStation', type: 'checkBox', active: false },
+                { name: '下行站台', title: '全下行站台', key: 'downlinkStation', type: 'checkBox', active: false },
+                { name: '出入口', title: '全出入口', key: 'passageway', type: 'checkBox', active: false },
+                { name: '物业', title: '全物业', key: 'property', type: 'checkBox', active: false },
+                { name: '天桥1', title: '天桥1', key: 'overbridge1', type: 'checkBox', active: false },
+                { name: '天桥2', title: '天桥2', key: 'overbridge2', type: 'checkBox', active: false },
+                { name: 'LED', title: '出入口(LED)', key: 'LED', type: 'checkBox', active: false }
+            ],
+            statusColor: {
+                normal: '#00ff00'
+            },
+            stationList: [],
+            selectedAreaList: [],
+            iscsDeviceMap: {},
+            deviceMap: {}
+        };
+    },
+    computed: {
+        currentStation() {
+            return this.stationList.find(station => station.code === this.stationId);
+        },
+        isSingleStation() {
+            return this.stationId.startsWith('Station');
+        }
+    },
+    watch: {
+    // '$store.state.socket.iscsStatePisMessages': function(list) {
+    //   if (list && list.length) {
+    //     list.forEach(item => {
+    //       const index = this.iscsDeviceMap[item.code]
+    //       if (index) {
+    //         this.$set(this.deviceMap[index], 'state', item.state)
+    //       }
+    //     })
+    //   }
+    // },
+    },
+    async created() {
+    // 请求当前线路车站列表
+        try {
+            const positionMap = {
+                LCD: 0,
+                UP_STAND: 1,
+                DOWN_STAND: 2,
+                GATE: 3,
+                PROPERTY: 4,
+                OVERPASS1: 5,
+                OVERPASS2: 6,
+                LED: 7
+            };
+            const res = await getByGroupStationList(this.$route.query.group);
+            const resp = await queryIscsDeviceCod({ mapId: this.$route.query.mapId, system: 'PIS' });
+            if (res.code == 200) {
+                this.stationList = [];
+                res.data.forEach(station => {
+                    if (!station.depot) {
+                        const children = [
+                            { status: 'none' },
+                            { status: 'none' },
+                            { status: 'none' },
+                            { status: 'none' },
+                            { status: 'none' },
+                            { status: 'none' },
+                            { status: 'none' },
+                            { status: 'none' }
+                        ];
+                        if (resp.code == 200) {
+                            resp.data &&
+                resp.data.forEach(item => {
+                    if (station.code == item.station) {
+                        const index = positionMap[item.position];
+                        if (children[index]) {
+                            children[index].status = 'default';
+                            this.iscsDeviceMap[item.code] = station.code + '-' + index;
+                            this.deviceMap[station.code + '-' + index] = item;
+                        }
+                    }
+                });
+                        }
+                        const param = {
+                            stationName: station.name,
+                            code: station.code,
+                            children: children
+                        };
+                        this.stationList.push(param);
+                    }
+                });
+            }
+            this.subscribe();
+        } catch (e) {
+            this.$message.error('获取车站列表失败！');
+        }
+    },
+    beforeDestroy() {
+        this.clearSubscribe();
+    },
+    methods: {
+        showInfoBrroadcast() {
+            this.$refs.infoBroadcast.doShow();
+        },
+        stopBroadcast() {
+            const iscsDeviceCodes = [];
+            this.selectedAreaList.forEach(item => {
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            sendCommandNew(this.$route.query.group, 'ISCS_PIS_Stop_Playing', { iscsDeviceCodes: iscsDeviceCodes })
+                .then(resp => {
+                    // const audio = document.getElementById('voice')
+                    // audio.pause()
+                })
+                .catch(() => {
+                    this.$message.error('广播终止播放失败！');
+                });
+        },
+        releaseBroadcast(voice, type) {
+            const iscsDeviceCodes = [];
+            this.selectedAreaList.forEach(item => {
+                if (this.isSingleStation && !item.startsWith(this.stationId)) return;
+                if (this.deviceMap[item]) {
+                    iscsDeviceCodes.push(this.deviceMap[item].code);
+                }
+            });
+            if (!iscsDeviceCodes.length) {
+                this.$message.error('请选择广播设备');
+                return;
+            }
+            const params = {
+                resourceId: voice.id,
+                iscsDeviceCodes: iscsDeviceCodes,
+                name: voice.name,
+                content: voice.content,
+                type
+            };
+            sendCommandNew(this.$route.query.group, 'ISCS_PIS_Play', params)
+                .then(resp => {
+                    // const voiceUrl = this.$store.state.user.resourcesUrl + (voice.url || resp.data)
+                    // const audio = document.getElementById('voice')
+                    // audio.src = voiceUrl
+                    // audio.play()
+                })
+                .catch(() => {
+                    this.$message.error('发布广播失败！');
+                });
+        },
+        selectArea(stationName, index) {
+            const elem = stationName + '-' + index;
+            if (this.selectedAreaList.includes(elem)) {
+                const areaIndex = this.selectedAreaList.indexOf(elem);
+                this.selectedAreaList.splice(areaIndex, 1);
+            } else {
+                this.selectedAreaList.push(elem);
+            }
+        },
+        selectedStation(station) {
+            const flag = this.checkStationSelected(station);
+            station.children.forEach((item, index) => {
+                const elem = station.code + '-' + index;
+                if (item.status === 'default' && flag) {
+                    const areaIndex = this.selectedAreaList.indexOf(elem);
+                    this.selectedAreaList.splice(areaIndex, 1);
+                } else if (item.status === 'default' && !flag && !this.selectedAreaList.includes(elem)) {
+                    this.selectedAreaList.push(elem);
+                }
+            });
+        },
+        checkStationSelected(station) {
+            let stationSelectedFlag = true;
+            station.children.some((item, index) => {
+                if (item.status === 'default') {
+                    stationSelectedFlag = this.selectedAreaList.includes(station.code + '-' + index);
+                    return !stationSelectedFlag;
+                }
+            });
+            return stationSelectedFlag;
+        },
+        selectedBatch(data) {
+            data.active = !data.active;
+            if (data.key == 'station') {
+                this.selectedAllLine(data);
+            } else {
+                let areaIndex;
+                this.verticalHeader.map((item, index) => {
+                    if (item.key == data.key) {
+                        areaIndex = index;
+                    }
+                });
+                const flag = data.active;
+                this.stationList.forEach(station => {
+                    station.children.forEach((item, index) => {
+                        const elem = station.code + '-' + index;
+                        if (item.status == 'default' && index + 1 == areaIndex && !flag) {
+                            const selectedAreaIndex = this.selectedAreaList.indexOf(elem);
+                            this.selectedAreaList.splice(selectedAreaIndex, 1);
+                        } else if (item.status == 'default' && index + 1 == areaIndex && flag) {
+                            this.selectedAreaList.push(elem);
+                        }
+                    });
+                });
+            }
+        },
+        selectedAllLine(data) {
+            const flag = data.active;
+            this.selectedAreaList = [];
+            this.stationList.forEach(station => {
+                station.children.forEach((item, index) => {
+                    if (item.status === 'default' && flag) {
+                        this.selectedAreaList.push(station.code + '-' + index);
+                    }
+                });
+            });
+        },
+        subscribe() {
+            this.clearSubscribe();
+            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
+            creatSubscribe(getTopic('ISCSPIS', this.$route.query.group), header);
+            this.$store.dispatch('app/animationsClose');
+        },
+        clearSubscribe() {
+            clearSubscribe(getTopic('ISCSPIS', this.$route.query.group));
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/ {
+  .el-button {
+    border-radius: 0 !important;
+    color: #333 !important;
+    width: 100% !important;
+  }
+}
+.screen_header_text {
+  margin-top: 20px;
+  text-align: center;
+  color: #9af1ec;
+  font-size: 18px;
+  padding-right: 100px;
+  padding-bottom: 10px;
+}
+.main_screen {
+  padding-left: 50px;
+  width: 100%;
+}
+.main_screen_header {
+}
+.screen_main_content_inner {
+  width: 100%;
+  height: 500px;
+  border-top: 2px solid #8c8a89;
+  overflow-y: auto;
+  display: flex;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+}
+.screen_main_content_inner_single_station {
+  width: 100%;
+  height: 500px;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+  .header {
+    display: flex;
+    justify-content: space-evenly;
+    color: #9af1ec;
+    & > div {
+      width: 11%;
+      text-align: center;
+    }
+  }
+  .content {
+    .list {
+      display: flex;
+      justify-content: space-evenly;
+      & > div {
+        width: 11%;
+        text-align: center;
+      }
+      .stationButton {
+        margin: 0;
+        .screen_station_name {
+          width: auto;
+        }
+      }
+    }
+  }
+}
+.main_screen_content {
+  display: inline-block;
+  width: 100%;
+  padding-left: 100px;
+  padding-right: 200px;
+  position: relative;
+  height: 500px;
+}
+.screen_left {
+  display: inline-block;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  width: 100px;
+  border: 2px #ccc solid;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+  position: absolute;
+  left: 0;
+}
+.screen_left_tab {
+  font-size: 12px;
+  text-align: center;
+  color: #86e4d6;
+}
+.sceen_left_content {
+}
+.screen_right {
+  display: inline-block;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 200px;
+}
+.each_operate {
+  width: 92px;
+  padding: 10px;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+  margin-top: 30px;
+  margin-left: 30px;
+}
+.each_operate_text {
+  text-align: center;
+  font-size: 12px;
+  color: #a9f4f6;
+}
+.each_operate_button {
+  text-align: center;
+  font-size: 12px;
+  margin-top: 5px;
+  cursor: pointer;
+  background: #cccccc;
+  display: inline-block;
+  border-top: 2px solid #fff;
+  border-left: 2px solid #fff;
+  border-right: 2px solid #565656;
+  border-bottom: 2px solid #565656;
+  padding: 2px 8px;
+  line-height: 140%;
+}
+.footer_button_group {
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 160px;
+}
+.main_screen_footer {
+  margin-left: 120px;
+  padding-right: 160px;
+  position: relative;
+  margin-top: 10px;
+}
+#screen_footer_text {
+  width: 100%;
+  resize: none;
+  height: 190px;
+  border-top: 2px solid #8c8a89;
+  border-left: 2px solid #8c8a89;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+}
+.each_footer_button {
+  margin-left: 20px;
+  margin-top: 10px;
+}
+.each_footer_button_icon {
+  width: 14px;
+  height: 14px;
+  display: inline-block;
+}
+.each_footer_button_text {
+  font-size: 13px;
+  color: #fff;
+  margin-left: 5px;
+  display: inline-block;
+  vertical-align: top;
+  margin-top: 1px;
+}
+.screen_main_content {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.screen_status_red {
+  background: #ff0000;
+}
+.screen_status_green {
+  background: #00ff00;
+}
+.screen_status_blue {
+  background: #00aaff;
+}
+.screen_status_active {
+  border-top: 2px solid #f1f1f1;
+  border-left: 2px solid #d0d8dd;
+  border-right: 2px solid #959da0;
+  border-bottom: 2px solid #90999d;
+}
+.screen_status_active:after {
+  content: '';
+  border-top: 2px solid #a6a2a6;
+  border-left: 2px solid #a5aca5;
+  border-right: 2px solid #ececec;
+  border-bottom: 2px solid #e4e4e4;
+  background: #00ff00;
+  min-width: 10px;
+  height: 10px;
+  display: inline-block;
+  vertical-align: top;
+}
+.screen_status_active::after {
+  content: '';
+  border-top: 2px solid #a6a2a6;
+  border-left: 2px solid #a5aca5;
+  border-right: 2px solid #ececec;
+  border-bottom: 2px solid #e4e4e4;
+  background: #00ff00;
+  min-width: 10px;
+  height: 10px;
+  display: inline-block;
+  vertical-align: top;
+}
+.screen_left_text_group {
+  width: 260px;
+  padding: 0px 10px 10px 10px;
+  font-size: 14px;
+  color: #9de4e8;
+  display: inline-block;
+}
+.each_data_info {
+  margin-top: 10px;
+  height: 20px;
+}
+.screen_right_group {
+  display: inline-block;
+  vertical-align: top;
+  font-size: 0;
+  overflow-x: auto;
+  min-height: 100%;
+}
+.each_station_info {
+  width: 130px;
+  display: inline-block;
+  vertical-align: top;
+  padding-right: 10px;
+}
+.screen_station_name,
+.screen_operate_name {
+  padding: 2px 0px;
+  font-size: 12px;
+  background: #cccccc;
+  text-align: center;
+  border-top: 2px solid #f9f9f9;
+  border-left: 2px solid #f6f8f8;
+  border-right: 2px solid #9e9e9e;
+  border-bottom: 2px solid #636667;
+  cursor: pointer;
+  margin-left: 0;
+  margin-top: 10px;
+  &:active,
+  &.active {
+    background: #cccccc;
+    border-top: 2px solid #9c9c9c;
+    border-left: 2px solid #9c9c9c;
+    border-right: 2px solid #fff;
+    border-bottom: 2px solid #fff;
+  }
+}
+.screen_station_name {
+  width: 120px;
+}
+.screen_station_name.active {
+  background: #ebb570;
+  border-top: 2px solid #795b31;
+  border-left: 2px solid #795b31;
+  border-right: 2px solid #fff;
+  border-bottom: 2px solid #fff;
+}
+
+.data_button_info {
+  width: 14px;
+  height: 14px;
+  display: inline-block;
+  margin-left: 52px;
+  position: relative;
+}
+.button_default {
+  height: 10px;
+  width: 10px;
+  margin: auto;
+  background: #cccccc;
+  position: relative;
+  top: 50%;
+  transform: translateY(-50%);
+  border-top: 2px solid #fff;
+  border-left: 2px solid #fff;
+  border-right: 2px solid #898888;
+  border-bottom: 2px solid #898888;
+}
+.button_default_content {
+  height: 18px;
+  width: 18px;
+  background: #d4d4d4;
+  display: inline-block;
+  border-top: 2px solid #fff;
+  border-left: 2px solid #fff;
+  border-right: 2px solid #898888;
+  border-bottom: 2px solid #898888;
+}
+.screen_right_group_in {
+  display: -webkit-flex;
+  display: flex;
+  -webkit-flex-flow: row nowrap;
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/config/pis/timePreview.vue b/src/views/iscs/iscsSystemNew/config/pis/timePreview.vue
new file mode 100644
index 000000000..34e3c71bd
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/config/pis/timePreview.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="time_preview">
+    <div class="time_preview_header">
+      <div class="preview_header_text">中心PIS时间控制一览</div>
+    </div>
+    <div class="time_preview_content">
+      <el-table
+        cell-class-name="time_preview_column"
+        header-cell-class-name="time_preview_thead"
+        :data="tableData"
+        border
+        style="width:100%;overflow-y: auto;"
+        height="496"
+      >
+        <el-table-column
+          label=" "
+          type="index"
+          :index="indexMethod"
+          width="40"
+        />
+        <el-table-column
+          prop="describe"
+          label="信息描述"
+          width="680"
+        />
+        <el-table-column
+          prop="starttime"
+          label="开始时间"
+          width="180"
+        />
+        <el-table-column
+          prop="endtime"
+          label="结束时间"
+        />
+        <el-table-column
+          prop="interAmplitude"
+          label="间幅"
+        />
+        <el-table-column
+          prop="status"
+          label="状态"
+        />
+      </el-table>
+    </div>
+    <div class="time_preview_footer">
+      <div class="preview_footer_top">操作</div>
+      <div class="preview_footer_content">
+        <div class="each_preview_btn">区域<br>详细</div>
+        <div class="each_preview_btn">删除</div>
+        <div class="each_preview_btn">停用</div>
+        <div class="each_preview_btn each_preview_back1">激活</div>
+        <div class="each_preview_btn each_preview_back2">修改</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            tableData:[
+                {describe:'为了您和他人的安全，请不要在车厢内吸烟', starttime:'2018-06-15 00:00:00', endtime:'2018-06-15 23:59:59', interAmplitude:'00:00:30', status:'0'},
+                {describe:'手牵手积极防灾，心连心构建和谐家园', starttime:'2018-06-15 00:01:32', endtime:'2018-06-15 23:59:59', interAmplitude:'00:00:30', status:'0'},
+                {describe:'严禁携带易燃、易爆、剧毒、放射性、腐蚀性等危险物品', starttime:'2018-06-15 00:00:00', endtime:'2018-06-15 23:59:59', interAmplitude:'00:00:30', status:'0'},
+                {describe:'不要轻易给陌生人汇款、转账，谨防上当受骗', starttime:'2018-06-15 00:00:00', endtime:'2018-06-15 23:59:59', interAmplitude:'00:00:30', status:'0'}
+            ]
+        };
+    },
+    methods:{
+        indexMethod(index) {
+            return index + 1;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/{
+.time_preview{padding:20px;}
+  .preview_header_text{margin-top:10px;text-align: center;color: #9af1ec;font-size: 18px;padding-bottom: 10px;}
+  .time_preview_content{width:94%;height:500px;border-top: 2px solid #8c8a89;overflow-y: auto;margin-left:3%;margin-top:10px;display:flex;border-left: 2px solid #8c8a89;border-right: 2px solid #fff;border-bottom: 2px solid #fff;}
+  .time_preview_footer{width:650px;margin-top:20px;border-top: 2px solid #8c8a89;margin-left:3%;
+    border-left: 2px solid #8c8a89;
+    border-right: 2px solid #fff;
+    border-bottom: 2px solid #fff;background:#aabbbb;}
+  .el-table .time_preview_column .cell{font-size:12px;}
+  .el-table td.time_preview_column{padding:5px 0px;}
+  .preview_footer_top{width:646px;font-weight:bold;padding:10px 0px;text-align:center;background:#000077;color:#fff;font-size:12px;}
+	.each_preview_btn{
+		width:80px;
+		text-align:center;
+		height:38px;
+		display:flex;
+		align-items: center;
+		justify-content:center;
+		margin-left:4px;
+		font-size:12px;
+		cursor: pointer;
+		vertical-align:top;
+		font-weight:bold;
+		border-top: 3px solid #f9f9f9;
+		border-left: 3px solid #f6f8f8;
+		border-right: 3px solid #565656;
+		border-bottom: 3px solid #565656;
+		background: #cccccc;
+		&:active{
+			border-top: 3px solid #565656;
+			border-left: 3px solid #565656;
+			border-right: 3px solid #f6f8f8;
+			border-bottom: 3px solid #f9f9f9;
+			background: #cccccc;
+		}
+	}
+    .each_preview_back1{
+		border-top: 3px solid #63dcf8;
+		border-left: 3px solid #7cdeed;
+		border-right: 3px solid #2a5bab;
+		border-bottom: 3px solid #1d61b4;
+		background: #01abff;
+		color:#fff;
+		&:active{
+			border-top: 3px solid #1d61b4;
+			border-left: 3px solid #2a5bab;
+			border-right: 3px solid #7cdeed;
+			border-bottom: 3px solid #63dcf8;
+			background: #01abff;
+		}
+    }
+    .each_preview_back2{
+		border-top: 3px solid #638df8;
+		border-left: 3px solid #86a1e4;
+		border-right: 3px solid #1d2881;
+		border-bottom: 3px solid #1e3388;
+		background: #0156ff;
+		color:#fff;
+		&:active{
+			border-top: 3px solid #1e3388;
+			border-left: 3px solid #1d2881;
+			border-right: 3px solid #86a1e4;
+			border-bottom: 3px solid #638df8;
+			background: #0156ff;
+		}
+    }
+  .el-table .time_preview_thead:not(:first-child){background:#000077;color:#fff;padding: 5px 0px;text-align:center;font-size: 12px;}
+  .preview_footer_content{margin-top:15px;margin-left:20px;margin-bottom:10px;display:flex;flex-direction:row}
+}
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/index.vue b/src/views/iscs/iscsSystemNew/index.vue
new file mode 100644
index 000000000..c5677537e
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/index.vue
@@ -0,0 +1,44 @@
+<template>
+  <div style="height:100%">
+    <station-nav v-if="$route.query.group" @selectIscsPane="selectIscsPane" />
+    <div class="content-box-station iscs_content_box" :class="{'displayStationIscs': $route.query.group}">
+      <station-config ref="stationConfig" />
+    </div>
+  </div>
+</template>
+<script>
+import StationNav from './stationNav.vue';
+import StationConfig from './stationConfig/index.vue';
+export default {
+    name:'IscsSystem',
+    components: {
+        // TopNav,
+        // GroupNav,
+        // MenuBar,
+        StationNav,
+        StationConfig
+    },
+    data() {
+        return {
+
+        };
+    },
+    mounted() {
+
+    },
+    methods:{
+        selectIscsPane(param) {
+            this.$refs.stationConfig.showPane(param);
+        }
+
+    }
+};
+</script>
+<style lang="scss" scoped>
+.content-box-station{
+	width: 100%;
+    height: 100%;
+    padding: 65px 0 30px 0;
+    background: #45607B;
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/dialog/alarm.vue b/src/views/iscs/iscsSystemNew/stationConfig/dialog/alarm.vue
new file mode 100644
index 000000000..92ecdc9c1
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/dialog/alarm.vue
@@ -0,0 +1,105 @@
+<template>
+  <div v-dialogDrag>
+    <div
+      v-show="show"
+      class="iscs_fuzhou-01__systerm route-detail el-dialog"
+    >
+      <div class="el-dialog__header">
+        <span class="el-dialog__title">报警浏览</span>
+        <button type="button" aria-label="Close" class="el-dialog__headerbtn" @click="doClose">
+          <i class="el-dialog__close el-icon el-icon-close" />
+        </button>
+      </div>
+      <div class="el-dialog__body">
+        <div style="height: 300px;overflow: auto; margin-bottom: 15px;">
+          <div v-for="(item, index) in alarmList" :key="index">
+            <div v-if="item.key == 'frame'">{{ item.station }} {{ item.name }}</div>
+            <div v-if="item.key != 'frame'">{{ item.station }} {{ item.name }} 执行了 {{ item[item.key] ? 'XX保护动作' : '' }} {{ item[item.key] ? list[item.key][0] : list[item.key][1] }}操作</div>
+          </div>
+        </div>
+        <el-row justify="center" class="button-group">
+          <el-col :span="4" :offset="10">
+            <el-button type="primary" @click="commit">确定</el-button>
+          </el-col>
+        </el-row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+    name: '',
+    data() {
+        return {
+            dialogShow: false,
+            elemList: [],
+            list: {
+                valve: ['控分', '控合']
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('iscs', [
+            'alarmList'
+        ]),
+        show() {
+            return this.dialogShow;
+        }
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+            this.elemList = [];
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('iscs/setDelIncidentList');
+        },
+        commit() {
+            // 关闭音乐
+            this.$store.commit('iscs/setCloseMusic', 1);
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.route-detail{
+	position: absolute;
+	left: calc(50% - 250px);
+	margin-top: 15vh;
+	width: 500px;
+	z-index: 2000;
+	box-sizing: border-box;
+	background: rgba(100, 100, 100, 0.3);
+    border: 2px solid rgba(144, 144, 144, 0.8);
+    border-radius: 6px;
+    color: #000;
+    font-size: 14px;
+	.el-dialog__header{
+		padding: 0px 8px;
+		height: 26px;
+		.el-dialog__headerbtn{
+			background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+			border: 1px solid #fff;
+			border-radius: 4px;
+			top: 4px;
+			right: 12px;
+			line-height: 16px;
+			color: #fff;
+			.el-icon{
+				color: #fff;
+			}
+		}
+	}
+	.el-dialog__body{
+		background: #fff;
+		margin: 5px;
+		margin-top: 0;
+		padding: 10px;
+		padding-bottom: 0;
+	}
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/dialog/incident.vue b/src/views/iscs/iscsSystemNew/stationConfig/dialog/incident.vue
new file mode 100644
index 000000000..9008d0f95
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/dialog/incident.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      title="事件浏览器"
+      :visible.sync="show"
+      width="800px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-table border :data="incidentList" style="width: 100%;" height="450px">
+        <el-table-column label="日期/时间" prop="times" />
+        <el-table-column label="站台" prop="station" />
+        <el-table-column label="开关名称" prop="name" />
+        <el-table-column label="值" width="120">
+          <template slot-scope="scope" style="padding: 0;">
+            <span v-if="scope.row.key == 'valve'">{{ scope.row[scope.row.key] ? list[scope.row.key][0] : list[scope.row.key][1] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+    name: '',
+    data() {
+        return {
+            dialogShow: false,
+            elemList: [],
+            list: {
+                valve: ['分位', '合位']
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('iscs', [
+            'incidentList'
+        ]),
+        show() {
+            return this.dialogShow;
+        }
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+            this.elemList = [];
+        },
+        doClose() {
+            this.dialogShow = false;
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/dialog/malfunction.vue b/src/views/iscs/iscsSystemNew/stationConfig/dialog/malfunction.vue
new file mode 100644
index 000000000..e8a153d94
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/dialog/malfunction.vue
@@ -0,0 +1,390 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      :title="title"
+      :visible.sync="show"
+      width="300px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <!-- 设置故障 -->
+
+      <el-form ref="form" size="small" label-width="90px" :model="formModel" :rules="rules">
+        <el-form-item label="故障列表:" prop="value">
+          <el-select v-model="formModel.value" placeholder="请选择故障">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-row justify="center" class="button-group">
+        <el-col :span="10" :offset="2">
+          <el-button type="primary" @click="commit">确定</el-button>
+        </el-col>
+        <el-col :span="8" :offset="4">
+          <el-button @click="cancel">取消</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { setNum } from '@/iscs/status/mapElement.js';
+import mapElement from '@/iscs/status/mapElement.js';
+import {deviceFactory} from '@/iscs/utils/parser';
+
+export default {
+    name: '',
+    data() {
+        return {
+            dialogShow: false,
+            elemList: [],
+            formModel: {
+                value: ''
+            },
+            rules: {
+                value: [
+                    { required: true, message: '请选择故障', trigger: 'blur' }
+                ]
+            },
+            options: [
+                { label: '104A断路器故障', value: 'group_2' },
+                { label: '104B断路器故障', value: 'group_52' },
+                { label: '框架电流保护故障', value: 'frame_group' },
+                { label: '闸机故障', value: 'gate_fault' }
+            ],
+            list: {
+                valve: ['控分', '控合']
+            },
+            farmed: '',
+            type: ''
+        };
+    },
+    computed: {
+        ...mapGetters('iscs', [
+            'alarmList'
+        ]),
+        show() {
+            return this.dialogShow;
+        },
+        title() {
+            return this.type === 'CANCEL' ? '故障取消' : '故障设置';
+        }
+    },
+    methods: {
+        doShow(type) {
+            this.type = type;
+            if (type === 'CANCEL') {
+                this.options = [{ label: '闸机故障', value: 'gate_fault' }];
+            }
+            this.dialogShow = true;
+            this.elemList = [];
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('iscs/setDelIncidentList');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.farmed = '';
+                    if (this.formModel.value == 'frame_group') {
+                        this.setMalfunction();
+                    } else if (this.formModel.value === 'gate_fault') {
+                        if (this.$route.query.stationId && this.$route.params.mode === 'autoTicket') {
+                            this.$store.dispatch('iscs/handlerGateFaultList', { type: this.type, stationCode: this.$route.query.stationId });
+                        } else {
+                            this.$message.error('请在车站自动售检票系统中设置或取消故障！');
+                        }
+                    } else {
+                        this.setModelMalfunction(this.$iscs.iscsDevice[this.formModel.value].model);
+                    }
+                    this.dialogShow = false;
+                    if (this.formModel.value == 'group_2') {
+                        this.$message.success('104A断路器分位');
+                    } else if (this.formModel.value == 'group_52') {
+                        this.$message.success('104B断路器分位');
+                    }
+                } else {
+                    return false;
+                }
+            });
+        },
+        setModelMalfunction(model) {
+            model.valve = true;
+            this.handleModel(model, true);
+            this.relevance(model);
+        },
+        relevance(model) {
+            let time = 0;
+            let modelRelevance = {};
+            if (model.code == 'group_2' && model['valve']) {
+                modelRelevance = this.$iscs.iscsDevice['group_34'].model;
+                modelRelevance['valve'] = model['valve'];
+            } else if (model.code == 'group_52' && model['valve']) {
+                modelRelevance = this.$iscs.iscsDevice['group_22'].model;
+                modelRelevance['valve'] = model['valve'];
+            }
+            if (modelRelevance && modelRelevance.code) {
+                this.handleModel(modelRelevance, true);
+                time = 1500;
+            }
+            setTimeout(() => {
+                if ((model.code == 'group_2' && model['valve']) || (model.code == 'group_52' && model['valve'])) {
+                    const model1 = this.$iscs.iscsDevice['group_9'].model;
+                    model1['valve'] = model['valve'];
+                    const model2 = this.$iscs.iscsDevice['group_21'].model;
+                    model2['valve'] = model['valve'];
+                    const model3 = this.$iscs.iscsDevice['group_19'].model;
+                    model3['valve'] = model['valve'];
+                    const model4 = this.$iscs.iscsDevice['group_8'].model;
+                    model4['valve'] = model['valve'];
+                    this.handleModel(model1, true);
+                    this.handleModel(model2, true);
+                    this.handleModel(model3, true);
+                    this.handleModel(model4, true);
+                    time = 1500;
+                }
+                setTimeout(() => {
+                    let models = {};
+                    // valve true 变绿 false 红色
+                    if (model.code == 'group_2' || model.code == 'group_52') {
+                        models = this.$iscs.iscsDevice['group_54'].model;
+                        models['valve'] = false;
+                    } else if (model.code == 'group_3' || model.code == 'group_16') {
+                        models = this.$iscs.iscsDevice['group_15'].model;
+                        models['valve'] = false;
+                    }
+                    if (models && models.code) {
+                        this.handleModel(models, true);
+                    }
+                }, time);
+            }, time);
+        },
+        // 执行操作
+        handleModel(model, judge = true) {
+            const arr = [];
+            model.statusList.forEach(item => {
+                if (item.key == 'valve' && item.value == model.valve) {
+                    item.childList.forEach(ele => {
+                        Object.values(model.elemMap).forEach(elem => {
+                            if (elem.type == ele.type) {
+                                arr.push({
+                                    code: elem.code,
+                                    ...mapElement[ele.type].stateMap[ele.status]
+                                });
+                            }
+                        });
+                    });
+                }
+            });
+            const models = [{...model, valve: model.valve}];
+            this.$store.dispatch('iscs/updateIscsDevices', models.map(el => {
+                const device = deviceFactory(el._type, el);
+                return device.model;
+            }));
+            if (model.lineCode) {
+                // 关联接触网 颜色处理
+                model.lineCode.forEach(item => {
+                    arr.push({
+                        code: item,
+                        strokeColor: model.valve ? '#00FF1E' : '#FF0000'
+                    });
+                });
+            }
+            // 改变元素状态
+            arr.forEach(el => {
+                const device = this.$iscs.iscsDevice[el.code];
+                if (device && device.instance) {
+                    device.instance.setState(el);
+                }
+            });
+            const textList = setNum(Object.values(model.elemMap), true);
+            textList.forEach(el => {
+                const device = this.$iscs.iscsDevice[el.code];
+                if (device && device.instance) {
+                    device.instance.setState(el);
+                }
+            });
+            // 报警时间 开关
+            if (judge) {
+                const params = {
+                    name: model.name + this.farmed,
+                    times: this.filterTime(),
+                    station: this.$route.query.stationName,
+                    key: 'valve',
+                    valve: model.valve
+                };
+                this.$store.dispatch('iscs/setAddAlarmList', params);
+                this.$store.dispatch('iscs/setAddIncidentList', params);
+            }
+            if (model.code == 'group_34' || model.code == 'group_22') {
+                const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
+                ['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
+                    const device = this.$iscs.iscsDevice[code];
+                    if (device && device.instance) {
+                        device.instance.setState({
+                            gbColor: judge ? '#2aff00' : '#ff0000'
+                        });
+                    }
+                });
+            }
+        },
+        filterTime() {
+            const date = new Date();
+            const dateTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', date);
+            return dateTime;
+        },
+        dateFormat(fmt, date) {
+            let ret;
+            const opt = {
+                'Y+': date.getFullYear().toString(), // 年
+                'm+': (date.getMonth() + 1).toString(), // 月
+                'd+': date.getDate().toString(), // 日
+                'H+': date.getHours().toString(), // 时
+                'M+': date.getMinutes().toString(), // 分
+                'S+': date.getSeconds().toString() // 秒
+            };
+            for (const k in opt) {
+                ret = new RegExp('(' + k + ')').exec(fmt);
+                if (ret) {
+                    fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')));
+                }
+            }
+            return fmt;
+        },
+        // 框架电流保护故障
+        setMalfunction() {
+            // group_11 group_12 group_24 group_53 group_35 group_43 group_47 group_48
+            this.$iscs.iscsDevice['group_11'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_12'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_24'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_53'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_35'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_43'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_47'].model['valve'] = true;
+            this.$iscs.iscsDevice['group_48'].model['valve'] = true;
+            this.farmed = '';
+
+            this.handleModel(this.$iscs.iscsDevice['group_11'].model);
+            const promise1 = new Promise((resolve) => {
+                setTimeout(() => {
+                    this.handleModel(this.$iscs.iscsDevice['group_24'].model);
+                    setTimeout(() => {
+                        this.handleModel(this.$iscs.iscsDevice['group_35'].model);
+                        this.handleModel(this.$iscs.iscsDevice['group_43'].model);
+                        resolve();
+                    }, 500);
+                }, 500);
+            });
+            this.handleModel(this.$iscs.iscsDevice['group_12'].model);
+            const promise2 = new Promise((resolve) => {
+                setTimeout(() => {
+                    this.handleModel(this.$iscs.iscsDevice['group_53'].model);
+                    setTimeout(() => {
+                        this.handleModel(this.$iscs.iscsDevice['group_47'].model);
+                        this.handleModel(this.$iscs.iscsDevice['group_48'].model);
+                        resolve();
+                    }, 500);
+                }, 500);
+            });
+            const device = this.$iscs.iscsDevice['IscsButton_6'];
+            device.model['fault'] = true;
+            if (device && device.instance) {
+                device.instance.setState({
+                    backgroundColor: '#FF0000'
+                });
+            }
+            this.$store.commit('iscs/setFaultList', [
+                {
+                    stationName: '罗汉山站',
+                    list: [
+                        { code: 'group_11', valve: true },
+                        { code: 'group_12', valve: true },
+                        { code: 'group_24', valve: true },
+                        { code: 'group_53', valve: true },
+                        { code: 'group_35', valve: true },
+                        { code: 'group_43', valve: true },
+                        { code: 'group_47', valve: true },
+                        { code: 'group_48', valve: true },
+                        { code: 'IscsButton_6', fault: true }
+                    ]
+                },
+                {
+                    stationName: '象峰站',
+                    list: [
+                        { code: 'group_31', valve: true },
+                        { code: 'group_33', valve: true }
+                    ]
+                },
+                {
+                    stationName: '树兜站',
+                    list: [
+                        { code: 'group_35', valve: true },
+                        { code: 'group_23', valve: true }
+                    ]
+                }
+            ]);
+            Promise.all([promise1, promise2]).then(() => {
+                this.$message.success('105/106/201/202/211/212/213/214开关因为框架电流保护动作跳闸，分位');
+                this.handleAlarm();
+            });
+        },
+        handleAlarm() {
+            const list = [
+                {
+                    name: '211断路器',
+                    times: this.filterTime(),
+                    station: '象峰站'
+                },
+                {
+                    name: '212断路器',
+                    times: this.filterTime(),
+                    station: '象峰站'
+                },
+                {
+                    name: '211断路器',
+                    times: this.filterTime(),
+                    station: '树兜站'
+                },
+                {
+                    name: '212断路器',
+                    times: this.filterTime(),
+                    station: '树兜站'
+                }
+            ];
+            list.forEach(item => {
+                const params = {
+                    name: item.name,
+                    times: item.times,
+                    station: item.station,
+                    key: 'valve',
+                    valve: true
+                };
+                this.$store.dispatch('iscs/setAddAlarmList', params); // 报警
+                this.$store.dispatch('iscs/setAddIncidentList', params); // 事件
+            });
+        },
+        cancel() {
+            this.dialogShow = false;
+            this.formModel = {
+                value: ''
+            };
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/dialog/protectReset.vue b/src/views/iscs/iscsSystemNew/stationConfig/dialog/protectReset.vue
new file mode 100644
index 000000000..c981095b3
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/dialog/protectReset.vue
@@ -0,0 +1,180 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      title="直流1500V保护"
+      :visible.sync="show"
+      width="500px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-table border :data="elemList" style="width: 100%;" height="300px">
+        <el-table-column label="描述" prop="name" />
+        <el-table-column label="类型" prop="types" />
+        <el-table-column label="状态" prop="status" />
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope" style="padding: 0;">
+            <el-button size="mini" type="" style="width: 100%; height: 100%" @click="handleOption(scope.$index, scope.row)">复归选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      title="请执行或取消操作"
+      :visible.sync="showSublayer"
+      width="400px"
+      :before-close="doCloseSublayer"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="100px" size="small" label-position="left" :model="formModel">
+        <el-form-item label="控制点">
+          <div style="line-height: 15px; box-shadow: 0px 0px 2px inset #a2a2a2; padding: 5px;">{{ formModel.name }}</div>
+        </el-form-item>
+        <el-form-item label="控制动作">
+          <div style="line-height: 15px; box-shadow: 0px 0px 2px inset #a2a2a2; padding: 5px;">{{ formModel.action }}</div>
+        </el-form-item>
+        <el-form-item label="操作信息">
+          <div style="line-height: 15px; box-shadow: 0px 0px 2px inset #a2a2a2; padding: 5px;">{{ formModel.info }}</div>
+        </el-form-item>
+      </el-form>
+      <el-row justify="center" class="button-group">
+        <el-col :span="10" :offset="2">
+          <el-button type="primary" @click="commit">执行</el-button>
+        </el-col>
+        <el-col :span="8" :offset="4">
+          <el-button @click="doCloseSublayer">取消</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+    name: '',
+    data() {
+        return {
+            dialogShow: false,
+            showSublayer: false,
+            elemList: [],
+            model: {},
+            rowData: {},
+            activeIndex: -1,
+            formModel: {
+                name: '直流1500V 保护开关控制阀',
+                action: '某某开关控制阀 保护动作复归',
+                info: '复归'
+            }
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow;
+        }
+    },
+    mounted() {
+
+    },
+    methods: {
+        doShow(models) {
+            this.model = models;
+            this.dialogShow = true;
+            this.elemList = [
+                {
+                    name: '1500V 201保护动作复归',
+                    types: 'DO',
+                    status: '',
+                    fault: models['fault'] || false
+                },
+                {
+                    name: '1500V 202保护动作复归',
+                    types: 'DO',
+                    status: '',
+                    fault: models['fault'] || false
+                },
+                {
+                    name: '1500V 211保护动作复归',
+                    types: 'DO',
+                    status: '',
+                    fault: models['fault'] || false
+                },
+                {
+                    name: '1500V 212保护动作复归',
+                    types: 'DO',
+                    status: '',
+                    fault: models['fault'] || false
+                },
+                {
+                    name: '1500V 213保护动作复归',
+                    types: 'DO',
+                    status: '',
+                    fault: models['fault'] || false
+                },
+                {
+                    name: '1500V 214保护动作复归',
+                    types: 'DO',
+                    status: '',
+                    fault: models['fault'] || false
+                }
+            ];
+        },
+        handleOption(index, row) {
+            this.activeIndex = index;
+            this.rowData = JSON.parse(JSON.stringify(row));
+            this.showSublayer = true;
+        },
+        commit() {
+            this.showSublayer = false;
+            this.rowData.fault = false;
+            this.rowData.status = '完成';
+            this.elemList.splice(this.activeIndex, 1, this.rowData);
+            this.activeIndex = -1;
+
+            const arr = [];
+            this.elemList.forEach(item => {
+                if (item.fault) {
+                    arr.push(item);
+                }
+            });
+            if (!arr.length) {
+                const device = this.$iscs.iscsDevice['IscsButton_6'];
+                device.model['fault'] = false;
+                if (device && device.instance) {
+                    device.instance.setState({
+                        backgroundColor: '#00CC00'
+                    });
+                }
+                const arr = [];
+                this.$store.state.iscs.faultList.forEach(item => {
+                    if (item.stationName == this.$route.query.stationName) {
+                        item.list.forEach(ele => {
+                            if (ele.code == 'IscsButton_6') {
+                                ele.fault = false;
+                            }
+                        });
+                    }
+                    arr.push(item);
+                });
+                this.$store.commit('iscs/setFaultList', arr);
+            }
+        },
+        doCloseSublayer() {
+            this.showSublayer = false;
+        },
+        doClose() {
+            this.dialogShow = false;
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/dialog/valve.vue b/src/views/iscs/iscsSystemNew/stationConfig/dialog/valve.vue
new file mode 100644
index 000000000..7a2f985fa
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/dialog/valve.vue
@@ -0,0 +1,337 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      :title="title"
+      :visible.sync="show"
+      width="500px"
+      :before-close="doClose"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-table border :data="elemList" style="width: 100%;" height="300px">
+        <el-table-column label="描述" prop="name" />
+        <el-table-column label="类型" prop="types" />
+        <el-table-column label="状态" prop="status" />
+        <el-table-column label="操作" width="120">
+          <template slot-scope="scope" style="padding: 0;">
+            <el-button size="mini" type="" style="width: 100%; height: 100%" @click="handleOption(scope.$index, scope.row)">{{ scope.row[scope.row.key] ? list[scope.row.key][0] : list[scope.row.key][1] }}选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog
+      v-dialogDrag
+      class="iscs_fuzhou-01__systerm route-detail"
+      title="请执行或取消操作"
+      :visible.sync="showSublayer"
+      width="400px"
+      :before-close="doCloseSublayer"
+      :z-index="2000"
+      :modal="false"
+      :close-on-click-modal="false"
+    >
+      <el-form label-width="100px" size="small" label-position="left" :model="formModel">
+        <el-form-item label="控制点">
+          <div style="line-height: 15px; box-shadow: 0px 0px 2px inset #a2a2a2; padding: 5px;">{{ formModel.name }}</div>
+        </el-form-item>
+        <el-form-item label="控制动作">
+          <div style="line-height: 15px; box-shadow: 0px 0px 2px inset #a2a2a2; padding: 5px;">{{ formModel.action }}</div>
+        </el-form-item>
+        <el-form-item label="操作信息">
+          <div style="line-height: 15px; box-shadow: 0px 0px 2px inset #a2a2a2; padding: 5px;">{{ formModel.info }}</div>
+        </el-form-item>
+      </el-form>
+      <el-row justify="center" class="button-group">
+        <el-col :span="10" :offset="2">
+          <el-button type="primary" @click="commit">执行</el-button>
+        </el-col>
+        <el-col :span="8" :offset="4">
+          <el-button @click="doCloseSublayer">取消</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import mapElement from '@/iscs/status/mapElement.js';
+import {deviceFactory} from '@/iscs/utils/parser';
+import { setNum } from '@/iscs/status/mapElement.js';
+
+export default {
+    name: '',
+    data() {
+        return {
+            dialogShow: false,
+            showSublayer: false,
+            activeIndex: -1,
+            title: '',
+            rowData: {},
+            elemList: [],
+            model: {},
+            formModel: {
+                name: '35KV高压开关室 35KV动力变馈线柜-CT5/1',
+                action: '短路器遥控开关分闸',
+                info: ''
+            },
+            list: {
+                valve: ['控合', '控分']
+            }
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow;
+        }
+    },
+    methods: {
+        doShow(models) {
+            this.model = models;
+            this.dialogShow = true;
+            this.title = models.name || '弹窗名称';
+            this.elemList = [];
+            models.statusList.forEach(item => {
+                if (!this.elemList.length) {
+                    this.elemList = [
+                        {
+                            name: item.des,
+                            types: 'DO',
+                            key: item.key,
+                            status: '',
+                            [item.key]: models[item.key] || false
+                        }
+                    ];
+                } else {
+                    const arr = this.elemList.filter(ele => ele.key == item.key);
+                    if (!arr.length) {
+                        this.elemList.push({
+                            name: item.des,
+                            types: 'DO',
+                            key: item.key,
+                            status: '',
+                            [item.key]: false
+                        });
+                    }
+                }
+            });
+        },
+        commit() {
+            this.showSublayer = false;
+            this.rowData[this.rowData.key] = !this.rowData[this.rowData.key];
+            this.elemList.splice(this.activeIndex, 1, this.rowData);
+            if (this.model.code == 'group_3' || this.model.code == 'group_16') {
+                if (this.rowData[this.rowData.key]) {
+                    this.model[this.rowData.key] = this.rowData[this.rowData.key];
+                    this.handleModel(this.model);
+                    this.relevance();
+                } else {
+                    if (this.$iscs.iscsDevice['group_15'].model['valve']) {
+                        this.model[this.rowData.key] = this.rowData[this.rowData.key];
+                        this.handleModel(this.model);
+                    } else {
+                        console.log('不允许点击');
+                    }
+                }
+            } else if (this.model.code == 'group_24' || this.model.code == 'group_53' || this.model.code == 'group_35' || this.model.code == 'group_43' || this.model.code == 'group_47' || this.model.code == 'group_48') {
+                if (this.rowData[this.rowData.key]) {
+                    this.model[this.rowData.key] = this.rowData[this.rowData.key];
+                    this.handleModel(this.model);
+                } else {
+                    if (!this.$iscs.iscsDevice['IscsButton_6'].model['fault']) {
+                        this.model[this.rowData.key] = this.rowData[this.rowData.key];
+                        this.handleModel(this.model);
+                    } else {
+                        console.log('不允许点击');
+                    }
+                }
+            } else {
+                this.model[this.rowData.key] = this.rowData[this.rowData.key];
+                this.handleModel(this.model);
+                this.relevance();
+            }
+        },
+        // 固定关联关系 模块变化
+        relevance() {
+            let time = 0;
+            let modelRelevance = {};
+            if (this.model.code == 'group_2' && this.model['valve']) {
+                modelRelevance = this.$iscs.iscsDevice['group_34'].model;
+                modelRelevance['valve'] = this.model['valve'];
+            } else if (this.model.code == 'group_52' && this.model['valve']) {
+                modelRelevance = this.$iscs.iscsDevice['group_22'].model;
+                modelRelevance['valve'] = this.model['valve'];
+            }
+            if (modelRelevance && modelRelevance.code) {
+                this.handleModel(modelRelevance);
+                time = 1500;
+            }
+            setTimeout(() => {
+                if ((this.model.code == 'group_2' && this.model['valve']) || (this.model.code == 'group_52' && this.model['valve'])) {
+                    const model1 = this.$iscs.iscsDevice['group_9'].model;
+                    model1['valve'] = this.model['valve'];
+                    const model2 = this.$iscs.iscsDevice['group_21'].model;
+                    model2['valve'] = this.model['valve'];
+                    const model3 = this.$iscs.iscsDevice['group_19'].model;
+                    model3['valve'] = this.model['valve'];
+                    const model4 = this.$iscs.iscsDevice['group_8'].model;
+                    model4['valve'] = this.model['valve'];
+                    this.handleModel(model1);
+                    this.handleModel(model2);
+                    this.handleModel(model3);
+                    this.handleModel(model4);
+                    time = 1500;
+                }
+                setTimeout(() => {
+                    let model = {};
+                    // valve true 变绿 false 红色
+                    if (this.model.code == 'group_2' || this.model.code == 'group_52') {
+                        model = this.$iscs.iscsDevice['group_54'].model;
+                        model['valve'] = !(this.$iscs.iscsDevice['group_2'].model['valve'] || this.$iscs.iscsDevice['group_52'].model['valve']);
+                    } else if (this.model.code == 'group_3' || this.model.code == 'group_16') {
+                        model = this.$iscs.iscsDevice['group_15'].model;
+                        model['valve'] = !(this.$iscs.iscsDevice['group_3'].model['valve'] || this.$iscs.iscsDevice['group_16'].model['valve']);
+                    }
+                    if (model && model.code) {
+                        this.handleModel(model);
+                        time = 1500;
+                    }
+                    setTimeout(() => {
+                        if (this.model.code == 'group_2' && !this.model['valve']) {
+                            modelRelevance = this.$iscs.iscsDevice['group_34'].model;
+                            modelRelevance['valve'] = this.model['valve'];
+                        } else if (this.model.code == 'group_52' && !this.model['valve']) {
+                            modelRelevance = this.$iscs.iscsDevice['group_22'].model;
+                            modelRelevance['valve'] = this.model['valve'];
+                        }
+                        if (modelRelevance && modelRelevance.code) {
+                            this.handleModel(modelRelevance);
+                        }
+                    }, time);
+                }, time);
+            }, time);
+
+        },
+        // 执行操作
+        handleModel(model) {
+            const arr = [];
+            model.statusList.forEach(item => {
+                if (item.key == 'valve' && item.value == model.valve) {
+                    item.childList.forEach(ele => {
+                        Object.values(model.elemMap).forEach(elem => {
+                            if (elem.type == ele.type) {
+                                arr.push({
+                                    code: elem.code,
+                                    ...mapElement[ele.type].stateMap[ele.status]
+                                });
+                            }
+                        });
+                    });
+                }
+            });
+            const models = [{...model, valve: model.valve}];
+            this.$store.dispatch('iscs/updateIscsDevices', models.map(el => {
+                const device = deviceFactory(el._type, el);
+                return device.model;
+            }));
+            if (model.lineCode) {
+                // 关联接触网 颜色处理
+                model.lineCode.forEach(item => {
+                    arr.push({
+                        code: item,
+                        strokeColor: model.valve ? '#00FF1E' : '#FF0000'
+                    });
+                });
+            }
+            // 改变元素状态
+            arr.forEach(el => {
+                const device = this.$iscs.iscsDevice[el.code];
+                if (device && device.instance) {
+                    device.instance.setState(el);
+                }
+            });
+            const textList = setNum(Object.values(model.elemMap), model.valve);
+            textList.forEach(el => {
+                const device = this.$iscs.iscsDevice[el.code];
+                if (device && device.instance) {
+                    device.instance.setState(el);
+                }
+            });
+            const params = {
+                name: model.name,
+                times: this.filterTime(),
+                station: this.$route.query.stationName,
+                key: 'valve',
+                valve: model.valve
+            };
+            this.$store.dispatch('iscs/setAddAlarmList', params);
+            this.$store.dispatch('iscs/setAddIncidentList', params);
+
+            const arrList = [];
+            this.$store.state.iscs.faultList.forEach(item => {
+                if (item.stationName == this.$route.query.stationName) {
+                    item.list.forEach(ele => {
+                        if (ele.code == model.code) {
+                            ele.valve = false;
+                        }
+                    });
+                }
+                arrList.push(item);
+            });
+            this.$store.commit('iscs/setFaultList', arrList);
+            if (model.code == 'group_34' || model.code == 'group_22') {
+                const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
+                ['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
+                    const device = this.$iscs.iscsDevice[code];
+                    if (device && device.instance) {
+                        device.instance.setState({
+                            gbColor: judge ? '#2aff00' : '#ff0000'
+                        });
+                    }
+                });
+            }
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        handleOption(index, row) {
+            this.activeIndex = index;
+            this.formModel.info = row[row.key] ? this.list[row.key][0] : this.list[row.key][1];
+            this.rowData = JSON.parse(JSON.stringify(row));
+            this.showSublayer = true;
+        },
+        doCloseSublayer() {
+            this.showSublayer = false;
+        },
+        filterTime() {
+            const date = new Date();
+            const dateTime = this.dateFormat('YYYY-mm-dd HH:MM:SS', date);
+            return dateTime;
+        },
+        dateFormat(fmt, date) {
+            let ret;
+            const opt = {
+                'Y+': date.getFullYear().toString(), // 年
+                'm+': (date.getMonth() + 1).toString(), // 月
+                'd+': date.getDate().toString(), // 日
+                'H+': date.getHours().toString(), // 时
+                'M+': date.getMinutes().toString(), // 分
+                'S+': date.getSeconds().toString() // 秒
+            };
+            for (const k in opt) {
+                ret = new RegExp('(' + k + ')').exec(fmt);
+                if (ret) {
+                    fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')));
+                }
+            }
+            return fmt;
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/environment.vue b/src/views/iscs/iscsSystemNew/stationConfig/environment.vue
new file mode 100644
index 000000000..a402dc7bc
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/environment.vue
@@ -0,0 +1,209 @@
+<template>
+  <div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
+    <div class="Substation" :style="{'background':bacground}">
+      <div class="Substation_header">{{ title }}</div>
+      <div v-if="mode.includes('environmentFive')" class="environmentFive-box">
+        <div class="button_box" :class="{'active': userInterface == 'environmentFive01'}" @click="handleButton('01', userInterface == 'environmentFive01')">小系统1模式</div>
+        <div class="button_box" :class="{'active': userInterface == 'environmentFive02'}" @click="handleButton('02', userInterface == 'environmentFive02')">小系统2模式</div>
+        <div class="button_box" :class="{'active': userInterface == 'environmentFive03'}" @click="handleButton('03', userInterface == 'environmentFive03')">小系统3模式</div>
+      </div>
+      <div v-if="mode.includes('environmentNine')" class="environmentFive-box">
+        <div class="button_box" :class="{'active': userInterface == 'environmentNine01'}" @click="handleIllumination('01', userInterface == 'environmentNine01')">照明系统</div>
+        <div class="button_box" :class="{'active': userInterface == 'environmentNine02'}" @click="handleIllumination('02', userInterface == 'environmentNine02')">照明系统监测</div>
+      </div>
+      <div v-if="userInterface.includes('environmentEleven') || userInterface.includes('environmentTwelve')" class="environmentFive-box">
+        <div class="button_box" :class="{'active': userInterface == 'environmentEleven'}" @click="handleEnvironment('environmentEleven', userInterface == 'environmentEleven', '人防门')">人防门</div>
+        <div class="button_box" :class="{'active': userInterface == 'environmentTwelve'}" @click="handleEnvironment('environmentTwelve', userInterface == 'environmentTwelve', '防淹门系统')">防淹门</div>
+      </div>
+      <div>
+        <iscsSystem ref="iscsPlate" />
+      </div>
+    <!-- <div class="psdSystem_footer">
+      <div class="prevButton">{{}}</div>
+      <div class="nextButton">{{}}</div>
+    </div> -->
+    </div>
+  </div>
+</template>
+<script>
+import iscsSystem from './iscsCanvas';
+import {getIscsData} from '@/api/iscs';
+export default {
+    name:'Environment',
+    components:{
+        iscsSystem
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        },
+        mode: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            title: '',
+            userInterface:'',
+            bacground: 'rgba(0,0,0,0)',
+            loading: false,
+            width: window.innerWidth,
+            scaleRate: window.innerWidth / 1920,
+            height: 1000,
+            system: ''
+        };
+    },
+    watch:{
+        'mode':function() {
+            this.getInitData();
+        }
+    },
+    mounted() {
+        this.getInitData();
+    },
+    methods:{
+        handleButton(type, judge) {
+            if (!judge) {
+                this.system = 'environmentFive';
+                this.title = `${this.stationName}  小系统${Number(type)}原理图`;
+                this.userInterface = `environmentFive${type}`;
+                this.getDetail(this.userInterface);
+            }
+        },
+        handleIllumination(type, judge) {
+            if (!judge) {
+                this.system = 'environmentNine';
+                this.title = `${this.stationName}  照明系统`;
+                this.userInterface = `environmentNine${type}`;
+                this.getDetail(this.userInterface);
+            }
+        },
+        handleEnvironment(type, judge, name) {
+            if (!judge) {
+                this.title = `${this.stationName}  ${name}`;
+                this.userInterface = type;
+                this.getDetail(this.userInterface );
+            }
+        },
+        getInitData() {
+            let userInterface = '';
+            this.system = 'environment';
+            if (this.mode == 'environmentThree') {
+                this.title = this.stationName + ' 隧道通风系统';
+                this.scaleRate = window.innerWidth / 2000;
+                this.height = 1000;
+            } else if (this.mode == 'environmentFour') {
+                this.title = this.stationName + ' 大系统';
+                this.scaleRate = window.innerWidth / 2000;
+                this.height = 900;
+            } else if (this.mode == 'environmentFive') {
+                userInterface = 'environmentFive01';
+                this.system = 'environmentFive';
+                this.title = this.stationName + ' 小系统1原理图';
+                this.scaleRate = window.innerWidth / 2000;
+                this.height = 800;
+            } else if (this.mode == 'environmentSix') {
+                this.title = this.stationName + ' 冷水系统 原理图';
+                this.scaleRate = window.innerWidth / 2000;
+                this.height = 900;
+            } else if (this.mode == 'environmentSeven') {
+                this.title = this.stationName + ' 多联空调 原理图';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            } else if (this.mode == 'environmentEight') {
+                this.title = this.stationName + ' A端 给排水系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            } else if (this.mode == 'environmentNine') {
+                this.system = 'environmentNine';
+                userInterface = 'environmentNine01';
+                this.title = this.stationName + ' 照明系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 800;
+            } else if (this.mode == 'environmentTen') {
+                this.title = this.stationName + ' 自动扶梯系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            } else if (this.mode == 'environmentThirteen') {
+                this.title = this.stationName + ' 传感器';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 1000;
+            } else if (this.mode == 'environmentEleven') {
+                this.title = this.stationName + ' 人防门';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+                userInterface = this.mode;
+            } else if (this.mode == 'environmentTwelve') {
+                this.title = this.stationName + ' 防淹门系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            }
+            this.userInterface = userInterface;
+            this.getDetail(userInterface);
+        },
+        getDetail(userInterface) {
+            const params = {
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
+                system: this.system,
+                totalSystem :'environment02',
+                userInterface : userInterface || this.mode
+            };
+            this.loading = true;
+            this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
+            getIscsData(params).then(resp=>{
+                this.loading = false;
+                if (resp.data) {
+                    const data = JSON.parse(resp.data.graphData);
+                    this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
+                    document.querySelector('.Substation').scrollTop = 0;
+                } else {
+                    this.loading = false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.Substation_header{
+    text-align: center;
+    margin-top: 15px;
+    color: #d8e9a5;
+	font-size: 25px;
+}
+.Substation{
+    display: inline-block;
+    width:100%;
+    height:100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+}
+.SubstationIn{
+    display: inline-block;
+}
+.environmentFive-box{
+	position: absolute;
+	right: 60px;
+	top: 68px;
+	z-index: 100;
+	.button_box{
+		background: #D1C1C4;
+		border: 1px solid #fff;
+		float: left;
+		padding: 8px 10px;
+		cursor: pointer;
+		font-size: 14px;
+		&.active{
+			color: #939393;
+		}
+	}
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/fas.vue b/src/views/iscs/iscsSystemNew/stationConfig/fas.vue
new file mode 100644
index 000000000..c8df1cb98
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/fas.vue
@@ -0,0 +1,128 @@
+<template>
+  <div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
+    <div class="fasIndex" :style="{'background':bacground}">
+      <div class="fasIndex_header">{{ title }}</div>
+      <div>
+        <iscsSystem ref="iscsPlate" />
+      </div>
+    <!-- <div class="psdSystem_footer">
+      <div class="prevButton">{{}}</div>
+      <div class="nextButton">{{}}</div>
+    </div> -->
+    </div>
+  </div>
+</template>
+<script>
+import iscsSystem from './iscsCanvas';
+import {getIscsData} from '@/api/iscs';
+export default {
+    name:'Fas',
+    components:{
+        iscsSystem
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        },
+        mode: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            title:'',
+            bacground:'rgba(66,90,116,1)',
+            loading:false,
+            width:window.innerWidth,
+            scaleRate:window.innerWidth / 2200,
+            height: 1000
+        };
+    },
+    watch:{
+        'mode':function() {
+            this.getInitData();
+        }
+    },
+    mounted() {
+        this.getInitData();
+    },
+    methods:{
+        getInitData() {
+            const params = {
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
+                system: 'fas',
+                totalSystem :'fas02',
+                userInterface : this.mode
+            };
+
+            if (this.mode == 'gas') {
+                this.title = this.stationName + ' 气体灭火系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 930;
+            } else if (this.mode == 'sensing') {
+                this.title = '';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 800;
+            } else if (this.mode == 'section') {
+                this.title = this.stationName + ' 火灾报警系统 区间层';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            } else if (this.mode == 'linkage') {
+                this.title = this.stationName + ' 火灾报警系统 FAS联动';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            } else if (this.mode == 'stationHall') {
+                this.title = '';
+                params.userInterface = this.$route.query.partSign ? `stationHall${this.$route.query.partSign} ` : 'stationHallOne';
+                params.system = 'stationHall';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 850;
+            } else if (this.mode == 'platform') {
+                params.userInterface = this.$route.query.partSign ? `platform${this.$route.query.partSign}` : 'platformOne';
+                params.system = 'platform';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 850;
+            }
+
+            this.loading = true;
+            this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
+            getIscsData(params).then(resp=>{
+                if (resp.data) {
+                    this.loading = false;
+                    const data = JSON.parse(resp.data.graphData);
+                    this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
+                    document.querySelector('.fasIndex').scrollTop = 0;
+                } else {
+                    this.loading = false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.fasIndex_header{
+    text-align: center;
+    margin-top: 15px;
+    color: #d8e9a5;
+	font-size: 25px;
+}
+.fasIndex{
+    display: inline-block;
+    width:100%;
+    height:100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+}
+.SubstationIn{
+    display: inline-block;
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/index.vue b/src/views/iscs/iscsSystemNew/stationConfig/index.vue
new file mode 100644
index 000000000..cdfd1bdee
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/index.vue
@@ -0,0 +1,79 @@
+<template>
+  <div style="height: 100%; width: 100%;overflow-y:hidden;overflow-x:hidden;position: relative;">
+    <psd-system v-if="mode=='psdSystem'" :station-name="stationName" :station-id="stationId" />
+    <substation v-else-if="mode=='substation'" :station-id="stationId" :station-name="stationName" />
+    <schedule v-else-if="mode=='schedule'" />
+    <environment v-else-if="mode.includes('environment')" :station-id="stationId" :station-name="stationName" :mode="mode" />
+    <fas v-else-if="fasList.includes(mode)" :station-id="stationId" :station-name="stationName" :mode="mode" />
+    <signal-system v-else-if="mode === 'signal'" :station-id="stationId" :station-name="stationName" :mode="mode" />
+
+    <ticket-or-entrance v-else-if="mode === 'autoTicket'||mode === 'afcTwo02'||mode === 'afcOne02'" :station-id="stationId" :station-name="stationName" :mode="mode" />
+    <broadcast-home v-else-if="mode === 'paMain'" :station-id="stationId" :station-name="stationName" :mode="mode" />
+    <radio-listening-pa v-else-if="mode === 'paMonitor'" />
+    <time-preview-pa v-else-if="mode === 'paPreview'" />
+    <pids-emergency v-else-if="mode === 'pidsEmergency'" />
+    <pids-lcd v-else-if="mode === 'pidsLcd'" />
+    <pids-main v-else-if="mode === 'pidsMain'" :station-id="stationId" />
+    <pids-preview v-else-if="mode === 'pidsPreview'" />
+
+  </div>
+</template>
+<script>
+import PsdSystem from './psdSystem.vue';
+import Substation from './substation.vue';
+import Schedule from './schedule.vue';
+import Environment from './environment.vue';
+import Fas from './fas.vue';
+import SignalSystem from './signalSystem.vue';
+import TicketOrEntrance from './ticketOrEntrance';
+import BroadcastHome from '../config/broadcast/homeScreen';
+import RadioListeningPa from '../config/pa/radioListeningPA';
+import TimePreviewPa from '../config/pa/timePreviewPA';
+import PidsEmergency from '../config/pis/emergencyRelease';
+import PidsMain from '../config/pis/mainScreen';
+import PidsPreview from '../config/pis/timePreview';
+import PidsLcd from '../config/pis/lcdControl';
+
+export default {
+    name:'StationConfig',
+    components: {
+        PsdSystem,
+        Substation,
+        Schedule,
+        Environment,
+        Fas,
+        SignalSystem,
+        TicketOrEntrance,
+        BroadcastHome,
+        RadioListeningPa,
+        TimePreviewPa,
+        PidsEmergency,
+        PidsMain,
+        PidsPreview,
+        PidsLcd
+    },
+    data() {
+        return {
+            mode: '',
+            stationId:'',
+            stationName:'',
+            fasList:[
+                'sensing',
+                'gas',
+                'section',
+                'linkage',
+                'stationHall',
+                'platform'
+            ]
+        };
+    },
+    methods:{
+        showPane(param) {
+            this.mode = param.type;
+            this.stationName = param.stationName;
+            this.stationId = param.stationId;
+        }
+    }
+};
+</script>
+
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/iscsCanvas.vue b/src/views/iscs/iscsSystemNew/stationConfig/iscsCanvas.vue
new file mode 100644
index 000000000..b026f9661
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/iscsCanvas.vue
@@ -0,0 +1,327 @@
+<template>
+  <div class="iscsCanvas">
+    <div :id="iscsId" v-loading="loading" :style="{ width: widthCanvas +'px', height: canvasHeight +'px' }" class="iscs-canvas" />
+    <valve-dialog ref="valve" />
+    <protect-reset ref="protectReset" />
+    <audio id="teleRing" :src="teleRing" preload loop />
+  </div>
+</template>
+<script>
+import teleRing from '@/assets/AlarmSoundUrgent.wav';
+
+import Vue from 'vue';
+import { parser } from '@/iscs/utils/parser';
+import Iscs from '@/iscs/iscs';
+import ValveDialog from './dialog/valve';
+import ProtectReset from './dialog/protectReset';
+
+import mapElement from '@/iscs/status/mapElement.js';
+import {deviceFactory} from '@/iscs/utils/parser';
+import { setNum } from '@/iscs/status/mapElement.js';
+
+export default {
+    name: 'IscsStation',
+    components: {
+        ValveDialog,
+        ProtectReset
+    },
+    props: {
+        size: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            loading:false,
+            widthCanvas:1200,
+            canvasHeight:500,
+            scaleRate:1,
+            teleRing: teleRing
+        };
+    },
+    computed: {
+        iscsId() {
+            return ['iscs', (Math.random().toFixed(5)) * 100000].join('_');
+        }
+    },
+    watch: {
+        '$store.state.iscs.alarmList': function(list) {
+            if (list.length) {
+                if (document.querySelector('#teleRing')) {
+                    document.querySelector('#teleRing').play();
+                }
+            }
+        },
+        '$store.state.iscs.closeMusicNum': function(val) {
+            if (val) {
+                document.querySelector('#teleRing').pause();
+                this.$store.commit('iscs/setCloseMusic', 0);
+            }
+        }
+    },
+    methods:{
+        show(iscsData, widthCanvas, canvasHeight, scaleRate) {
+            this.loading = true;
+            this.widthCanvas = widthCanvas;
+            this.canvasHeight = canvasHeight;
+            this.scaleRate = scaleRate;
+            const parserData = parser(iscsData, {width: this.widthCanvas, height: this.canvasHeight});
+            this.$iscs = new Iscs({
+                dom: document.getElementById(this.iscsId),
+                config: {
+                    renderer: 'canvas',
+                    width: this.widthCanvas,
+                    height: this.canvasHeight
+                },
+                options: {
+                    scaleRate: this.scaleRate,
+                    offsetX: 0,
+                    offsetY: 0
+                },
+                methods: {
+                    viewLoaded: this.handleViewLoaded
+                }
+            });
+            Vue.prototype.$iscs = this.$iscs;
+            this.setIscs(parserData, iscsData);
+            this.$store.dispatch('iscs/setIscsData', iscsData);
+            if (this.$route.query.group) {
+                this.$iscs.on('dblclick', this.onDblclick, this);
+                this.$iscs.on('click', this.onlclick, this);
+            }
+        },
+        onDblclick(em) {
+            // 父编组上元素内容
+            if (em.deviceType == 'IscsGroup') {
+                this.$iscs.iscsDevice[em.deviceModel.code].instance.hide();
+                this.$refs.valve.doShow(em.deviceModel);
+            } else if (em.deviceType == 'IscsButton' && ['OperatingButton'].includes(em.deviceModel.function)) {
+                this.$refs.protectReset.doShow(em.deviceModel);
+            }
+        },
+
+        onlclick(em) {
+            // 父编组上元素内容
+            const query = {
+                stationName: this.$route.query.stationName,
+                stationId: this.$route.query.stationId,
+                group: this.$route.query.group,
+                mapId: this.$route.query.mapId,
+                lineCode:'02',
+                noPreLogout:this.$route.query.noPreLogout,
+                partId: ''
+            };
+            let type = '';
+            if (em.deviceType == 'IscsButton') {
+                if (em.deviceModel.function == 'goToStand') {
+                    type = 'afcTwo02';
+                } else if (em.deviceModel.function == 'goToStation') {
+                    type = 'afcOne02';
+                } else if (em.deviceModel.function.includes('goFireStation-') ) {
+                    type = 'stationHall';
+                    query.partSign = em.deviceModel.function.replace('goFireStation-', '');
+                } else if (em.deviceModel.function.includes('goFireStand-') ) {
+                    type = 'platform';
+                    query.partSign = em.deviceModel.function.replace('goFireStand-', '');
+                } else if (em.deviceModel.function === 'ElementShow') {
+                    type = '';
+                    switch (em.deviceModel.hideType) {
+                    case 'alarmLamp':
+                        this.$iscs.hideShowElementType('IscsPicture', 'alarmLamp');
+                        break;
+                    case 'smokeDetector':
+                        this.$iscs.hideShowElementType('IscsPicture', 'smokeDetector');
+                        break;
+                    case 'fireDamper':
+                        this.$iscs.hideShowElementType('IscsPicture', 'fireDamper');
+                        break;
+                    case 'alarmButton':
+                        this.$iscs.hideShowElementType('IscsPicture', 'alarmButton');
+                        break;
+                    }
+
+                }
+                if (type) {
+                    this.$router.replace({ path: `/displayIscs/system/stationConfig/${type}`, query: query });
+                }
+            }
+        },
+
+        // 地图加载完成
+        handleViewLoaded() {
+            this.loading = false;
+            var arr = Object.keys(this.$iscs.iscsDevice);
+            if (arr.length != 0) {
+                this.$store.state.iscs.faultList.forEach(item => {
+                    if (item.stationName == this.$route.query.stationName) {
+                        item.list.forEach(ele => {
+                            const device = this.$iscs.iscsDevice[ele.code];
+                            device.model = Object.assign(device.model, ele);
+                            if (device.model._type == 'IscsButton') {
+                                if (device && device.instance) {
+                                    device.instance.setState({
+                                        backgroundColor: device.model['fault'] ? '#FF0000' : '#00CC00'
+                                    });
+                                }
+                            } else {
+                                this.handleModel(device.model);
+                            }
+                        });
+                    }
+                });
+            }
+            this.$emit('viewLoaded');
+        },
+        setIscs(data, oldData) {
+            this.$iscs.setIscs(oldData, data, this.$route.query.lineCode);
+        },
+        // 执行操作
+        handleModel(model) {
+            const arr = [];
+            model.statusList.forEach(item => {
+                if (item.key == 'valve' && item.value == model.valve) {
+                    item.childList.forEach(ele => {
+                        Object.values(model.elemMap).forEach(elem => {
+                            if (elem.type == ele.type) {
+                                arr.push({
+                                    code: elem.code,
+                                    ...mapElement[ele.type].stateMap[ele.status]
+                                });
+                            }
+                        });
+                    });
+                }
+            });
+            const models = [{...model, valve: model.valve}];
+            this.$store.dispatch('iscs/updateIscsDevices', models.map(el => {
+                const device = deviceFactory(el._type, el);
+                return device.model;
+            }));
+            if (model.lineCode) {
+                // 关联接触网 颜色处理
+                model.lineCode.forEach(item => {
+                    arr.push({
+                        code: item,
+                        strokeColor: model.valve ? '#00FF1E' : '#FF0000'
+                    });
+                });
+            }
+            // 改变元素状态
+            arr.forEach(el => {
+                const device = this.$iscs.iscsDevice[el.code];
+                if (device && device.instance) {
+                    device.instance.setState(el);
+                }
+            });
+            const textList = setNum(Object.values(model.elemMap), model.valve);
+            textList.forEach(el => {
+                const device = this.$iscs.iscsDevice[el.code];
+                if (device && device.instance) {
+                    device.instance.setState(el);
+                }
+            });
+            if (model.code == 'group_34' || model.code == 'group_22') {
+                const judge = !(this.$iscs.iscsDevice['group_34'].model['valve'] || this.$iscs.iscsDevice['group_22'].model['valve']);
+                ['IscsText_112', 'IscsText_113', 'IscsText_114', 'IscsText_116', 'IscsText_117', 'IscsText_118', 'IscsText_119', 'IscsText_120'].forEach(code => {
+                    const device = this.$iscs.iscsDevice[code];
+                    if (device && device.instance) {
+                        device.instance.setState({
+                            gbColor: judge ? '#2aff00' : '#ff0000'
+                        });
+                    }
+                });
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .iscs-button{
+        position: absolute;
+        float: right;
+        right: 20px;
+        bottom: 15px;
+    }
+    .iscs-canvas{
+        margin: 0 auto;
+    }
+    .iscsCanvas{
+        width: 100%;
+        height: 100%;
+        overflow-y: auto;
+        overflow-x: hidden;
+    }
+</style>
+<style>
+.iscs_fuzhou-01__systerm .el-dialog {
+	background: rgba(100, 100, 100, 0.3);
+	border: 2px solid rgb(144, 144, 144, 0.8);
+	border-radius: 6px;
+	color: #000;
+	font-size: 14px;
+}
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__header {
+	padding: 5px;
+	height: 26px;
+}
+
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__footer {
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__body {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 0px 5px 5px;
+	border: 2px solid rgba(120, 121, 123, 0.5);
+	box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+	background: #F0F0F0;
+	opacity: 1;
+}
+
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__title {
+	position: absolute;
+	top: 4px;
+	color: #000;
+	border-radius: 4px;
+	padding: 0px 2px;
+	height: 20px;
+	line-height: 20px
+}
+
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__title::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	-webkit-filter: blur(10px);
+	filter: blur(10px);
+	height: 20px;
+	width: -webkit-fill-available;
+	background: rgba(128, 128, 128, 0.8);
+	z-index: -1;
+}
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__headerbtn {
+	background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+	border: 1px solid #fff;
+	border-radius: 4px;
+	top: 4px;
+	right: 5px;
+	line-height: 16px;
+}
+
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+	font-size: 16px;
+}
+
+.iscs_fuzhou-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+	color: #fff;
+}
+</style>
+
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/psdSystem.vue b/src/views/iscs/iscsSystemNew/stationConfig/psdSystem.vue
new file mode 100644
index 000000000..5a4eadac7
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/psdSystem.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="psdSystem">
+    <div class="psdSystem_header">{{ stationName+' 屏蔽门系统' }}</div>
+    <div>
+      <iscsSystem ref="iscsPlate" @viewLoaded="viewLoaded" />
+      <!-- :width-canvas="width" :canvas-height="height"  -->
+    </div>
+    <!-- <div class="psdSystem_footer">
+      <div class="prevButton">{{}}</div>
+      <div class="nextButton">{{}}</div>
+    </div> -->
+  </div>
+</template>
+<script>
+import iscsSystem from './iscsCanvas';
+import {getIscsData} from '@/api/iscs';
+import { getToken } from '@/utils/auth';
+import { creatSubscribe, clearSubscribe, getTopic } from '@/utils/stomp';
+export default {
+    name:'PsdSystem',
+    components:{
+        iscsSystem
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            scaleRate:window.innerWidth / 1950,
+            flag: false
+        };
+    },
+    computed:{
+        width() {
+            return window.innerWidth;
+        },
+        height() {
+            return 800;
+        }
+
+    },
+    beforeDestroy() {
+        this.clearSubscribe(this.stationId);
+    },
+    mounted() {
+        const params = {
+            mapId: this.$route.query.mapId,
+            totalSystem: 'psdSystem02',
+            system: 'psdSystem',
+            userInterface: 'psdOne'
+        };
+        this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
+        getIscsData(params).then(resp=>{
+            if (resp.data) {
+                const data = JSON.parse(resp.data.graphData);
+                this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
+                this.subscribe(this.stationId);
+                this.flag = true;
+            } else {
+                this.loading = false;
+            }
+        });
+    },
+    methods:{
+        viewLoaded() {
+        },
+        subscribe(stationCode) {
+            this.clearSubscribe();
+            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
+            creatSubscribe(getTopic('ISCSPSD', this.$route.query.group, {stationCode} ), header);
+            this.$store.dispatch('app/animationsClose');
+        },
+        clearSubscribe(stationCode) {
+            clearSubscribe(getTopic('ISCSPSD', this.$route.query.group, {stationCode}));
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.psdSystem_header{
+    text-align: center;
+    margin-top: 15px;
+    color: #d8e9a5;
+	font-size: 25px;
+}
+.psdSystem{
+
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/schedule.vue b/src/views/iscs/iscsSystemNew/stationConfig/schedule.vue
new file mode 100644
index 000000000..64eb0c874
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/schedule.vue
@@ -0,0 +1,500 @@
+<template>
+  <div id="PlanSchedule" :style="{ height: height+'px'}">
+    <div class="left">
+      <div :id="runPlanId" />
+    </div>
+    <div class="right">
+      <data-table
+        ref="serviceTable1"
+        :height="height/2"
+        :config="serviceNumberConfig"
+        :style="{top: top-height/2+'px'}"
+        @touch="scheduleTouch"
+      />
+      <data-table
+        ref="tripTable1"
+        :height="height/2"
+        :config="tripNumberConfig"
+        :style="{top: top-height/2+'px'}"
+        @touch="trainNumTouch"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+import DataTable from '@/views/planSchedule/menusPlan/components/dataTable';
+import echarts from 'echarts';
+import {toTimeStamp, formatDuring} from '@/utils/date';
+import { deepAssign } from '@/utils/index';
+import { EventBus } from '@/scripts/event-bus';
+
+export default {
+    name: 'PlanSchedule',
+    components: {
+        DataTable
+    },
+    data() {
+        return {
+            top: 0,
+            height: 0,
+            inter:null,
+            runPlanId: 'run-plan-view',
+            myChart: null,
+            PlanParser: {},
+            serviceNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: '表号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: '车次号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            realData: {},
+            kmRangeMap: {},
+            absoluteTime: 2 * 3600,
+            indexKmRangeMap: {},
+            dialogLoading: false,
+            dialogShow: false,
+            seriesMap: {},
+            staticSeries: [],
+            runSeries: [],
+            selectSeries: [],
+            runPlanData: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        maxWidth() {
+            return this.$store.state.app.width > 1920 ? 1920 : this.$store.state.app.width;
+        },
+        maxHeight() {
+            return this.$store.state.app.height > 1080 ? 1050 : this.$store.state.app.height - 30;
+        },
+        title() {
+            return this.$t('display.runPlan.previewRunDiagram');
+        }
+    },
+    watch: {
+        maxWidth() {
+            this.setPosition();
+        },
+        maxHeight() {
+            this.setPosition();
+        },
+        '$store.state.runPlan.planLoadedCount': async function () {
+            try {
+                await this.loadChartPage();
+                this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+                if (this.dialogShow) {
+                    await this.loadInitData();
+                }
+            } catch (e) {
+                console.error(e);
+            } finally {
+                this.loading = false;
+            }
+        },
+        '$store.state.socket.simulationReset': function (val) {
+            this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+            if (this.dialogShow) {
+                this.loadInitData();
+            }
+        },
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.socket.trainStationList': function (val) {
+            if (val.length) {
+                this.updateRunPlanData(val);
+            }
+        }
+    },
+    mounted() {
+        this.staticSeries = []; this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+        this.PlanParser = this.$theme.loadPlanParser(this.$route.query.lineCode);
+        this.loadChartPage();
+        EventBus.$on('clearRunSeries', () => {
+            this.runSeries = [];
+        });
+    },
+    beforeDestroy() {
+        this.$store.dispatch('runPlan/setSelected', null);
+        this.destroy();
+    },
+    methods: {
+        async doClose() {
+            this.dialogShow = false;
+            this.inter && clearInterval(this.inter);
+        },
+        serviceNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
+                this.renderTripNumber({ serviceNumber: row.serviceNumber, tripNumber: null });
+                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
+                if (serviceObj) {
+                    this.analyticalTripNumber(serviceObj.trainMap);
+                }
+            }
+        },
+        tripNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+                this.renderTripNumber({ serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+            }
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].tripNumber - data[b].tripNumber; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                const top = 54;
+                const width = this.maxWidth * 0.85;
+                let height = this.maxHeight;
+
+                height = height - top;
+                this.$store.dispatch('runPlan/resize', { width, height });
+
+                if (this.top != top) {
+                    this.top = top;
+                }
+
+                if (this.height != height) {
+                    this.height = height - top;
+                }
+            });
+        },
+        updateRunPlanData(data) {
+            const stations = this.$store.state.runPlan.stations;
+            data.forEach(item => {
+                item.secondTime = item.second;
+            });
+            this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
+            this.runSeries = this.PlanParser.updateDataToModels(data, stations, this.kmRangeMap,
+                this.runPlanData, this.runSeries, { color: '#FF00DE', width: 2 }
+            );
+            const series = [...this.staticSeries, ...this.runSeries, ... this.selectSeries];
+            this.myChart && this.myChart.setOption({series: series});
+        },
+        async loadChartPage() {
+            try {
+                this.seriesMap = {};
+                this.staticSeries = [];
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
+                this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisY(stations)]);
+                this.staticSeries = this.pushModels(this.staticSeries, this.PlanParser.convertDataToModels(planData, stations, this.kmRangeMap, { color: '#000', width: 0.5 }));
+                this.staticSeries.forEach(item => {
+                    this.seriesMap[item.name] = item;
+                });
+                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+                await this.setPosition();
+                await this.loadInitData();
+                this.inter && clearInterval(this.inter);
+            } catch (error) {
+                console.log(error);
+                this.$messageBox(`加载运行图数据失败`);
+            }
+        },
+
+        async loadInitData() {
+            this.myChart && this.myChart.showLoading();
+            const option = {
+                tooltip: {
+                    axisPointer: {
+                        trigger: 'item',
+                        type: 'cross'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1
+                },
+                grid: {
+                    right: '40px',
+                    left: '120px',
+                    height: '85%'
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        yAxisIndex: 0,
+                        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'
+                            }
+                        }
+                    }
+                ],
+                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);
+            await this.yAxisInit(option);
+            await this.loadInitChart(option);
+            this.myChart && this.myChart.hideLoading();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+            return series;
+        },
+        loadInitChart(option) {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.destroy();
+                    let startValue = 3600 + this.PlanParser.getTranslation();
+                    const offsetTime = 3600;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                    startValue = initTime - this.PlanParser.getTranslation();
+                    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];
+                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
+                    if (this.myChart) {
+                        this.myChart.setOption(option);
+                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                        this.myChart.on('click', this.mouseClick);
+                    }
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.PlanParser.computedFormatAxisY(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            return timeFormat(value);
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit(option) {
+            const list = [];
+            for (var time = 0 + this.PlanParser.getTranslation(); time < 3600 * 24 + this.PlanParser.getTranslation(); time++) {
+                list.push(time);
+            }
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
+
+            option.xAxis[0].data = list;
+            if (!option.dataZoom[0].startValue) {
+                option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue - offsetTime;
+            }
+
+            if (!option.dataZoom[0].endValue) {
+                option.dataZoom[0].endValue = option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit(option) {
+            if (Object.keys(this.PlanParser).length) {
+                option.yAxis[0].min = this.PlanParser.computedAxisYMinValue(this.stations);
+                option.yAxis[0].max = this.PlanParser.computedAxisYMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            const station = (this.$store.getters['map/getDeviceByCode'](param.data[2])) || { name: '', kmRange: '' };
+            return [
+                `Point Data <hr size=1 style=" margin: 3px 0">`,
+                `车站名称: ${station.name}<br>`,
+                `车站公里标: ${station.kmRange} km <br>`,
+                `到站时间: ${timeFormat(param.data[0] + this.PlanParser.getTranslation())} (${param.data[0]})<br>`
+            ].join('');
+        },
+        renderTripNumber(params) {
+            const tripNumber = params.tripNumber; // 车次号
+            const serviceNumber = params.serviceNumber; // 服务号
+            let data, markPoint;
+            if (tripNumber && this.seriesMap[serviceNumber]) {
+                const temp = this.seriesMap[serviceNumber].data.filter(elem => elem[3] == tripNumber);
+                if (temp.length) {
+                    data = temp;
+                    this.seriesMap[serviceNumber].markPoint.data.forEach(each=> {
+                        if (each.name == temp[0][4]) {
+                            markPoint = deepAssign({}, {data:[each]});
+                            markPoint.symbol = 'roundRect';
+                            markPoint.symbolSize = 1;
+                            markPoint.data[0].label.color = '#f00';
+                        }
+                    });
+                }
+            } else if (this.seriesMap[serviceNumber]) {
+                markPoint = deepAssign({}, this.seriesMap[serviceNumber].markPoint);
+                markPoint.data.forEach(each => {
+                    each.label.color = '#f00';
+                });
+                data = this.seriesMap[serviceNumber].data;
+            }
+            this.selectSeries = [{
+                name: 'trainLabel',
+                lineStyle: {
+                    color: '#f00',
+                    width: 2,
+                    type: 'solid'
+                },
+                z: 10,
+                type: 'line',
+                markPoint:markPoint,
+                animation: false,
+                data: data
+            }];
+            const series = [...this.staticSeries, ...this.runSeries, ...this.selectSeries];
+            this.myChart && this.myChart.setOption({series: series});
+        },
+        mouseClick(params) {
+            const model = {
+                serviceNumber: params.seriesName
+            };
+            this.$store.dispatch('runPlan/setSelected', model);
+        },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        },
+        scheduleTouch() {
+
+        },
+        trainNumTouch() {
+
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+	@import "src/styles/mixin.scss";
+
+	#PlanSchedule {
+		position: absolute;
+		width: 100%;
+
+		.left {
+			height: 100%;
+			width: 85%;
+			float: left;
+		}
+
+		.right {
+			height: 100%;
+			width: 15%;
+			float: right;
+		}
+	}
+</style>
+
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/signalSystem.vue b/src/views/iscs/iscsSystemNew/stationConfig/signalSystem.vue
new file mode 100644
index 000000000..f67b43d4a
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/signalSystem.vue
@@ -0,0 +1,98 @@
+<template>
+  <div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
+    <div class="fasIndex" :style="{'background':bacground}">
+      <div class="fasIndex_header">{{ title }}</div>
+      <div>
+        <iscsSystem ref="iscsPlate" />
+      </div>
+    <!-- <div class="psdSystem_footer">
+      <div class="prevButton">{{}}</div>
+      <div class="nextButton">{{}}</div>
+    </div> -->
+    </div>
+  </div>
+</template>
+<script>
+import iscsSystem from './iscsCanvas';
+import {getIscsData} from '@/api/iscs';
+export default {
+    name:'Fas',
+    components:{
+        iscsSystem
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        },
+        mode: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            title:'',
+            bacground:'rgba(66,90,116,1)',
+            loading:false,
+            width:window.innerWidth,
+            scaleRate:window.innerWidth / 2200,
+            height: 1000
+        };
+    },
+    mounted() {
+        this.getInitData();
+    },
+    methods:{
+        getInitData() {
+            const params = {
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
+                system: 'signalSystem',
+                totalSystem :'signalSystem02',
+                userInterface : this.mode
+            };
+            if (this.mode == 'signal') {
+                this.title = this.stationName + ' 信号系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 900;
+            }
+            this.loading = true;
+            this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
+            getIscsData(params).then(resp=>{
+                if (resp.data) {
+                    this.loading = false;
+                    const data = JSON.parse(resp.data.graphData);
+                    this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
+                    document.querySelector('.fasIndex').scrollTop = 0;
+                } else {
+                    this.loading = false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.fasIndex_header{
+    text-align: center;
+    margin-top: 15px;
+    color: #d8e9a5;
+	font-size: 25px;
+}
+.fasIndex{
+    display: inline-block;
+    width:100%;
+    height:100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+}
+.SubstationIn{
+    display: inline-block;
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/substation.vue b/src/views/iscs/iscsSystemNew/stationConfig/substation.vue
new file mode 100644
index 000000000..379f149fe
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/substation.vue
@@ -0,0 +1,147 @@
+<template>
+  <div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
+    <div class="Substation" :style="{'background':bacground}">
+      <div class="Substation_header">{{ title }}</div>
+      <div>
+        <iscsSystem ref="iscsPlate" />
+      </div>
+    <!-- <div class="psdSystem_footer">
+      <div class="prevButton">{{}}</div>
+      <div class="nextButton">{{}}</div>
+    </div> -->
+    </div>
+  </div>
+</template>
+<script>
+import iscsSystem from './iscsCanvas';
+import {getIscsData} from '@/api/iscs';
+export default {
+    name:'Substation',
+    components:{
+        iscsSystem
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            title:'',
+            bacground:'rgba(0,0,0,0)',
+            loading:false,
+            width:window.innerWidth,
+            scaleRate:window.innerWidth / 2200
+        };
+    },
+    computed:{
+        height() {
+            return 970;
+        }
+    },
+    watch:{
+        'stationId':function() {
+            this.getInitData();
+        }
+    },
+    mounted() {
+        this.getInitData();
+    },
+    methods:{
+        getInitData() {
+            const params = {
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
+                system: 'powerMonitoring',
+                totalSystem :'powerMonitoring02'
+            };
+            if (this.stationId == 'mainHouseOne' || this.stationId == 'mainHouseTwo') {
+                this.bacground = 'rgba(0,0,0,0)';
+                this.scaleRate = window.innerWidth / 2200;
+                if (this.stationId == 'mainHouseOne') {
+                    // 黄山
+                    this.title = '主所1主变电所接线图';
+                } else {
+                    // 茶亭
+                    this.title = '主所2主变电所接线图';
+                }
+                params.userInterface = 'substation';
+            // parkingLotName
+            // stationDepotName
+            } else if (this.stationId == 'controlCenter') {
+                this.title = '';
+                this.bacground = '#000';
+                this.scaleRate = window.innerWidth / 2000;
+                params.userInterface = 'hybrid';
+            } else if (this.stationId == 'parkingLot') {
+                this.title = '清凉山停车场接触网图';
+                this.scaleRate = window.innerWidth / 2000;
+                this.bacground = 'rgba(0,0,0,0)';
+                params.userInterface = 'catenary';
+            } else if (this.stationId == 'stationDepot') {
+                this.title = '新店车辆段接触网图';
+                this.bacground = 'rgba(0,0,0,0)';
+                this.scaleRate = window.innerWidth / 2000;
+                params.userInterface = 'catenary';
+            } else {
+                const tractionList = ['象峰站', '罗汉山站', '树兜站', '东街口站', '达道站', '三叉街站', '葫芦阵站', '城门站', '胪雷站', '安平站', '梁厝站', '三江口站'];
+                if (tractionList.includes(this.stationName)) {
+                    this.title = this.stationName + ' 牵引降压混合变电所主接线图';
+                    if (this.stationName == '象峰站') {
+                        params.userInterface = 'combined01';
+                    } else if (this.stationName == '罗汉山站') {
+                        params.userInterface = 'combined02';
+                    } else if (this.stationName == '树兜站') {
+                        params.userInterface = 'combined03';
+                    } else {
+                        params.userInterface = 'combined02';
+                    }
+                    params.system = 'combined';
+                } else {
+                    this.title = this.stationName + ' 降压变电所主接线图';
+                    params.userInterface = 'stepDown';
+                }
+                this.scaleRate = window.innerWidth / 2000;
+                this.bacground = 'rgba(0,0,0,0)';
+
+            }
+            this.loading = true;
+            this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
+            getIscsData(params).then(resp=>{
+                if (resp.data) {
+                    this.loading = false;
+                    const data = JSON.parse(resp.data.graphData);
+                    this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
+                    document.querySelector('.Substation').scrollTop = 0;
+                } else {
+                    this.loading = false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.Substation_header{
+    text-align: center;
+    margin-top: 15px;
+    color: #d8e9a5;
+	font-size: 25px;
+}
+.Substation{
+    display: inline-block;
+    width:100%;
+    height:100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+    vertical-align: top;
+}
+.SubstationIn{
+    display: inline-block;
+}
+</style>
diff --git a/src/views/iscs/iscsSystemNew/stationConfig/ticketOrEntrance.vue b/src/views/iscs/iscsSystemNew/stationConfig/ticketOrEntrance.vue
new file mode 100644
index 000000000..b0487f328
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationConfig/ticketOrEntrance.vue
@@ -0,0 +1,119 @@
+<template>
+  <div v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.6)" style="width:100%;height:100%;">
+    <div class="fasIndex" :style="{'background':bacground}">
+      <div class="fasIndex_header">{{ title }}</div>
+      <div>
+        <iscsSystem ref="iscsPlate" />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import iscsSystem from './iscsCanvas';
+import {getIscsData} from '@/api/iscs';
+export default {
+    name:'TicketOrEntrance',
+    components:{
+        iscsSystem
+    },
+    props: {
+        stationName: {
+            type: String,
+            default: ''
+        },
+        stationId: {
+            type: String,
+            default: ''
+        },
+        mode: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            title:'',
+            bacground:'rgba(66,90,116,1)',
+            loading:false,
+            width:window.innerWidth,
+            scaleRate:window.innerWidth / 2200,
+            height: 1000
+        };
+    },
+    watch:{
+        '$store.state.iscs.gateFaultCount': function(val) {
+            this.$store.dispatch('iscs/updateIscsState', [{deviceType: 'GATE', status: this.$store.state.iscs.gateFaultList.includes(this.stationId) ? 0 : 1}]);
+        },
+        'mode':function() {
+            this.getInitData();
+        }
+    },
+    mounted() {
+        this.getInitData();
+    },
+    methods:{
+        getInitData() {
+            const params = {
+                // lineCode: this.$route.query.lineCode,
+                mapId: this.$route.query.mapId,
+                system: 'afc',
+                totalSystem :'afc02',
+                userInterface : this.mode
+            };
+            if (this.mode == 'autoTicket') {
+                this.title = this.stationName + ' 自动售检票系统';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 800;
+            } else if (this.mode == 'afcTwo02') {
+                params.userInterface = 'afcTwo02';
+                params.system = 'entranceGuard';
+                this.title = this.stationName + ' 门禁系统 站台层';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 800;
+            } else if (this.mode == 'afcOne02') {
+                params.userInterface = 'afcOne02';
+                params.system = 'entranceGuard';
+                this.title = this.stationName + ' 门禁系统 站厅层';
+                this.scaleRate = window.innerWidth / 1920;
+                this.height = 800;
+            }
+
+            this.loading = true;
+            this.$refs.iscsPlate.show({}, this.width, this.height, this.scaleRate);
+            getIscsData(params).then(resp=>{
+                if (resp.data) {
+                    this.loading = false;
+                    const data = JSON.parse(resp.data.graphData);
+                    this.$refs.iscsPlate.show(data, this.width, this.height, this.scaleRate);
+                    document.querySelector('.fasIndex').scrollTop = 0;
+                    if (this.mode === 'autoTicket') {
+                        this.$store.dispatch('iscs/updateIscsState', [{deviceType: 'GATE', status: this.$store.state.iscs.gateFaultList.includes(this.stationId) ? 0 : 1}]);
+                    }
+                } else {
+                    this.loading = false;
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.fasIndex_header{
+		text-align: center;
+		margin-top: 15px;
+		color: #d8e9a5;
+		font-size: 25px;
+	}
+	.fasIndex{ 
+		display: inline-block;
+		width:100%;
+		height:100%;
+		overflow-x: hidden;
+		overflow-y: auto;
+		vertical-align: top;
+	}
+	.SubstationIn{
+		display: inline-block;
+	}
+</style>
+ 
\ No newline at end of file
diff --git a/src/views/iscs/iscsSystemNew/stationNav.vue b/src/views/iscs/iscsSystemNew/stationNav.vue
new file mode 100644
index 000000000..dda43fa0f
--- /dev/null
+++ b/src/views/iscs/iscsSystemNew/stationNav.vue
@@ -0,0 +1,718 @@
+<template>
+  <div>
+    <div class="station-nav-out">
+      <div class="station-nav">
+        <div class="stationList">
+          <div class="station-line" />
+          <div v-for="(item, index) in stationList" :key="index" class="station-box-out">
+            <div class="station-box">
+              <div class="leftRect" />
+              <div class="rightRect" />
+              <div class="station-list-box" :class="{'active': selectStation == item.id,'currentStation':tractionList.includes(item.name)}" @click="changeStation(item.id)" />
+            </div>
+            <div class="station-name" :class="index==0?'station-name-first':index%2==1?'station-name-up':'station-name-down'">{{ item.name }}</div>
+          </div>
+        </div>
+        <div class="rightButtonGroup">
+          <div class="rightButtonGroupL">
+            <div class="controlCenter">
+              <div class="station-list-button" :class="{'active': selectStation == 'controlCenter'}" @click="changeStation('controlCenter')" />
+            </div>
+            <div class="stationDepot">
+              <div class="station-list-button" :class="{'active': selectStation == 'stationDepot'}" @click="changeStation('stationDepot')" />
+            </div>
+            <div class="parkingLot">
+              <div class="station-list-button" :class="{'active': selectStation == 'parkingLot'}" @click="changeStation('parkingLot')" />
+            </div>
+            <div class="controlCenterName">控制中心</div>
+            <div class="parkingLotName">停车场</div>
+            <div class="stationDepotName">车辆段</div>
+          </div>
+          <div class="rightButtonGroupR">
+            <div class="mainHouseOne">
+              <div class="station-list-button" :class="{'active': selectStation == 'mainHouseOne'}" @click="changeStation('mainHouseOne')" />
+            </div>
+            <div class="mainHouseTwo">
+              <div class="station-list-button" :class="{'active': selectStation == 'mainHouseTwo'}" @click="changeStation('mainHouseTwo')" />
+            </div>
+            <div class="mainHouseOneName">主所1</div>
+            <div class="mainHouseTwoName">主所2</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bottom-box">
+      <div class="bottom-box-in">
+        <div v-for="button in buttonList" :key="button.id" class="eachButtonTop">
+          <div class="eachButton" :class="buttonId==button.id?'active':''" @click="showSubMenu(button)">
+            <img :src="button.icon" class="eachButtonIcon">
+            <span class="eachButtonText">{{ button.name }}</span>
+          </div>
+          <div v-if="button.children&&button.children.length>0" class="childGroup" :class="isActive(button)">
+            <div v-for="child in button.children" :key="child.id" class="childButton" :style="{cursor:child.disabled? 'not-allowed': 'pointer'}" @click="gotoPage(button,child)">
+              <div class="childButtonIn" :style="{color:child.disabled?'#c0c0c0':'#000'}">{{ child.name }}</div>
+            </div>
+            <div class="childLine" />
+          </div>
+        </div>
+      </div>
+      <!-- v-if="!noPreLogout"  -->
+      <div class="bottom-back" @click="back">返回</div>
+      <div class="bottom-back" @click="handleAlarmInfo">
+        报警
+      </div>
+      <div class="bottom-back" @click="getIncidentList">事件</div>
+      <div class="bottom-back" @click="cancelMalfunction">故障取消</div>
+      <div class="bottom-back" @click="handleMalfunction">故障设置</div>
+    </div>
+    <alarm-config ref="alarmConfig" />
+    <incident-config ref="incidentConfig" />
+    <malfunction ref="malfunction" />
+  </div>
+</template>
+<script>
+import { getByGroupStationList } from '@/api/jmap/map';
+import iscs_icon1 from '@/assets/iscs_system/iscs_icon1.png';
+import iscs_icon2 from '@/assets/iscs_system/iscs_icon2.png';
+import iscs_icon3 from '@/assets/iscs_system/iscs_icon3.png';
+import iscs_icon4 from '@/assets/iscs_system/iscs_icon4.png';
+import iscs_icon5 from '@/assets/iscs_system/iscs_icon5.png';
+import iscs_icon6 from '@/assets/iscs_system/iscs_icon6.png';
+import iscs_icon7 from '@/assets/iscs_system/iscs_icon7.png';
+import alarmConfig from './stationConfig/dialog/alarm';
+import incidentConfig from './stationConfig/dialog/incident';
+import malfunction from './stationConfig/dialog/malfunction';
+export default {
+    name:'StationNav',
+    components: {
+        alarmConfig,
+        incidentConfig,
+        malfunction
+    },
+    data() {
+        return {
+            selectStation: 'mainHouseOne',
+            stationList:[],
+            tractionList:[],
+            buttonId:'substation',
+            // buttonId:'psdSystem',
+            buttonList:{
+                stationDescription:{name:'车站概要', type:'totalSystem', id: 'stationDescription', active:false, icon:iscs_icon1 },
+                electric: {name:'电力监控系统', type:'totalSystem', id: 'powerMonitoring', active:false, icon:iscs_icon2,
+                    children:[
+                        {
+                            name: '牵引降压所主接线图',
+                            mode: 'substation',
+                            id: 'substation',
+                            type: 'interface'
+                        },
+                        {
+                            name: '能耗检测管理系统',
+                            mode: 'energyDetected',
+                            id: 'energyDetected',
+                            type: 'interface'
+                        }
+                    ] },
+                environment:{name:'环境与设备监控系统', type:'totalSystem', id: 'environment', active:false, icon:iscs_icon3,
+                    children:[
+                        {
+                            name: '车站模式管理器',
+                            mode: 'environmentOne',
+                            id: 'environmentOne',
+                            type: 'interface'
+                        },
+                        {
+                            name: '时间管理器',
+                            mode: 'environmentTwo',
+                            id: 'environmentTwo',
+                            type: 'interface'
+                        },
+                        {
+                            name: '隧道通风系统',
+                            mode: 'environmentThree',
+                            id: 'environmentThree',
+                            type: 'interface'
+                        },
+                        {
+                            name: '大系统',
+                            mode: 'environmentFour',
+                            id: 'environmentFour',
+                            type: 'interface'
+                        },
+                        {
+                            name: '小系统',
+                            mode: 'environmentFive',
+                            id: 'environmentFive',
+                            type: 'interface'
+                        },
+                        {
+                            name: '空调水系统',
+                            mode: 'environmentSix',
+                            id: 'environmentSix',
+                            type: 'interface'
+                        },
+                        {
+                            name: 'VRV多联空调',
+                            mode: 'environmentSeven',
+                            id: 'environmentSeven',
+                            type: 'interface'
+                        },
+                        {
+                            name: '给排水系统',
+                            mode: 'environmentEight',
+                            id: 'environmentEight',
+                            type: 'interface'
+                        },
+                        {
+                            name: '照明系统',
+                            mode: 'environmentNine',
+                            id: 'environmentNine',
+                            type: 'interface'
+                        },
+                        {
+                            name: '电扶梯系统',
+                            mode: 'environmentTen',
+                            id: 'environmentTen',
+                            type: 'interface'
+                        },
+                        {
+                            name: '人防门/防淹门',
+                            mode: 'environmentEleven',
+                            id: 'environmentEleven',
+                            type: 'interface'
+                        },
+                        {
+                            name: ' 传感器',
+                            mode: 'environmentThirteen',
+                            id: 'environmentThirteen',
+                            type: 'interface'
+                        }
+                    ]
+                },
+                ffas: {name:'火灾报警系统', type:'totalSystem', id: 'ffas', mode: 'ffas', active:false, icon:iscs_icon4,
+                    children:[
+                        {
+                            name: '火灾报警系统-FAS联动',
+                            mode: 'linkage',
+                            id: 'linkage',
+                            type: 'interface'
+                        },
+                        {
+                            name: '火灾报警系统-站厅层',
+                            mode: 'stationHall',
+                            id: 'stationHall',
+                            type: 'interface'
+                        },
+                        {
+                            name: '火灾报警系统-站台层',
+                            mode: 'platform',
+                            id: 'platform',
+                            type: 'interface'
+                        },
+                        {
+                            name: '火灾报警系统-区间',
+                            mode: 'section',
+                            id: 'section',
+                            type: 'interface'
+                        },
+                        {
+                            name: '感温光纤探测系统',
+                            mode: 'sensing',
+                            id: 'sensing',
+                            type: 'interface'
+                        },
+                        {
+                            name: '气体灭火系统',
+                            mode: 'gas',
+                            id: 'gas',
+                            type: 'interface'
+                        }
+                    ]},
+                psd:{name:'屏蔽门系统', type:'totalSystem', id: 'psdSystem', active:false, icon:iscs_icon5 },
+                fafc:{name:'自动售检票/门禁', type:'totalSystem', id: 'fafc', mode: 'fafc', active:false, icon:iscs_icon6,
+                    children:[
+                        {
+                            name: '自动售检票系统',
+                            mode: 'autoTicket',
+                            id: 'autoTicket',
+                            type: 'interface'
+                        },
+                        {
+                            name: '门禁系统',
+                            mode: 'afcOne02',
+                            id: 'afcOne02',
+                            type: 'interface'
+                        }
+                    ]},
+                signalSystem:{name:'信号系统', type:'totalSystem', id: 'signalSystem', mode: 'signalSystem', active:false, icon:iscs_icon7,
+                    children:[
+                        {
+                            name: 'TIS管理器',
+                            mode: 'tis',
+                            id: 'tis',
+                            type: 'interface',
+                            disabled: true
+                        },
+                        {
+                            name: '列车时刻表',
+                            mode: 'schedule',
+                            id: 'schedule',
+                            type: 'interface'
+                        },
+                        {
+                            name: '信号系统',
+                            mode: 'signal',
+                            id: 'signal',
+                            type: 'interface'
+                        },
+                        {
+                            name: '全线信号系统界面',
+                            mode: 'allLineSignal',
+                            id: 'allLineSignal',
+                            type: 'interface',
+                            disabled: true
+                        }
+                    ]},
+                communication:{name:'通信', type:'totalSystem', id: 'communication', active:false, icon:iscs_icon7,
+                    children:[
+                        {
+                            name: '乘客信息-主画面',
+                            mode: 'pidsMain',
+                            id: 'pidsMain',
+                            type: 'interface'
+                        },
+                        // {
+                        //     name: '乘客信息-LCD控制屏',
+                        //     mode: 'pidsLcd',
+                        //     id: 'pidsLcd',
+                        //     type: 'interface'
+                        // },
+                        // {
+                        //     name: '乘客信息-计时一览',
+                        //     mode: 'pidsPreview',
+                        //     id: 'pidsPreview',
+                        //     type: 'interface'
+                        // },
+                        // {
+                        //     name: '乘客信息-紧急发布一览',
+                        //     mode: 'pidsEmergency',
+                        //     id: 'pidsEmergency',
+                        //     type: 'interface'
+                        // },
+                        {
+                            name: '广播系统-主画面',
+                            mode: 'paMain',
+                            id: 'paMain',
+                            type: 'interface'
+                        }
+                        // {
+                        //     name: '广播系统-广播监听',
+                        //     mode: 'paMonitor',
+                        //     id: 'paMonitor',
+                        //     type: 'interface'
+                        // },
+                        // {
+                        //     name: '广播系统-计时一览',
+                        //     mode: 'paPreview',
+                        //     id: 'paPreview',
+                        //     type: 'interface'
+                        // }
+                        // {
+                        //     name: '闭路电视',
+                        //     mode: 'cctv',
+                        //     id: 'cctv',
+                        //     type: 'interface'
+                        // }
+                    ]}
+            }
+        };
+    },
+    async created () {
+        // 请求当前线路车站列表
+        const res = await getByGroupStationList(this.$route.query.group);
+        if (res.code == 200) {
+            this.stationList = [];
+            res.data.forEach(station => {
+                if (!station.depot && station.visible) {
+                    const param = {
+                        name: station.runPlanName.includes('站') ? station.runPlanName : `${station.runPlanName}站`,
+                        id: station.code
+                    };
+                    if (station.centralized) {
+                        this.tractionList.push(param.name);
+                    }
+                    this.stationList.push(param);
+                }
+            });
+            this.selectChildren(this.buttonId);
+        }
+    },
+    methods:{
+        changeStation(item) {
+            this.selectStation = item;
+            this.selectChildren(this.buttonId);
+        },
+        selectChildren(type) { // 选择菜单
+            let stationName = '';
+            const station = this.stationList.find(each=>{ return each.id == this.selectStation; });
+            if (station) {
+                stationName = station.name;
+            }
+            const param = {
+                stationName: stationName,
+                stationId: this.selectStation,
+                type:type
+            };
+            this.$emit('selectIscsPane', param);
+        },
+        isActive(button) {
+            return (this.buttonId == button.id) && button.active ? 'active' : '';
+        },
+        showSubMenu(button) {
+            if (button.children && button.children.length > 0) {
+                button.active = true;
+            } else {
+                this.selectChildren(button.id);
+            }
+            this.buttonId = button.id;
+        },
+        gotoPage(button, child) {
+            if (!child.disabled) {
+                button.active = false;
+                this.buttonId = child.id;
+                this.selectChildren(child.id);
+            }
+        },
+        // 获取报警信息
+        handleAlarmInfo() {
+            // if (!this.alarmInfo) {
+            this.$refs.alarmConfig.doShow();
+            // }
+        },
+        // 获取事件列表
+        getIncidentList() {
+            this.$refs.incidentConfig.doShow();
+        },
+        // 设置故障
+        handleMalfunction() {
+            this.$refs.malfunction.doShow('SET');
+        },
+        cancelMalfunction() {
+            this.$refs.malfunction.doShow('CANCEL');
+        },
+        back() {
+            history.go(-1);
+        //     this.clearSubscribe();
+        //     if (this.projectDevice) {
+        //         this.$store.dispatch('LogOut').then(() => {
+        //             location.reload();
+        //         });
+        //     } else {
+        //         clearSimulation(this.$route.query.group).then(resp => {
+        //             this.$router.push({ path: `/trainingPlatform` });
+        //         }).catch(()=> {
+        //             this.$message.error('清除仿真失败！');
+        //         });
+        //     }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.station-nav-out{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+}
+.station-nav{
+    width: 100%;
+    height: 65px;
+    background-color: #ACACAC;
+    position: relative;
+    padding-left: 5px;
+}
+.station-line{
+    height: 12px;
+    width: 100%;
+    position: absolute;
+    background-image: linear-gradient(to bottom , #9c9c9c, #F0F0F0,#9c9c9c);
+    top: 25px;
+    border: 1px #505050 solid;
+}
+.station-list-box{
+    width: 1vw;
+    height: 1vw;
+    border-radius: 1vw;
+    background: #ccc;
+    left: 4px;
+    top: 50%;
+    position: absolute;
+    border-left: 1px #fdfdfd solid;
+    border-right: 1px #262626 solid;
+    transform: translateY(-50%);
+}
+.station-list-box.currentStation::before{
+    content: '';
+    width: 128%;
+    height: 124%;
+    border: 1px #10ff00 solid;
+    position: absolute;
+    left: -16%;
+    top: -10%;
+    border-radius: 130%;
+}
+.station-list-box.active,.station-list-button.active{
+    background:#cdcd37;
+}
+.station-name{
+    font-size:12px;
+    position:absolute;
+}
+.station-name-first{
+    transform: translateX(0%);
+    top: 45px;
+    white-space: nowrap;
+    left: 0%;
+}
+.station-name-up{
+    top: 5px;
+    transform: translateX(-50%);
+    left: 25%;
+    white-space: nowrap;
+}
+.station-name-down{
+    top: 45px;
+    // transform: translateX(-25%);
+    transform: translateX(-38%);
+    white-space: nowrap;
+    left: 0%;
+}
+.station-box-out{
+    height: 100%;
+    display: inline-block;
+    position: relative;
+}
+.station-box{
+    display: inline-block;
+    position: relative;
+    // margin-right: 1.8vw;
+    width: 1.5vw;
+    margin-top: 20px;
+    cursor: pointer;
+}
+.leftRect{
+    width: 6px;
+    height: 19px;
+    background-image: linear-gradient(to bottom, #686868, #e9e9e9, #686868);
+    border: 1px #585858 solid;
+    display: inline-block;
+    vertical-align: top;
+}
+.rightRect{
+    width: 6px;
+    height: 19px;
+    position: absolute;
+    margin-left: 0.8vw;
+    background-image: linear-gradient(to bottom, #686868, #e9e9e9, #686868);
+    border: 1px #585858 solid;
+    display: inline-block;
+    vertical-align: top;
+}
+.stationList{
+    // display: inline-block;
+    display: flex;
+    position: relative;
+    justify-content: space-between;
+    float: left;
+    height: 100%;
+    width: 82%;
+}
+.rightButtonGroup{
+    display: inline-block;
+    float: right;
+    width: 17vw;
+    height: 100%;
+}
+.rightButtonGroupL{
+    width: 10vw;
+    height: 100%;
+    display: inline-block;
+    float: left;
+    position: relative;
+    border-left: 1px #000 solid;
+    border-right: 1px #000 solid;
+}
+.rightButtonGroupR{
+    width: 7vw;
+    height: 100%;
+    display: inline-block;
+    position: relative;
+}
+.controlCenter,.stationDepot,.parkingLot{
+    display: inline-block;
+    position: relative;
+    width: 31%;
+    height: 100%;
+    vertical-align: top;
+    float: left;
+}
+.controlCenterName{
+    font-size: 12px;
+    position: absolute;
+    top: 5px;
+    left: 0.3vw;
+}
+.stationDepotName{
+    font-size: 12px;
+    position: absolute;
+    top: 45px;
+    left: 38%;
+}
+.parkingLotName{
+    font-size: 12px;
+    position: absolute;
+    top: 5px;
+    right: 11%;
+}
+.station-list-button{
+    width: 1vw;
+    height: 1vw;
+    border-radius: 1vw;
+    background: #ccc;
+    position: absolute;
+    border-left: 1px #fdfdfd solid;
+    border-right: 1px #262626 solid;
+    left: 50%;
+    top: 21px;
+    transform: translateX(-47%);
+    cursor: pointer;
+}
+.mainHouseOne,.mainHouseTwo{
+    display: inline-block;
+    position: relative;
+    width: 49%;
+    height: 100%;
+    vertical-align: top;
+    float: left;
+}
+.mainHouseOneName{
+    font-size: 12px;
+    position: absolute;
+    top: 5px;
+    left: 0.3vw;
+}
+.mainHouseTwoName{
+    font-size: 12px;
+    position: absolute;
+    top: 45px;
+    right: 8%;
+}
+.bottom-box{
+    width: 100%;
+    height: 30px;
+    background-color: #ACACAC;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    padding-left: 5px;
+    z-index:3;
+}
+.bottom-box-in{
+    display: inline-block;
+}
+.eachButtonTop{
+    display:inline-block;
+}
+.eachButton{
+    padding: 2px 0px;
+    background: #c0c0c0;
+    margin-top: 3px;
+    border-top: 2px #f7f7f7 solid;
+    border-left: 2px #f7f7f7 solid;
+    border-right: 2px #7e7e7e solid;
+    border-bottom: 2px #7e7e7e solid;
+    cursor: pointer;
+    font-size: 0.8vw;
+}
+.eachButton.active{
+    background: #f7f7f7;
+}
+.eachButtonText{
+    padding:0px 1vw;
+}
+.eachButtonIcon{
+    height: 0.9vw;
+    display: inline-block;
+    float: left;
+    margin-left: 5px;
+    margin-top: 0px;
+}
+.childGroup{
+    position: absolute;
+    bottom:30px;
+    background:#f0f0f0;
+    padding: 5px;
+    border-radius: 3px;
+    box-shadow: 3px 3px 4px #525252;
+    display: none;
+}
+.childGroup.active{
+    display: inline-block;
+}
+.childButton{
+    border:1px #f0f0f0 solid;
+    padding-left: 15px;
+    border-radius: 4px;
+    font-size: 14px;
+    padding-right: 10px;
+    cursor: pointer;
+}
+.childButton:hover{
+border:1px #ceddec solid;
+background:rgba(231,237,253,0.9);
+}
+.childButtonIn{
+    padding-left: 5px;
+    padding: 2px 5px;
+}
+.childLine{
+    border-right: 1px #fbfbfb solid;
+    position: absolute;
+    width: 0px;
+    height: 90%;
+    left: 20px;
+    border-left: 1px #e2e3e3 solid;
+    top: 5%;
+}
+.bottom-back{
+    padding: 2px 10px;
+    background: #c0c0c0;
+    margin-top: 3px;
+    border-top: 2px #f7f7f7 solid;
+    border-left: 2px #f7f7f7 solid;
+    border-right: 2px #7e7e7e solid;
+    border-bottom: 2px #7e7e7e solid;
+    cursor: pointer;
+    font-size: 0.8vw;
+    float: right;
+	margin-right: 5px;
+	position: relative;
+	&.disable_box{
+		background: #7b7b7b;
+	}
+	&:active{
+		background: #7b7b7b;
+	}
+	.point_box{
+		position: absolute;
+		right: -4px;
+		top: -2px;
+		width: 9px;
+		height: 9px;
+		border-radius: 50%;
+		background: red;
+	}
+}
+</style>
+
diff --git a/src/views/jlmap3d/drive/jl3ddrive.vue b/src/views/jlmap3d/drive/jl3ddrive.vue
index 8f29e416e..e763d71d4 100644
--- a/src/views/jlmap3d/drive/jl3ddrive.vue
+++ b/src/views/jlmap3d/drive/jl3ddrive.vue
@@ -29,7 +29,7 @@
         <el-button type="primary" @click="cctvplane">{{ cctvbuttonmsg }}</el-button>
         <el-button type="primary" @click="showmmiplane">{{ showbuttonmmimsg }}</el-button>
         <el-button type="primary" @click="showtmsplane">{{ showbuttontmsmsg }}</el-button>
-        <el-button type="primary" @click="back">{{ backmsg }}</el-button>
+        <!-- <el-button type="primary" @click="back">{{ backmsg }}</el-button> -->
       </el-button-group>
     </div>
 
diff --git a/src/views/jlmap3d/maintainer/component/faultdevice.vue b/src/views/jlmap3d/maintainer/component/faultdevice.vue
index f196ab77f..1d0ffc358 100644
--- a/src/views/jlmap3d/maintainer/component/faultdevice.vue
+++ b/src/views/jlmap3d/maintainer/component/faultdevice.vue
@@ -49,8 +49,6 @@
 	import { gousuo3dAction } from '@/api/jlmap3d/load3ddata';
 
 	import { sendCommandNew } from '@/api/jmap/training';
-	import Command from '@/scripts/cmdPlugin/Command';
-	import Handler from '@/scripts/cmdPlugin/Handler';
 
 	export default {
 		name: 'FaultDevice',
diff --git a/src/views/jlmap3d/maintainer/jl3dTrainRescueVr.vue b/src/views/jlmap3d/maintainer/jl3dTrainRescueVr.vue
index 661a6739d..c5e5974c3 100644
--- a/src/views/jlmap3d/maintainer/jl3dTrainRescueVr.vue
+++ b/src/views/jlmap3d/maintainer/jl3dTrainRescueVr.vue
@@ -8,8 +8,6 @@
 	import { Jl3dTrainRescueVr } from '@/jlmap3d/jl3dmaintainer/jl3dTrainRescue/jl3dTrainRescueVr.js';
 
 	import { sendCommandNew } from '@/api/jmap/training';
-	import Command from '@/scripts/cmdPlugin/Command';
-	import Handler from '@/scripts/cmdPlugin/Handler';
 
 	export default {
 		name: 'TrainRescueVR',
diff --git a/src/views/jlmap3d/maintainer/jl3dmaintainervr.vue b/src/views/jlmap3d/maintainer/jl3dmaintainervr.vue
index 1f4faec3b..fa8b57eca 100644
--- a/src/views/jlmap3d/maintainer/jl3dmaintainervr.vue
+++ b/src/views/jlmap3d/maintainer/jl3dmaintainervr.vue
@@ -8,8 +8,6 @@
 	import { jl3dFaultDeviceVr } from '@/jlmap3d/jl3dmaintainer/jl3dFaultDeviceVr/jl3dFaultDeviceVr.js';
 
 	import { sendCommandNew } from '@/api/jmap/training';
-	import Command from '@/scripts/cmdPlugin/Command';
-	import Handler from '@/scripts/cmdPlugin/Handler';
 
 	export default {
 		name: 'MaintainerVR',
diff --git a/src/views/jlmap3d/maintainer/jl3dothervr.vue b/src/views/jlmap3d/maintainer/jl3dothervr.vue
index 3efa965e7..409c11ef1 100644
--- a/src/views/jlmap3d/maintainer/jl3dothervr.vue
+++ b/src/views/jlmap3d/maintainer/jl3dothervr.vue
@@ -8,8 +8,6 @@
 	import { Jl3dOtherVR } from '@/jlmap3d/jl3dmaintainer/jl3dOtherVr/Jl3dothervr.js';
 
 	import { sendCommandNew } from '@/api/jmap/training';
-	import Command from '@/scripts/cmdPlugin/Command';
-	import Handler from '@/scripts/cmdPlugin/Handler';
 
 	export default {
 		name: 'OtherVR',
diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue
index 3754039f7..6a6ebcc1f 100644
--- a/src/views/jlmap3d/passflow/jl3dpassflow.vue
+++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue
@@ -40,7 +40,8 @@
     </div>
     <div class="menudown">
       <el-button-group>
-        <el-button v-show="isCctv" type="primary" @click="back">退出</el-button>
+        <!-- <el-button v-show="isCctv" type="primary" @click="back">退出</el-button> -->
+        <!-- <el-button v-show="isCctv" type="primary" @click="back">返回</el-button> -->
       </el-button-group>
     </div>
   </div>
@@ -104,6 +105,42 @@ export default {
         document.querySelector("link[rel*='icon']").href =
       loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
     },
+    // mounted() {
+    //     if (this.lineCode == '07') {
+    //         for (var i = 0; i < 4; i++) {
+    //             const videoPlay = new Video(
+    //                 'myvideo' + i,
+    //                 {
+    //                     controls: false,
+    //                     autoplay: 'muted',
+    //                     loop: true,
+    //                     preload: 'auto',
+    //                     width: window.innerWidth / 4 + 'px',
+    //                     height: window.innerHeight / 2 + 'px',
+    //                     hls: {
+    //                         withCredentials: true
+    //                     }
+    //                 },
+    //                 function () {
+    //                     console.log('videojs播放器初始化成功');
+    //                 }
+    //             );
+    //             this.videoList.push(videoPlay);
+    //         }
+    //     }
+    //     this.init();
+    //     window.updatestationlist = this.updatestationlist;
+    //     if (this.$route.query.type == 'CCTV') {
+    //         this.isCctv = false;
+    //     }
+    // },
+    // 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() {
         if (this.lineCode == '07') {
             for (var i = 0; i < 4; i++) {
@@ -199,7 +236,7 @@ export default {
         init: function () {
             // let mapdata = this.$store.state.socket.device;
             const dom = document.getElementById('jl3d');
-            this.jl3d = new Jl3dpassflow(dom, this.$route.query.mapid, this.$route.query.group, 'normal');
+            this.jl3d = new Jl3dpassflow(dom, this.$route.query.mapid || this.$route.query.mapId, this.$route.query.group, 'normal');
         },
         switchrender() {
             if (this.renderswitch == true) {
@@ -232,7 +269,8 @@ export default {
             // this.value = selVal;
         },
         back() {
-            window.close();
+            // window.close();
+            history.go(-1);
         }
     }
 };
@@ -243,8 +281,12 @@ export default {
 		height: 937px;
 	} */
 .jl3dpassflow {
-  width: 100%;
-  height: 100%;
+ 	width: 100%;
+  	height: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	/* z-index: 10; */
 }
 .jl3ddraw1 {
   position: absolute;
diff --git a/src/views/jlmap3d/simulation/jl3dsimulation.vue b/src/views/jlmap3d/simulation/jl3dsimulation.vue
index d6cd3e8af..1ed2027b6 100644
--- a/src/views/jlmap3d/simulation/jl3dsimulation.vue
+++ b/src/views/jlmap3d/simulation/jl3dsimulation.vue
@@ -19,7 +19,7 @@
       <el-button-group>
         <el-button v-show=" project == 'say'" type="primary" @click="enterStopStation" >进入停车场</el-button>
         <el-button type="primary" @click="railmove">{{ $t('jlmap3d.cameraRailMove') }}</el-button>
-        <el-button type="primary" @click="back">{{ $t('global.exit') }}</el-button>
+        <!-- <el-button type="primary" @click="back">{{ $t('global.exit') }}</el-button> -->
       </el-button-group>
     </div>
 
@@ -122,7 +122,7 @@ export default {
     methods: {
         getParams:function() {
             var routerParams = this.$route.query.group;
-            this.mapid = this.$route.query.mapid;
+            this.mapid = this.$route.query.mapId;
             this.group = this.$route.query.group;
             this.token = this.$route.query.token;
             this.init(this.mapid, this.group);
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index 569c4b3e6..9ba24b24e 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -333,7 +333,7 @@ export default {
                     this.$store.dispatch('app/transitionAnimations');
                 }
                 const query = { group: resp.data, trainingId: node.id, lessonId: 0, mapId: this.$route.query.mapId, lineCode: this.$route.query.lineCode };
-                this.$router.push({ path: `${UrlConfig.displayNew}/manage`, query: query });
+                this.$router.push({ path: `${UrlConfig.display}/manage`, query: query });
                 launchFullscreen();
             }).catch(error => {
                 this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
diff --git a/src/views/login/baseDevelopment.vue b/src/views/login/baseDevelopment.vue
new file mode 100644
index 000000000..41d929e31
--- /dev/null
+++ b/src/views/login/baseDevelopment.vue
@@ -0,0 +1,28 @@
+<template>
+  <div class="content_box">
+    <span>本产品基于长安玖琏</span><span>城市轨道交通实训云平台开发</span>
+    <br><span>平台网址：</span><a target="_blank" href="https://joylink.club/cbtc/login" style="color: #33F;text-decoration:underline;">https://joylink.club/cbtc/login</a>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'BaseDevelopment',
+    data() {
+        return {
+        };
+    },
+    mounted() {
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+    .content_box{
+        position: absolute;
+        bottom: 10%;
+        right: 2%;
+        line-height: 20px;
+        font-size: 14px;
+    }
+</style>
diff --git a/src/views/login/floatPart.vue b/src/views/login/floatPart.vue
deleted file mode 100644
index 037cacc86..000000000
--- a/src/views/login/floatPart.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="content_box">
-    <span>本产品基于长安玖琏</span><span v-if="!project.startsWith('design')">城市轨道交通实训云平台设计开发</span><span v-else>城市轨道交通设计云平台设计开发</span>
-    <br><span>实训平台网址：</span><a target="_blank" href="https://joylink.club/cbtc/login" style="color: #33F;text-decoration:underline;">https://joylink.club/cbtc/login</a>
-    <br><span>设计平台网址：</span><a target="_blank" href="https://joylink.club/cbtc/design/login" style="color: #33F;text-decoration:underline;">https://joylink.club/cbtc/design/login</a>
-  </div>
-</template>
-
-<script>
-export default {
-    name: 'FloatPart',
-    data() {
-        return {
-        };
-    },
-    computed: {
-        project() {
-            return this.$route.path.split('/')[1];
-        }
-    },
-    mounted() {
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-    .content_box{
-        position: absolute;
-        bottom: 10%;
-        right: 2%;
-        line-height: 20px;
-        font-size: 14px;
-    }
-</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d3c430bb1..e380ad555 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,357 +1,209 @@
 <template>
   <div>
+    <!-- 设备登陆 -->
     <div
-      v-loading="syncLogin && !loadingCode"
+      v-if="syncLogin"
+      :style="{ 'background-image': 'url(' + deviceImg + ')' }"
       class="login-container"
-      :style="{'background-image': 'url('+bgImg+')'}"
-      element-loading-spinner="el-icon-loading"
-      :element-loading-text="loadingText"
-      element-loading-background="rgba(0, 0, 0, 0)"
     >
-      <div v-if="loginTitle && !syncLogin" :class="project.endsWith('heb')||project.endsWith('ntyl')?'text-box':'left-logo-box'">
-        <img class="logo" :src="logoImg" :style="{width: logoWidth}">
-        <span>{{ loginTitle==='空串'?'':loginTitle }}</span>
+      <div class="loadingText">
+        <span class="el-icon-loading" />
+        <span>{{ loadingText }}</span>
       </div>
-      <div v-if="!syncLogin" class="language_box">
+    </div>
+    <div v-else v-show="loadedConfig" class="login-container" :style="{ 'background-image': showBackPic?'url(' + bgImg + ')':'none' }">
+      <!-- 中英文切换 -->
+      <div class="language_box">
         <el-tooltip effect="dark" :content="this.$t('login.clickSwitchLanguage')" placement="bottom-end">
           <el-button class="language_btn" type="text" @click="handleLanguage">{{ language }}</el-button>
         </el-tooltip>
       </div>
-      <div v-if="!syncLogin" class="content-box" :style="noQrcodeList.includes(project)?'width: 450px;':''">
-        <div v-if="isProject && !syncLogin" class="text-box" :style="{top: titleDistance}">
-          <img v-if="!loginTitle" class="logo" :src="logoImg" :style="{width: titleImgWidth}">
-          <span>{{ title }}</span>
-        </div>
-        <div v-if="!noQrcodeList.includes(project)" class="qrcode-main">
-          <div class="login-code-box" @click="loginRefresh">
-            <qrcode-vue
-              v-loading="loadingCode"
-              :value="loginUrl"
-              :class-name="qrcodeClassName"
-              :size="150"
-              :element-loading-text="this.$t('login.clickRefresh')"
-              element-loading-spinner="el-icon-refresh"
-              element-loading-background="rgba(255, 255, 255, 0.9)"
-            />
-          </div>
-          <div class="login-tip">
-            <span class="sub-title">{{ $t('login.scanCodeLogin') }}</span>
-          </div>
-          <div class="tip-info">
-            <fieldset>
-              <legend>{{ $t('login.recommendedConfiguration') }}</legend>
-              <span>{{ $t('login.browser') }}
-                <a href="https://www.google.cn/chrome/" target="_blank" style="text-decoration: underline;">{{ $t('login.googleChrome') }}</a>
-              </span>
-              <br>
-              <span>{{ $t('login.screenResolution') + '1920*1080' }}</span>
-            </fieldset>
-          </div>
-        </div>
-        <el-form ref="loginForm" v-loading="loading" class="login-form" :model="loginForm" :rules="loginRules" label-position="left">
-          <div v-if="!isProject&&!project.endsWith('heb')" class="title_box">{{ $t('login.welcomeTo') + title }}</div>
-          <el-form-item prop="username" class="item_form_box">
-            <span class="svg-container svg-container_login">
-              <svg-icon icon-class="user" />
-            </span>
-            <el-input v-model="loginForm.username" name="username" type="text" :placeholder="this.$t('login.mobilePhoneNumberOrEmail')" @keyup.enter.native="goToNext" />
-          </el-form-item>
-          <el-form-item prop="password" class="item_form_box item_form_password">
-            <span class="svg-container">
-              <svg-icon icon-class="password" />
-            </span>
-            <el-input
-              ref="password"
-              v-model="loginForm.password"
-              name="password"
-              :type="pwdType"
-              :placeholder="this.$t('login.password')"
-              @keyup.enter.native="handleLogin"
-            />
-            <span class="show-pwd" @click="showPwd">
-              <svg-icon v-if="pwdDisplay" icon-class="eye" />
-              <svg-icon v-else icon-class="eye-open" />
-            </span>
-          </el-form-item>
-          <div class="tip-message">{{ tipsMsg }}</div>
-          <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
-            <div style="display:inline-block">
-              <el-checkbox v-model="isAutoLogin">{{ $t('login.autoLogin') }}</el-checkbox>
-              <el-checkbox v-if="project === 'cgy'" v-model="teacherLogin">教师登录</el-checkbox>
-            </div>
-            <el-popover
-              v-if="!noQrcodeList.includes(project)"
-              placement="right"
-              title=""
-              width="200"
-              trigger="hover"
-              class="popover_box"
-            >
-              <div>
-                <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
-                <div style="margin-top: 10px; word-break: break-word;text-align: center;">{{ $t('login.perfectInformation') }}</div>
-              </div>
-              <div slot="reference">{{ $t('login.unableToLogin') }}</div>
-            </el-popover>
-            <div v-if="registerCodeList.includes(project)" class="popover_box active" @click="registerUser">注册账号</div>
-          </div>
-          <el-form-item>
-            <el-button type="primary" style="width:100%;" @click.native.prevent="handleLogin">
-              {{ $t('login.login') }}
-            </el-button>
-          </el-form-item>
-          <div style="display: inline-block;width: 100%;">
-            <div class="popover_box active" style="bottom: 50px;" @click="forgetPassword">忘记密码？</div>
-          </div>
-        </el-form>
+      <!-- logo和名称 -->
+      <div class="left-logo-box">
+        <img class="logo" :src="loginProLogo" :style="{ width: loginProLogoWidth+'px'}">
+        <span>{{ loginOrgTitle }}</span>
       </div>
-      <float-part v-if="isProject && !versionBaseNoShow.includes(project)" />
-      <div v-if="!mainBodyNoShow.includes(project)" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;">
-        <span>{{ '主体：北京玖琏科技有限公司  备案号：京ICP备2021039716号' }}</span>
+      <div class="content-box">
+        <div class="text-box">{{ loginProtitle }}</div>
+        <!-- 微信登陆 -->
+        <!-- <wechat-login v-if="wechatLogin" ref="wechatLogin" :project="backProject" :sync-login="syncLogin" /> -->
+        <!-- 默认登陆 -->
+        <normal-login ref="normalLogin" :project="backProject" :local-project="localProject" @forgetPassword="forgetPassword" @showOrgList="showOrgList" @registerUser="registerUser" />
       </div>
-      <div v-if="project.endsWith('xadt')" style="position: absolute; bottom: 10px;right: 20px; font-size: 14px;">
-        <span>本产品由西安地铁（李乐工作室）与北京玖琏科技有限公司联合开发</span>
+      <!-- 基于系统开发 -->
+      <base-development v-if="baseDevelopment" ref="baseDevelopment" />
+      <!-- 关于系统 -->
+      <div class="bottomInfo">
+        <span>{{ aboutSystem }}</span>
       </div>
-      <div v-if="project === 'drts'" style="position: absolute; bottom: 50px; font-size: 20px;right: 20px;color:#3D3D3D;width: 370px;">
-        <el-row>
-          <el-col :span="6">
-            <img :src="wchatImg" width="80" height="80">
-          </el-col>
-          <el-col :span="18" style="text-align: left">
-            <div style="margin-top: 10px">服务电话：13910989830</div>
-            <!--<div style="margin-top: 10px">截止日期：2020年12月31日</div>-->
-          </el-col>
-        </el-row>
-      </div>
-      <!--<div v-if="project === 'drts'" style="position: absolute; bottom: 50px; font-size: 20px;left: 20px;color:#3D3D3D;width: 220px;height: 150px;background: #FFF;padding: 10px;border: 5px solid #CCC;border-radius: 8px;cursor: pointer;">-->
-      <!--<div class="news-box" @click="goCompetitionRules('4')"><img :src="handRight" width="14" height="14" style="margin-right: 15px">行车调度员赛项成绩发布</div>-->
-      <!--<div class="news-box" @click="goCompetitionRules('3')"><img :src="handRight" width="14" height="14" style="margin-right: 15px">“新誉杯”官方网站</div>-->
-      <!--<div class="news-box" @click="goCompetitionRules('2')"><img :src="handRight" width="14" height="14" style="margin-right: 15px">“新誉杯”决赛事项通知</div>-->
-      <!--<div class="news-box" @click="goCompetitionRules('1')"><img :src="handRight" width="14" height="14" style="margin-right: 15px">“新誉杯”竞赛规程</div>-->
-      <!--</div>-->
     </div>
-    <register ref="register" />
+    <!-- 忘记密码 -->
     <forget-password ref="forgetPassword" />
+    <!-- 注册用户 -->
+    <register-user ref="registerUser" :project="backProject" />
+    <!-- 选择组织 -->
+    <OrgSelect ref="orgSelect" @select="selectOrgnization" />
   </div>
 </template>
-
 <script>
-import QCode from '@/assets/erCode.jpg';
-import { setSessionStorage, removeSessionStorage } from '@/utils/auth';
-import Cookies from 'js-cookie';
-import md5 from 'js-md5';
-import QrcodeVue from 'qrcode.vue';
-import { getLoginWmurl, checkLoginStatus, getLoginInfo } from '@/api/login';
-import { LoginParams } from '@/utils/login';
+import { setSessionStorage } from '@/utils/auth';
 import bgImg from '@/assets/bg1.jpg';
+import LangStorage from '@/utils/lang';
+import { getFrontProjectConfigByLogin} from '@/api/projectConfig';
+// import WechatLogin from './wechatLogin';
+import NormalLogin from './normalLogin';
+import BaseDevelopment from './baseDevelopment';
+import ForgetPassword from './forgetPassword';
+import RegisterUser from './registerUser';
+import OrgSelect from './orgSelect';
 import bgIbpImg from '@/assets/bg_ibp.png';
 import bgIscsImg from '@/assets/bg_iscs.jpg';
 import bgCctvImg from '@/assets/bg_cctv.jpg';
 import bgLswImg from '@/assets/bg_lsw.jpg';
 import bgPsdImg from '@/assets/bg_psd.png';
-import HandRight from '@/assets/hand-o-right.png';
-import wchat from '@/assets/wchat.png';
-import { UrlConfig } from '@/scripts/ConstDic';
-import { loginInfo, ProjectIcon, ProjectLoginStyleList, VersionBaseNoShow, MainBodyNoShow, NoQrcodeList, localPackageProject, RegisterCodeList, RealCctvList} from '@/scripts/ProjectConfig';
-import { removeToken, getToken } from '@/utils/auth';
-import LangStorage from '@/utils/lang';
-import FloatPart from './floatPart';
-import { getSimulationInfoNew } from '@/api/simulation';
-import { getSimulationInfoByGroup } from '@/api/rtSimulation';
-import { getSessionStorage } from '@/utils/auth';
-import Register from './register';
-import ForgetPassword from './forgetPassword';
-
+import { getLoginWmurl, checkLoginStatus, getLoginInfo, selectOrgnization } from '@/api/login';
+import { getToken} from '@/utils/auth';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
+import { getBackProjectConfigByCode } from '@/api/projectConfig';
+import { getGroupByMapAndFunction, getSimulationInfoNew } from '@/api/simulation';
 export default {
-    name: 'Login',
-    components: { QrcodeVue, FloatPart, Register, ForgetPassword },
+    name:'LoginNew',
+    // components: { Register },
+    // export const RegisterCodeList = ['cgy', 'designcgy'];
+    // WechatLogin,
+    components: { NormalLogin, BaseDevelopment, ForgetPassword, OrgSelect, RegisterUser },
     data() {
-        const validateName = (rule, value, callback) => {
-            if (value) {
-                callback();
-            } else {
-                callback(new Error('请输入用户名'));
-            }
-        };
-        const validatePass = (rule, value, callback) => {
-            if (value.length < 5) {
-                callback(new Error(this.$t('login.passwordHint')));
-            } else {
-                callback();
-            }
-        };
         return {
-            QCode: QCode,
-            loading111: true,
-            isAutoLogin: false,
-            teacherLogin: false,
-            loginForm: {
-                username: '',
-                password: ''
-            },
-            loginRules: {
-                username: [{ required: true, trigger: 'blur', validator: validateName }],
-                password: [{ required: true, trigger: 'blur', validator: validatePass }]
-            },
-            loading: false,
-            pwdType: 'password',
-            tipsMsg: '',
-            qrcodeClassName: 'login-qrcode',
-            sessionId: '',
-            loginUrl: '',
-            loadingCode: false,
-            checkLogin: null,
-            checkTimeout: null,
-            pwdDisplay: true,
-            cookiesName: 'UserName',
-            cookiesToken: 'UserToken',
-            modelType: 'class',
-            loginClient: 'LianKeTang',
-            path: '/trainingPlatform',
-            lang: 'zh',
+            backProject:'',
             language: '中文',
-            versionBaseNoShow: VersionBaseNoShow,
-            mainBodyNoShow: MainBodyNoShow,
-            noQrcodeList: NoQrcodeList,
-            countdown: null,
-            gameOver: false,
-            wchatImg: wchat,
-            handRight: HandRight,
-            registerCodeList: RegisterCodeList
+            lang: 'zh',
+            loginProtitle:'',
+            localProject:false,
+            loadedConfig:false,
+            showBackPic:true,
+            // wechatLogin:true,
+            loginProLogoWidth:0,
+            baseDevelopment:false, // 是否显示基于系统开发
+            loginOrgTitle:'',
+            loginProLogo:'',
+            aboutSystem:'',
+            loadingText:'',
+            deviceImg:'',
+            checkLogin: null,
+            sessionId:''
         };
     },
     computed: {
         project() {
-            const project = this.$route.query.project;
-            const split = this.$route.path.split('/')[1];
-            if (process.env.VUE_APP_PRO && process.env.VUE_APP_PRO !== 'local-test') {
-                return localPackageProject[process.env.VUE_APP_PRO + split];
-            } else if (split == 'design') {
-                return project ? split + project : split;
-            } else if (split == 'login') {
-                return project || 'login';
-            } else {
-                return split;
-            }
+            return this.$route.query.project || 'login';
         },
-        loginTitle () {
-            return loginInfo[this.project].loginTitle;
-        },
-        title() {
-            return loginInfo[this.project].title;
-        },
-        logoWidth() {
-            return loginInfo[this.project].logoWidth;
-        },
-        isProject() {
-            const projectName = this.project;
-            return ProjectLoginStyleList.includes(projectName);
-        },
-        titleDistance() {
-            return loginInfo[this.project].titleDistance || '-60px';
-        },
-        titleImgWidth() {
-            return loginInfo[this.project].titleImgWidth || '80px';
-        },
-        logoImg() {
-            const projectName = this.project;
-            return ProjectIcon[projectName];
-        },
-        bgImg() {
-            const bgImgAll = process.env.VUE_APP_PRO === 'local' || this.$route.query.project == 'heb' ? '' : bgImg;
-            const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW', 'PIS_STAND', 'PIS_TRAIN'];
-            const imgMap = {
-                ISCS_LW: bgIscsImg,
-                ISCS_CW: bgIscsImg,
-                VR_IBP: bgIbpImg,
-                CCTV: bgCctvImg,
-                VR_PSD: bgPsdImg,
-                LSW: bgLswImg,
-                SANDBOX: bgLswImg,
-                ILW: bgLswImg
-            };
-            return synchronousLogin.includes(this.$route.query.type) ? imgMap[this.$route.query.type] : bgImgAll;
+        type() {
+            return this.$route.query.type;
         },
         syncLogin() {
             const synchronousLogin = ['VR_IBP', 'LSW', 'CCTV', 'ISCS_LW', 'ISCS_CW', 'VR_PSD', 'SANDBOX', 'ILW', 'PIS_STAND', 'PIS_TRAIN'];
-            if (this.$route.query.thirdJump && this.$route.query.key && this.$route.query.group) {
-                return true;
-            } else {
-                return this.$route.query.type ? synchronousLogin.includes(this.$route.query.type) : false;
-            }
+            return this.type ? synchronousLogin.includes(this.type) : false;
         },
-        loadingText() {
-            const textMap = {
-                ISCS_LW: '检测现地工作站登录中',
-                ISCS_CW: '检测行调工作站登录中',
-                VR_IBP: '检测现地工作站登陆中',
-                CCTV: '检测教员机登录中',
-                VR_PSD: '检测教员机登录中',
-                LSW: '检测教员机登录中',
-                ILW: '检测教员机登录中',
-                PIS_TRAIN: '检测教员机登录中',
-                PIS_STAND: '检测教员机登录中'
-            };
-            return this.$route.query.type ? textMap[this.$route.query.type] : '';
+        bgImg() {
+            return bgImg;
         }
     },
     created() {
-        if (!loginInfo[this.project]) {
-            this.$messageBox('无效的登录路径，请查证路径后重试！');
-            return;
+        const nowLang = LangStorage.getLang('zh');
+        if (nowLang === 'zh') {
+            this.lang = 'en';
+            this.language = 'English';
         }
-        document.querySelector("link[rel*='icon']").href = loginInfo[this.project].linkIcon || ProjectIcon[this.project];
-        removeSessionStorage('projectDevice');
-        this.computedAttribute();
-        if (Cookies.get(this.cookiesName) && Cookies.get(this.cookiesToken)) {
-            const model = {'username': Cookies.get(this.cookiesName), 'password': Cookies.get(this.cookiesToken), 'project':loginInfo[this.project].loginParam};
-            model.type = this.modelType;
-            this.$store.dispatch('Login', model).then(() => {
-                this.$store.dispatch('SetAccount', model.username);
-                this.handleLoginSucessRoute();
-            }).catch(error => {
-                if (error.code === '30001') {
-                    this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect');
-                } else if (error.code == '10001') {
-                    this.tipsMsg = '教员机尚未登录，请稍后重试！';
-                } else if (error.code == '10013' || error.code == '10014') {
-                    this.tipsMsg = '该账号权限不足！';
-                } else {
-                    this.tipsMsg = error.message;
+        getFrontProjectConfigByLogin(this.project).then(response => {
+            if (response.data) {
+                this.backProject = response.data.project;
+                // loginProLogoHeight
+                // wechatLogin,
+                const {showBackPic, aboutSystem, baseDevelopment, browserTitle, homeTitle, caseShow,
+                    loginProtitle, loginProLogoWidth, loginOrgTitle, localProject, homeProLogoWidth, loginProLogo} = response.data.viewSetting;
+                this.showBackPic = showBackPic;
+                // this.wechatLogin = wechatLogin;
+                this.loginProtitle = loginProtitle;
+                this.loginProLogoWidth = loginProLogoWidth;
+                // this.homeProLogoWidth = homeProLogoWidth;
+                this.loginOrgTitle = loginOrgTitle;
+                this.loginProLogo = loginProLogo ? this.$store.state.user.ossUrl + '/logo/' + loginProLogo : '';
+                this.aboutSystem = aboutSystem;
+                this.baseDevelopment = baseDevelopment;
+                this.localProject = localProject;
+                document.title = browserTitle;
+                document.querySelector("link[rel*='icon']").href = this.loginProLogo;
+                this.$store.dispatch('setHomeProLogoWidth', homeProLogoWidth);
+                this.$store.dispatch('setLoginProLogo', this.loginProLogo);
+                this.$store.dispatch('setHomeTitle', homeTitle);
+                this.$store.dispatch('setCaseShow', caseShow);
+                this.loadedConfig = true;
+                // helpShow
+                // 登录页 是否显示联系方式 loginContectInformation  false
+                setSessionStorage('project', this.project);
+                if (this.syncLogin) {
+                    this.deviceRelatedLogin();
                 }
-                this.loading = false;
-                setTimeout(() => { this.tipsMsg = ''; }, 5000);
-            });
-        }
+            }
+        }).catch(() => {
+            this.$messageBox('无效的登录路径，请查证路径后重试！');
+        });
     },
-    mounted() {
-        document.title = loginInfo[this.project].browserTitle || loginInfo[this.project].title;
-        if (this.$route.query.thirdJump && this.$route.query.key && this.$route.query.group) {
-            this.thirdJump(this.$route.query.key, this.$route.query.group);
-        } else if (this.syncLogin || !this.noQrcodeList.includes(this.project)) {
+    methods:{
+        handleLanguage() {
+            this.$i18n.locale = this.lang;
+            LangStorage.setLang(this.lang);
+        },
+        forgetPassword() {
+            this.$refs.forgetPassword.doShow();
+        },
+        registerUser() {
+            this.$refs.registerUser.doShow();
+        },
+        showOrgList(orgList) {
+            this.$refs.orgSelect.doShow(orgList);
+        },
+        selectOrgnization(orgId) {
+            this.$refs.normalLogin.selectOrg(orgId);
+        },
+        deviceRelatedLogin() {
+            const deviceMap = {
+                ISCS_LW:{text:'检测现地工作站登录中', Img:bgIscsImg },
+                ISCS_CW:{text:'检测行调工作站登录中', Img:bgIscsImg},
+                VR_IBP:{text:'检测现地工作站登陆中', Img:bgIbpImg},
+                CCTV:{text:'检测教员机登录中', Img:bgCctvImg},
+                VR_PSD:{text:'检测教员机登录中', Img:bgPsdImg},
+                LSW:{text:'检测教员机登录中', Img:bgLswImg},
+                ILW:{text:'检测教员机登录中', Img:bgLswImg},
+                PIS_TRAIN:{text:'检测教员机登录中'},
+                PIS_STAND:{text:'检测教员机登录中'},
+                SANDBOX:{Img:bgLswImg, text:'检测教员机登录中'}
+            };
+            this.loadingText = deviceMap[this.type].text;
+            this.deviceImg = deviceMap[this.type].Img;
             this.loginRefresh();
-        }
-    },
-    beforeDestroy() {
-        this.countdown && clearInterval(this.countdown);
-    },
-    methods: {
-        computedAttribute() {
-            if (this.project.startsWith('design')) {
-                this.cookiesName = 'UserDesignName';
-                this.cookiesToken = 'UserDesignToken';
-                this.modelType = 'design';
-                this.loginClient = 'Design';
-                this.path = UrlConfig.design.prefix;
+        },
+        loginRefresh() {
+            const self = this;
+            const params = { clientId: '1', secret: 'joylink' };
+            params.project = this.project;
+            if (this.$route.query.projectDevice) {
+                params.deviceCode = this.$route.query.projectDevice;
             }
-            const nowLang = LangStorage.getLang('zh');
-            if (nowLang === 'zh') {
-                this.lang = 'en';
-                this.language = 'English';
-            }
-
-            removeToken();
-            setSessionStorage('project', this.project);
+            getLoginWmurl(params)
+                .then(response => {
+                    this.sessionId = response.data.sessionId;
+                    this.checkLoginStatus();
+                })
+                .catch(() => {
+                    if (this.syncLogin) {
+                        setTimeout(() => {
+                            self.loginRefresh();
+                        }, 3000);
+                    } else {
+                        this.$messageBox(this.$t('login.getLoginQrCode'));
+                    }
+                });
         },
         clearTimer(timer) {
             if (timer) {
@@ -359,53 +211,6 @@ export default {
                 timer = null;
             }
         },
-        loginRefresh() {
-            // this.loadingCode = true;
-            const self = this;
-            const params = LoginParams[this.loginClient];
-            params.project = loginInfo[this.project].loginParam;
-            if (this.$route.query.projectDevice) {
-                params.deviceCode = this.$route.query.projectDevice;
-            }
-            getLoginWmurl(params).then(response => {
-                this.sessionId = response.data.sessionId;
-                this.loginUrl = response.data.url;
-                this.loadingCode = false;
-                this.checkLoginStatus();
-            }).catch(() => {
-                if (this.syncLogin) {
-                    setTimeout(() =>{
-                        self.loginRefresh();
-                    }, 3000);
-                } else {
-                    this.loadingCode = false;
-                    this.$messageBox(this.$t('login.getLoginQrCode'));
-                }
-            });
-        },
-        thirdJump(token, group) {
-            debugger;
-            this.$store.dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: token, type: this.modelType }).then(() => {
-                // 清除定时器，设置路由
-                this.clearTimer(this.checkLogin);
-                getLoginInfo(getToken()).then(res => {
-                    getSimulationInfoNew(group).then(resp => {
-                        this.$router.push({ path: `/displayNew/demon`, query: {
-                            lineCode: resp.data.map.lineCode,
-                            group: group,
-                            prdType: resp.data.prodType,
-                            mapId: resp.data.map.id,
-                            goodsId:'',
-                            try:'0',
-                            thirdDrts:1,
-                            project:this.project
-                        }});
-                    });
-                }).catch(() => {
-                    this.$messageBox('获取数据失败！');
-                });
-            });
-        },
         checkLoginStatus() {
             const self = this;
             // 销毁则不再定时
@@ -416,554 +221,182 @@ export default {
             // 设置定时器检测
             this.clearTimer(this.checkLogin);
             this.checkLogin = setTimeout(() => {
-                checkLoginStatus(self.sessionId).then(response => {
-                    // 设置扫码登录
-                    self.$store.dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: response.data.token, type: this.modelType }).then(() => {
-                        // 清除定时器，设置路由
-                        self.clearTimer(self.checkLogin);
-                        this.handleLoginSucessRoute();
-                    });
-                }).catch(error => {
-                    if ((error.data && error.data.status === 'EXPIRE') || error.code != 200) {
-                        if (this.syncLogin) {
+                checkLoginStatus(self.sessionId)
+                    .then(response => {
+
+                        // 设置扫码登录
+                        self.$store
+                            .dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: response.data.token, type: 'class' })
+                            .then(() => {
+                                // 清除定时器，设置路由
+                                self.clearTimer(self.checkLogin);
+                                this.checkOrgnizationInfo();
+                            });
+
+                    }).catch(error => {
+                        if ((error.data && error.data.status === 'EXPIRE') || error.code != 200) {
                             self.loginRefresh();
                         } else {
-                            this.loadingCode = true;
-                            this.loginUrl = '';
+                            self.checkLoginStatus();
                         }
-                    } else {
-                        self.checkLoginStatus();
-                    }
-                });
+                    });
             }, 3000);
         },
-        showPwd() {
-            if (this.pwdType === 'password') {
-                this.pwdDisplay = false;
-                this.pwdType = '';
-            } else {
-                this.pwdType = 'password';
-                this.pwdDisplay = true;
-            }
-        },
-        goToNext() {
-            if (this.loginForm.username.length < 5) {
-                return;
-            } else {
-                this.$refs['password'].focus();
-            }
-        },
-        handleLogin() {
-            this.$refs.loginForm.validate(valid => {
-                if (valid) {
-                    const model = Object.assign({}, this.loginForm);
-                    model.password = md5(model.password);
-                    model.type = this.modelType;
-                    model.project = loginInfo[this.project].loginParam;
-                    model.deviceCode = this.$route.query.projectDevice;
-                    model.teacherLogin = this.teacherLogin;
-                    this.loading = true;
-                    if (this.isAutoLogin) {
-                        Cookies.set(this.cookiesName, model.username, { expires: 2});
-                        Cookies.set(this.cookiesToken, model.password, { expires: 2});
-                    }
-                    this.$store.dispatch('Login', model).then(() => {
-                        this.$store.dispatch('SetAccount', model.username);
-                        this.handleLoginSucessRoute();
-                    }).catch(error => {
-                        if (error.code == '40003') {
-                            this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect');
-                        } else if (error.code == '10001') {
-                            this.tipsMsg = '教员机尚未登录，请稍后重试！';
-                        } else if (error.code == '10013' || error.code == '10014') {
-                            this.tipsMsg = '该账号权限不足';
-                        } else {
-                            this.tipsMsg = error.message;
-                        }
-                        this.loading = false;
-                        setTimeout(() => { this.tipsMsg = ''; }, 5000);
-                    });
-                } else {
-                    console.log('error submit!!');
-                    return false;
-                }
-            });
+        // 获取组织列表
+        checkOrgnizationInfo() {
+            this.handleLoginSucessRoute();
+            // getOrgList().then(resp => {
+            //     const orgList = resp.data;
+            //     let orgId = '';
+            //     if (orgList.length < 2) {
+            //         if (orgList.length === 1) {
+            //             orgId = orgList[0].orgId;
+            //             selectOrgnization(orgId);
+            //         }
+            //         this.handleLoginSucessRoute();
+            //     } else {
+            //         this.showOrgList(orgList);
+            //     }
+            // }).catch((error)=>{
+            //     this.$message.error(error.message);
+            // });
         },
+        // 跳转路由
         handleLoginSucessRoute() {
-            // 设置路由
-            this.loading = this.project === 'drts' || this.project === 'hlsdrts' || false;
-            this.tipsMsg = '';
-            removeSessionStorage('againEnter');
-            if (this.$route.query.projectDevice) {
-                getLoginInfo(getToken()).then(res => {
-                    getSimulationInfoNew(res.data.group).then(resp => {
-                        const query = {
-                            group: res.data.group,
-                            mapId: resp.data.map.id,
-                            lineCode:resp.data.map.lineCode,
-                            projectDevice: this.$route.query.projectDevice,
-                            type: this.$route.query.type
-                        };
-                        setSessionStorage('projectDevice', JSON.stringify(res.data.deviceVO));
-                        if (this.$route.query.type == 'LSW') {
-                            const config = JSON.parse(res.data.deviceVO.config);
-                            if (config.quadrant == '99') {
-                                this.$router.push({ path: `/displayBigScreen/${resp.data.map.id}`, query: {...query, prdType:resp.data.prodType} });
-                            } else {
-                                this.$router.push({ path: `/bigSplitScreen/${resp.data.map.id}`, query: {...query, prdType:resp.data.prodType} });
-                            }
-                        } else if (this.$route.query.type === 'ISCS_LW' || this.$route.query.type === 'ISCS_CW') {
-                            const config = JSON.parse(res.data.deviceVO.config);
-                            if (config.picture === 'paMain') {
-                                // displayIscs/system/stationConfig/paMain?stationName=象峰站&stationId=Station25166&group=20-120-196-193&mapId=196&lineCode=02
-                                this.$router.push({ path: `displayIscs/system/stationConfig/paMain`, query: {
-                                    stationId: config.stationCode,
-                                    group: res.data.group,
-                                    mapId:resp.data.map.id,
-                                    lineCode: resp.data.map.lineCode,
-                                    projectDevice: this.$route.query.projectDevice,
-                                    type: this.$route.query.type
-                                } });
-                            } else if (config.picture === 'pidsMain') {
-                                this.$router.push({ path: `displayIscs/system/stationConfig/pidsMain`, query: {
-                                    stationId: config.stationCode,
-                                    group: res.data.group,
-                                    mapId:resp.data.map.id,
-                                    lineCode: resp.data.map.lineCode,
-                                    projectDevice: this.$route.query.projectDevice,
-                                    type: this.$route.query.type
-                                } });
-                            } else {
-                                this.$router.push({ path: `/displayIscs/system`, query: {
-                                    group: res.data.group,
-                                    lineCode: resp.data.map.lineCode,
-                                    mapId:resp.data.map.id,
-                                    projectDevice: this.$route.query.projectDevice,
-                                    type: this.$route.query.type} });
-                            }
-                        } else if (this.$route.query.type == 'CCTV') {
-                            if (RealCctvList.includes(this.project)) {
-                                this.$router.push({
-                                    path:'/jointTrainingNewCCTV',
-                                    query:{
-                                        mapid:resp.data.map.id,
-                                        group:res.data.group,
-                                        project: getSessionStorage('project'),
-                                        projectDevice: this.$route.query.projectDevice,
-                                        type: this.$route.query.type
+            getBackProjectConfigByCode(this.project).then(res=>{
+                if (res.data) {
+                    const {mapId, functionId} = res.data;
+                    if (functionId && mapId) {
+                        getGroupByMapAndFunction(mapId, functionId).then(resp => {
+                            const group = resp.data;
+                            getLoginInfo(getToken()).then(resp => {
+                                const deviceVO = resp.data.deviceVO;
+                                const accountVO = resp.data.accountVO;
+                                if (deviceVO) {
+                                    const config = JSON.parse(deviceVO.config || '{}');
+                                    if (config && config.roleCode) {
+                                        const params = [{userId: accountVO.id, memberId:config.roleCode}];
+                                        assignUsersPlayRoles(params, group).then(() => {
+                                            this.enterSimulation(group, mapId, config);
+                                        }).catch(res=>{
+                                            this.$message.error('切换角色失败');
+                                            this.$store.dispatch('LogOut');
+                                        });
                                     }
-                                });
-                            } else {
-                                this.$router.push({ path: `/jlmap3d/passengerflow`, query:{
-                                    mapid:resp.data.map.id,
-                                    group:res.data.group,
-                                    lineCode: resp.data.map.lineCode,
-                                    project: getSessionStorage('project'),
-                                    projectDevice: this.$route.query.projectDevice,
-                                    type: this.$route.query.type
-                                } });
-                            }
-                        } else if (this.$route.query.type === 'SCHEDULING') {
-                            this.$router.push({ path: `/displayNew/demon`, query: {
-                                group: res.data.group,
-                                lineCode: resp.data.map.lineCode,
-                                mapId: resp.data.map.id,
-                                prdType: '05',
-                                goodsId:'',
-                                try:'0',
-                                projectDevice: this.$route.query.projectDevice,
-                                type: this.$route.query.type
-                            }});
-                        } else if (this.$route.query.type === 'DEPOT') {
-                            this.$router.push({ path: `/displayNew/demon`, query: {
-                                group: res.data.group,
-                                lineCode: resp.data.map.lineCode,
-                                mapId: resp.data.map.id,
-                                prdType: '09',
-                                goodsId:'',
-                                try:'0',
-                                projectDevice: this.$route.query.projectDevice,
-                                type: this.$route.query.type
-                            }});
-                        } else if (this.$route.query.type === 'VR_PSD') {
-                            if (res.data.deviceVO && res.data.deviceVO.config) {
-                                query.psdCode = JSON.parse(res.data.deviceVO.config).psdCode;
-                            }
-                            this.$router.push({ path: `/jointTrainingNew`, query: query });
-                        } else if (this.$route.query.type === 'SANDBOX') {
-                            const sandboxQuery = {
-                                mapid: query.mapId,
-                                group: query.group,
-                                project: getSessionStorage('project'),
-                                token: getToken(),
-                                projectDevice: this.$route.query.projectDevice,
-                                type: this.$route.query.type
-                            };
-                            this.$router.push({ path: `/jlmap3d/sandbox`, query: sandboxQuery });
-                        } else if (this.$route.query.type === 'ILW') {
-                            this.$router.push({ path: `/jointTrainingNew`, query: query });
-                        } else if (this.$route.query.type === 'PIS_STAND' || this.$route.query.type === 'PIS_TRAIN') {
-                            const config = JSON.parse(res.data.deviceVO.config);
-                            this.$router.push({ path: `/pis`, query: {...query, ...config}});
-                        } else {
-                            this.$router.push({ path: `/jointTrainingNew`, query: query });
-                        }
-                    });
-                });
-            } else if (this.project === 'drts' || this.project === 'hlsdrts' || this.project === 'bjd' || this.project === 'wjls') {
-                getLoginInfo(getToken()).then(res => {
-                    if (this.project === 'wjls') {
-                        getSimulationInfoByGroup(res.data.group).then(resp =>{
-                            this.$router.push({ path: `/displayCity/demon`, query: {
-                                lineCode: resp.data.map.lineCode,
-                                group: res.data.group,
-                                prdType: resp.data.prodType,
-                                mapId: resp.data.map.id,
-                                goodsId:'',
-                                try:'0',
-                                newApi:true,
-                                project:this.project
-                            }});
-                            this.loading = false;
+                                }
+                            }).catch(res=>{
+                                this.$message.error('获取用户信息失败');
+                                this.$store.dispatch('LogOut');
+                            });
+                        }).catch(res=>{
+                            this.$store.dispatch('LogOut');
                         });
                     } else {
-                        getSimulationInfoNew(res.data.group).then(resp => {
-                            if (this.project === 'drts' || this.project === 'hlsdrts') {
-                                this.$router.push({ path: `/displayNew/demon`, query: {
-                                    lineCode: resp.data.map.lineCode,
-                                    group: res.data.group,
-                                    prdType: resp.data.prodType,
-                                    mapId: resp.data.map.id,
-                                    goodsId:'',
-                                    try:'0',
-                                    project:this.project
-                                }});
-                            } else {
-                                this.$store.dispatch('app/transitionAnimations');
-                                this.$router.push({ path: `/practiceDisplay`, query: {
-                                    lineCode: resp.data.map.lineCode,
-                                    group: res.data.group,
-                                    prdType: resp.data.prodType,
-                                    mapId: resp.data.map.id,
-                                    project:this.project
-                                }});
-                            }
-                            this.loading = false;
-                        });
+                        this.$message.error('请先配置项目信息');
+                        this.$store.dispatch('LogOut');
                     }
-                });
-            } else if (this.project === 'zzwwtest') {
-                this.$router.push({ path: '/jlmap3d/zzwwtest', query: {lessonId:'35'} });
-            } else if (this.project === 'xzexam') {
-                this.$router.push({ path: '/jlmap3d/xzexam', query: {} });
-            } else if (this.project === 'richorlesson3d') {
-                this.$router.push({ path: '/jlmap3d/lesson3dselect', query: {} });
-            } else {
-                if (this.teacherLogin) {
-                    this.$router.push({ path: '/info/organization/classManage?enter=teacher' });
-                } else {
-                    this.$router.push({ path: this.path });
                 }
-            }
+            }).catch(res=>{
+                this.$message.error('获取项目信息失败');
+                this.$store.dispatch('LogOut');
+            });
         },
-        handleLanguage() {
-            this.$i18n.locale = this.lang;
-            LangStorage.setLang(this.lang);
-        },
-        // goCompetitionRules(val) {
-        //     if (val === '1') {
-        //         window.open('https://mp.weixin.qq.com/s?__biz=MzI3NzMwODY3OQ==&mid=2247506304&idx=1&sn=77708ca228404cee2b28e131cdfb9735&chksm=eb6aade8dc1d24fe6eb9f1334aadda239f47dafc79de7d522e0f3f00e2d3ba1dd213dda6764c&xtrack=1&scene=90&subscene=93&sessionid=1598522875&clicktime=1598523062&enterid=1598523062&ascene=56&devicetype=android-29&version=3.0.27.2701&nettype=WIFI&abtest_cookie=AAACAA%3D%3D&lang=zh_CN&exportkey=AQZ2cTPSob%2B5kBDiWnKw0Js%3D&pass_ticket=12Xyhe%2BbZsC9Vuzfs0iYUUn0i%2Br5JlZiOGCxWoExuthBhnIrpkmUyjVRi6bjyA1I&wx_header=1&platform=win', '_blank');
-        //     } else if (val === '2') {
-        //         window.open('https://mp.weixin.qq.com/s?__biz=MzI3NzMwODY3OQ==&mid=2247506789&idx=1&sn=5b5c1e6e0ca7dc54a935f57cee4eb1a2&chksm=eb6aaf0ddc1d261ba2ba7b9bed810b12b3317d45b1a484095d13b3d7e075b091d92fc7b9afb8&mpshare=1&scene=1&srcid=0910Yd3PVFs0WjWZyumLN9Jo&sharer_sharetime=1599740490862&sharer_shareid=98d62529ea7e8d0f6fb2281f854f3ea1&version=3.0.30.2006&platform=win&rd2werd=1#wechat_redirect', '_blank');
-        //     } else if (val === '3') {
-        //         window.open('http://metroskills.camet.org.cn', '_blank');
-        //     } else if (val === '4') {
-        //         window.open('https://mp.weixin.qq.com/s?__biz=MzI3NzMwODY3OQ==&mid=2247510328&idx=1&sn=b9ba74efd9688513ae8c28f297268bd5&chksm=eb6add50dc1d54460f6a965a6b96fb7adb5205327dba5f7b57ec963ee87e1e2694e7b230fd65&xtrack=1&scene=90&subscene=93&sessionid=1607077432&clicktime=1607077443&enterid=1607077443&ascene=56&devicetype=android-29&version=3.0.36.2008&nettype=ctnet&abtest_cookie=AAACAA%3D%3D&lang=zh_CN&exportkey=AX5YNBACCv37GORQdECX6PA%3D&pass_ticket=hZngvACKkOr5GKVNY2vl3nM0vWwylSDF51O5A12K38n8Sok%2FWQv2S8OMQD2sYBA1&wx_header=1&platform=win');
-        //     }
-        // },
-        registerUser() {
-            this.$refs.register.doShow();
-        },
-        forgetPassword() {
-            this.$refs.forgetPassword.doShow();
+        enterSimulation(group, mapId, config) {
+            getSimulationInfoNew(group).then(response=>{
+                const paramVO = response.data.paramVO;
+                const query = {
+                    lineCode: response.data.map.lineCode,
+                    group: group,
+                    mapId: mapId,
+                    projectDevice:this.$route.query.projectDevice,
+                    type:this.$route.query.type,
+                    simType:paramVO.type,
+                    project: this.project,
+                    singleClient:true
+                };
+                if (config) {
+                    if (config.client) { query.client = config.client; }
+                    if (config.psdCode) { query.psdCode = config.psdCode; }
+                    // IBP
+                    if (config.part) { query.part = config.part; }
+                    if (config.deviceCode) { query.deviceCode = config.deviceCode; }
+                    // iscs
+                    if (config.picture) { query.deviceCode = config.picture; }
+                    // pis
+                    if (config.standCode) { query.standCode = config.standCode; }
+                    if (config.groupNumber) { query.groupNumber = config.groupNumber; }
+                    //
+                    // if (config.client) { query.client = config.client; }
+                }
+                this.$router.push({ path: `/display/demon`, query: query });
+            }).catch(res=>{
+                this.$store.dispatch('LogOut');
+            });
         }
     }
 };
 </script>
+<style lang="scss" scoped>
+.login-container {
+	position: fixed;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+	width: 100%;
+    background: #e4eaea;
+	background-repeat: no-repeat;
+	background-origin: border-box;
+	background-size: 100% 100%;
+}
+.language_box {
+    position: absolute;
+    top: 20px;
+    right: 40px;
+    .language_btn {
+        /*font-weight: bold;*/
+        cursor: pointer;
+        font-size: 18px;
+    }
+}
+.text-box {
+    font-size: 37px;
+    font-weight: bold;
+    top: -70px;
+    width: 1200px;
+    text-align: center;
+    position: absolute;
+}
+.content-box {
+    // width: 740px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #fff;
+    padding: 30px 30px 30px;
+    margin-bottom: 20px;
+    box-sizing: border-box;
+    position: relative;
+}
+.left-logo-box {
+    position: absolute;
+    top: 2%;
+    font-size: 28px;
+    font-weight: bold;
+    left: 2%;
+}
+.logo {
+    vertical-align: middle;
+}
+.bottomInfo{
+    position: absolute;
+    bottom: 10px;
+    right: 20px;
+    font-size: 14px;
+}
+.loadingText{
+    font-size: 36px;
+    color: #fff;
+}
 
-<style rel="stylesheet/scss" lang="scss">
-	$bg:#fff;
-	$light_gray:#eee;
-	.drts_title{
-		position: absolute;
-		top: 10%;
-		color:#F00;
-		text-align: center;
-	}
-	.drts_explain {
-		position: absolute;
-		text-align: center;
-		font-size: 32px;
-		color:#F00;
-	}
-	@media screen and (max-width:960px){
-		.drts_title{
-			font-size: 30px;
-		}
-		.drts_explain{
-			font-size: 18px;
-		}
-	}
-	@media screen and (min-width:960px) and (max-width:1260px){
-		.drts_title{
-			font-size: 36px;
-		}
-		.drts_explain{
-			font-size: 20px;
-		}
-	}
-	@media screen and (min-width:1260px) and (max-width:1440px){
-		.drts_title{
-			font-size: 42px;
-		}
-		.drts_explain{
-			font-size: 24px;
-		}
-	}
-	@media screen and (min-width:1440px) and (max-width:1600px){
-		.drts_title{
-			font-size: 46px;
-		}
-		.drts_explain{
-			font-size: 28px;
-		}
-	}
-	@media screen and (min-width:1600px){
-		.drts_title{
-			font-size: 50px;
-		}
-		.drts_explain{
-			font-size: 32px;
-		}
-	}
-	@media screen and (max-height:900px){
-		.drts_explain{
-			bottom: 140px;
-		}
-	}
-	@media screen and (min-height:900px){
-		.drts_explain{
-			bottom: 200px;
-		}
-	}
-	.login-container {
-		background: #E4EAEA;
-		.el-form-item{
-			background: #fff !important;
-			border: 1px solid rgba(0, 0, 0, 0.1) !important;
-			.el-input {
-				height: 40px;
-				width: 85%;
-				background: #fff;
-				input {
-					background: #fff !important;
-					border: 0px;
-					-webkit-appearance: none;
-					border-radius: 0px;
-					padding: 8px 9px 7px 5px;
-					color: #000;
-					height: 100%;
-
-					&:-webkit-autofill {
-						box-shadow: 0 0 0px 1000px $bg inset !important;
-						-webkit-text-fill-color: #000 !important;
-					}
-				}
-			}
-		}
-
-		.item_form_box {
-			border: 1px solid #ccc;
-			border-radius: 5px;
-			color: #454545;
-		}
-
-		.item_form_password{
-			margin-bottom: 10px;
-		}
-
-		.tip-message {
-			color: #F56C61;
-			padding: 5px;
-			font-size: 12px;
-			height: 23px;
-			margin-bottom: 10px;
-		}
-		.el-loading-spinner i {
-			font-size: 100px;
-		}
-		.el-loading-spinner .el-loading-text {
-			font-size: 24px;
-		}
-		.login-code-box {
-			.el-loading-spinner i {
-				font-size: 14px;
-			}
-			.el-loading-spinner .el-loading-text {
-				font-size: 14px;
-			}
-		}
-	}
-</style>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	$bg:#f0f0f0;
-	$qrbg:#fff;
-	$dark_gray:#889aa4;
-	$light_gray:#eee;
-	$qrcodeSize: 270px;
-	.popover_box {
-		position: absolute;
-		right: 80px;
-		bottom: 124px;
-		cursor: pointer;
-		color: #225592;
-		font-size: 14px;
-	}
-	.active:hover{
-		color: #409EFF;
-	}
-	.countdown_box {
-		display: inline-block;
-		width: 35px;
-		margin-right: 5px;
-		background: #000;
-		color: #F00;
-		text-align: center;
-		border-radius: 5px;
-	}
-	.news-box {
-		color: #409EFF;
-		width: 100%;
-		border-bottom: dashed 1px #409EFF;
-		font-size: 14px;
-		line-height: 30px;
-		height: 30px;
-	}
-	.news-box:hover {
-		color: #3943CB;
-	}
-	.login-container {
-		position: fixed;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 100%;
-		width: 100%;
-		background-repeat: no-repeat;
-		background-origin: border-box;
-		background-size: 100% 100%;
-		.content-box{
-			width: 740px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			background: #fff;
-			padding: 30px 30px 30px;
-			margin-bottom: 20px;
-			box-sizing: border-box;
-			position: relative;
-		}
-		.text-box{
-			font-size: 39px;
-			font-weight: bold;
-			top: 150px;
-			width: 1070px;
-			text-align: center;
-			position: absolute;
-		}
-		.left-logo-box{
-			position: absolute;
-			top: 2%;
-			font-size: 28px;
-			font-weight: bold;
-			left: 2%;
-		}
-		.logo{
-			vertical-align: middle;
-		}
-		.language_box{
-			position: absolute;
-			top: 20px;
-			right: 40px;
-			.language_btn{
-				/*font-weight: bold;*/
-				cursor: pointer;
-				font-size: 18px;
-			}
-		}
-		.login-form {
-			width: 440px;
-			padding: 0 50px;
-		}
-
-		.svg-container {
-			padding-left: 14px;
-			color: $dark_gray;
-			vertical-align: middle;
-			width: 30px;
-			display: inline-block;
-
-			&_login {
-				font-size: 16px;
-			}
-		}
-
-		.title_box {
-			font-size: 20px;
-			color: #000;
-			margin: 0px auto 30px auto;
-			text-align: center;
-		}
-
-		.show-pwd {
-			position: absolute;
-			right: 10px;
-			top: 3px;
-			font-size: 16px;
-			color: $dark_gray;
-			cursor: pointer;
-			user-select: none;
-		}
-	}
-
-	.qrcode-main{
-		width: 300px;
-		background-color: $qrbg;
-		text-align: center;
-		border-right: 1px solid #ececec;
-		.tip-info {
-			text-align: left;
-			display: inline-block;
-			color: green;
-			margin: 0 auto;
-		}
-
-		.login-code-box{
-			width: 150px;
-			margin: 0 auto;
-			cursor: pointer;
-		}
-
-		.system-type {
-			margin: 5px 0;
-			display: block;
-		}
-		.sub-title {
-			font-size: 16px;
-			text-align: center;
-			color: #353535;
-			line-height: 30px;
-		}
-	}
 </style>
diff --git a/src/views/login/normalLogin.vue b/src/views/login/normalLogin.vue
new file mode 100644
index 000000000..91eb51e5b
--- /dev/null
+++ b/src/views/login/normalLogin.vue
@@ -0,0 +1,440 @@
+<template>
+  <el-form
+    ref="loginForm"
+    v-loading="loading"
+    class="login-form"
+    :model="loginForm"
+    :rules="loginRules"
+    label-position="left"
+  >
+    <el-form-item prop="username" class="item_form_box">
+      <span class="svg-container svg-container_login">
+        <svg-icon icon-class="user" />
+      </span>
+      <el-input
+        v-model="loginForm.username"
+        name="username"
+        type="text"
+        :placeholder="this.$t('login.mobilePhoneNumberOrEmail')"
+        @keyup.enter.native="goToNext"
+      />
+    </el-form-item>
+    <el-form-item prop="password" class="item_form_box item_form_password">
+      <span class="svg-container">
+        <svg-icon icon-class="password" />
+      </span>
+      <el-input
+        ref="password"
+        v-model="loginForm.password"
+        name="password"
+        :type="pwdType"
+        :placeholder="this.$t('login.password')"
+        @keyup.enter.native="handleLogin"
+      />
+      <span class="show-pwd" @click="showPwd">
+        <svg-icon v-if="pwdDisplay" icon-class="eye" />
+        <svg-icon v-else icon-class="eye-open" />
+      </span>
+    </el-form-item>
+    <div class="tip-message">{{ tipsMsg }}</div>
+    <div style="display: inline-block;width: 100%;margin-bottom: 10px;">
+      <div style="display:inline-block">
+        <el-checkbox v-model="isAutoLogin">{{ $t('login.autoLogin') }}</el-checkbox>
+        <!-- <el-checkbox v-if="project === 'cgy'" v-model="teacherLogin">教师登录</el-checkbox> -->
+      </div>
+      <!-- <el-popover
+        v-if="!localProject"
+        placement="right"
+        title=""
+        width="200"
+        trigger="hover"
+        class="popover_box"
+      >
+        <div>
+          <img :src="QCode" alt="" style="width: 100px; height: 100px; display: block; margin:0 auto;">
+          <div style="margin-top: 10px; word-break: break-word;text-align: center;">
+            {{ $t('login.perfectInformation') }}
+          </div>
+        </div>
+        <div slot="reference">
+          {{ $t('login.unableToLogin') }}
+        </div>
+      </el-popover> -->
+      <div class="popover_box active" @click="registerUser">
+        注册账号
+      </div>
+    </div>
+    <el-form-item>
+      <el-button type="primary" style="width:100%;" @click.native.prevent="handleLogin">
+        {{ $t('login.login') }}
+      </el-button>
+    </el-form-item>
+    <div v-if="!localProject" style="display: inline-block;width: 100%;">
+      <div class="popover_box active" style="bottom: 50px;" @click="forgetPassword">
+        忘记密码？
+      </div>
+    </div>
+  </el-form>
+</template>
+<script>
+import QCode from '@/assets/erCode.jpg';
+import md5 from 'js-md5';
+import Cookies from 'js-cookie';
+// getLoginWmurl, checkLoginStatus,
+import { getOrgList, selectOrgnization, getLoginInfo } from '@/api/login';
+import { createSimulation, getSimulationInfoNew, getGroupByMapAndFunction } from '@/api/simulation';
+import { getBackProjectConfigByCode } from '@/api/projectConfig';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
+import { getToken} from '@/utils/auth';
+export default {
+    name:'NormalLogin',
+    props: {
+        project: {
+            type: String,
+            default: () => {
+                return '';
+            }
+        },
+        localProject:{
+            type: Boolean,
+            default: () => {
+                return false;
+            }
+        }
+    },
+    data() {
+        const validateName = (rule, value, callback) => {
+            if (value) {
+                callback();
+            } else {
+                callback(new Error('请输入用户名'));
+            }
+        };
+        const validatePass = (rule, value, callback) => {
+            if (value.length < 5) {
+                callback(new Error(this.$t('login.passwordHint')));
+            } else {
+                callback();
+            }
+        };
+        return {
+            QCode: QCode,
+            loading:false,
+            pwdDisplay: true,
+            pwdType: 'password',
+            cookiesName: 'UserName',
+            cookiesToken: 'UserToken',
+            isAutoLogin: false,
+            tipsMsg: '',
+            // teacherLogin: false,
+            loginForm: {
+                username: '',
+                password: ''
+            },
+            loginRules: {
+                username: [{ required: true, trigger: 'blur', validator: validateName }],
+                password: [{ required: true, trigger: 'blur', validator: validatePass }]
+            }
+        };
+    },
+    computed:{
+        type() {
+            return this.$route.query.type;
+        },
+        projectDevice() {
+            return this.$route.query.projectDevice;
+        }
+    },
+    watch: {
+        'project': function(val) {
+            if (Cookies.get(this.cookiesName) && Cookies.get(this.cookiesToken)) {
+                const model = {
+                    username: Cookies.get(this.cookiesName),
+                    password: Cookies.get(this.cookiesToken),
+                    project:  this.project
+                };
+                model.type = 'class';
+                this.loginAction(model);
+            }
+        }
+    },
+    methods:{
+        // 密码显隐
+        showPwd() {
+            if (this.pwdType === 'password') {
+                this.pwdDisplay = false;
+                this.pwdType = '';
+            } else {
+                this.pwdType = 'password';
+                this.pwdDisplay = true;
+            }
+        },
+        // 登陆接口
+        loginAction(model) {
+            this.$store
+                .dispatch('Login', model)
+                .then(() => {
+                    this.$store.dispatch('SetAccount', model.username);
+                    this.checkOrgnizationInfo();
+                })
+                .catch(error => {
+                    console.log(error);
+                    // if (error.code === '30001') {
+                    //     this.tipsMsg = this.$t('login.accountOrPasswordIsIncorrect');
+                    // } else if (error.code == '10001') {
+                    //     this.tipsMsg = '教员机尚未登录，请稍后重试！';
+                    // } else if (error.code == '10013' || error.code == '10014') {
+                    //     this.tipsMsg = '该账号权限不足！';
+                    // } else {
+                    //     this.tipsMsg = error.message;
+                    // }
+                    this.tipsMsg = error.message;
+                    this.loading = false;
+                    setTimeout(() => {
+                        this.tipsMsg = '';
+                    }, 5000);
+                });
+        },
+        // 获取组织列表
+        checkOrgnizationInfo() {
+            getOrgList().then(resp => {
+                const orgList = resp.data;
+                let orgId = '';
+                if (orgList.length < 2) {
+                    if (orgList.length === 1) {
+                        orgId = orgList[0].orgId;
+                        selectOrgnization(orgId);
+                    }
+                    this.handleLoginSucessRoute();
+                } else {
+                    this.$emit('showOrgList', orgList);
+                }
+            }).catch((error)=>{
+                this.loading = false;
+                this.$message.error(error.message);
+            });
+        },
+        // 选择组织
+        selectOrg(orgId) {
+            this.handleLoginSucessRoute();
+            selectOrgnization(orgId);
+        },
+        // 跳转路由
+        handleLoginSucessRoute() {
+            this.loading = false;
+            this.tipsMsg = '';
+            let path = '';
+            if (this.projectDevice) {
+                const params = {
+                    projectDevice:this.$route.query.projectDevice,
+                    type: this.$route.query.type
+                };
+                this.judgeOtherPage(params);
+            } else {
+                path = '/simulation/simulationIndex';
+                this.$router.push({ path: path });
+            }
+        },
+        judgeOtherPage(params) {
+            // itemMap: {DEFAULT_MEMBER: '1'}type: "METRO"
+            getBackProjectConfigByCode(this.project).then(res=>{
+                if (res.data) {
+                    const {mapId, functionId} = res.data;
+                    if (functionId && mapId) {
+                        if (params.type == 'IM') {
+                            createSimulation(functionId).then(resp => {
+                                const group = resp.data;
+                                this.assignUser(group, mapId);
+                            }).catch(error=>{
+                                if (error.code == 10003) {
+                                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                                    this.$store.dispatch('LogOut').then(() => {
+                                        location.reload(); // 为了重新实例化vue-router对象 避免bug
+                                    });
+                                } else {
+                                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                                    this.$store.dispatch('LogOut').then(() => {
+                                        location.reload(); // 为了重新实例化vue-router对象 避免bug
+                                    });
+                                }
+                            });
+                        } else {
+                            getGroupByMapAndFunction(mapId, functionId).then(resp => {
+                                const group = resp.data;
+                                this.assignUser(group, mapId);
+                            }).catch(res=>{
+                                this.$store.dispatch('LogOut');
+                            });
+                        }
+                    } else {
+                        this.$message.error('请先配置项目信息');
+                        this.$store.dispatch('LogOut');
+                    }
+                }
+            }).catch(res=>{
+                this.$message.error('获取项目信息失败');
+                this.$store.dispatch('LogOut');
+            });
+        },
+        assignUser(group, mapId) {
+            this.$store.dispatch('GetUserInfo', getToken()).then(res => {
+                getLoginInfo(getToken()).then(resp => {
+                    const deviceVO = resp.data.deviceVO;
+                    if (deviceVO) {
+                        const config = JSON.parse(deviceVO.config || '{}');
+                        if (config && config.roleCode) {
+                            const params = [{userId: res.id, memberId:config.roleCode}];
+                            assignUsersPlayRoles(params, group).then(() => {
+                                this.enterSimulation(group, mapId, config);
+                            }).catch(res=>{
+                                this.$message.error('切换角色失败');
+                                this.$store.dispatch('LogOut');
+                            });
+                        } else {
+                            this.$message.error('请先配置设备相关信息');
+                            this.$store.dispatch('LogOut');
+                        }
+                    } else {
+                        this.enterSimulation(group, mapId);
+                    }
+                }).catch(res=>{
+                    this.$message.error('获取用户信息失败');
+                    this.$store.dispatch('LogOut');
+                });
+            });
+        },
+        enterSimulation(group, mapId, config) {
+            getSimulationInfoNew(group).then(response=>{
+                const paramVO = response.data.paramVO;
+                const query = {
+                    lineCode: response.data.map.lineCode,
+                    group: group,
+                    mapId: mapId,
+                    simType:paramVO.type,
+                    project: this.project,
+                    projectDevice:this.$route.query.projectDevice,
+                    singleClient:true
+                };
+                if (config) {
+                    if (config.client) { query.client = config.client; }
+                    // if (config.client) { query.client = config.client; }
+                }
+                this.$router.push({ path: `/display/demon`, query: query });
+            }).catch(res=>{
+                this.$message.error('进入仿真失败');
+                this.$store.dispatch('LogOut');
+            });
+        },
+        // 登陆
+        handleLogin() {
+            this.$refs.loginForm.validate(valid => {
+                if (valid) {
+                    const model = Object.assign({}, this.loginForm);
+                    model.password = md5(model.password);
+                    model.type = 'class';
+                    model.project = this.project;
+                    if (this.$route.query.projectDevice) {
+                        model.deviceCode = this.$route.query.projectDevice;
+                    }
+                    this.loading = true;
+                    if (this.isAutoLogin) {
+                        Cookies.set(this.cookiesName, model.username, { expires: 2 });
+                        Cookies.set(this.cookiesToken, model.password, { expires: 2 });
+                    }
+                    this.loginAction(model);
+                } else {
+                    console.log('error submit!!');
+                    return false;
+                }
+            });
+        },
+        // 忘记密码
+        forgetPassword() {
+            this.$emit('forgetPassword');
+        },
+        // 注册
+        registerUser() {
+            this.$emit('registerUser');
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scope>
+$bg: #fff;
+$dark_gray: #889aa4;
+.login-form .el-form-item {
+    background: #fff !important;
+    border: 1px solid rgba(0, 0, 0, 0.1) !important;
+    .el-input {
+        height: 40px;
+        width: 85%;
+        background: #fff;
+        input {
+            background: #fff !important;
+            border: 0px;
+            -webkit-appearance: none;
+            border-radius: 0px;
+            padding: 8px 9px 7px 5px;
+            color: #000;
+            height: 100%;
+
+            &:-webkit-autofill {
+                box-shadow: 0 0 0px 1000px $bg inset !important;
+                -webkit-text-fill-color: #000 !important;
+            }
+        }
+    }
+}
+.login-form {
+    width: 440px;
+    padding: 0 50px;
+}
+.item_form_box {
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    color: #454545;
+}
+
+.item_form_password {
+    margin-bottom: 10px;
+}
+
+.tip-message {
+    color: #f56c61;
+    padding: 5px;
+    font-size: 12px;
+    height: 23px;
+    margin-bottom: 10px;
+}
+.svg-container {
+    padding-left: 14px;
+    color: $dark_gray;
+    vertical-align: middle;
+    width: 30px;
+    display: inline-block;
+
+    &_login {
+        font-size: 16px;
+    }
+}
+.popover_box {
+    position: absolute;
+    right: 80px;
+    bottom: 124px;
+    cursor: pointer;
+    color: #225592;
+    font-size: 14px;
+}
+.active:hover {
+    color: #409eff;
+}
+.show-pwd {
+    position: absolute;
+    right: 10px;
+    top: 3px;
+    font-size: 16px;
+    color: $dark_gray;
+    cursor: pointer;
+    user-select: none;
+}
+</style>
diff --git a/src/views/login/orgSelect.vue b/src/views/login/orgSelect.vue
index 772df0186..98968fa15 100644
--- a/src/views/login/orgSelect.vue
+++ b/src/views/login/orgSelect.vue
@@ -1,37 +1,37 @@
 <template>
-	<el-dialog center :visible.sync="show" :close-on-click-modal="false" :show-close="false" title="请选择要登录的组织">
-		<div class="formWrapper">
-			<el-select v-model="selected" placeholder="请选择">
-				<el-option v-for="option in orgList" :key="option.orgId" :label="option.name" :value="option.orgId" />
-			</el-select>
-		</div>
-		<el-button slot="footer" primary size="small" @click="confirmSelect">确认</el-button>
-	</el-dialog>
+  <el-dialog center :visible.sync="show" :close-on-click-modal="false" :show-close="false" title="请选择要登录的组织">
+    <div class="formWrapper">
+      <el-select v-model="selected" placeholder="请选择">
+        <el-option v-for="option in orgList" :key="option.orgId" :label="option.name" :value="option.orgId" />
+      </el-select>
+    </div>
+    <el-button slot="footer" primary size="small" @click="confirmSelect">确认</el-button>
+  </el-dialog>
 </template>
 
 <script>
 export default {
-	name: 'OrgSelect',
-	data() {
-		return {
-			show: false,
-			orgList: [],
-			selected: ''
-		}
-	},
-	methods: {
-		confirmSelect() {
-			this.$emit('select', this.selected)
-		},
-		doShow(orgList) {
-			this.orgList = orgList
-			this.show = true
-		},
-		doClose() {
-			this.show = false
-		}
-	}
-}
+    name: 'OrgSelect',
+    data() {
+        return {
+            show: false,
+            orgList: [],
+            selected: ''
+        };
+    },
+    methods: {
+        confirmSelect() {
+            this.$emit('select', this.selected);
+        },
+        doShow(orgList) {
+            this.orgList = orgList;
+            this.show = true;
+        },
+        doClose() {
+            this.show = false;
+        }
+    }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/login/register.vue b/src/views/login/register.vue
deleted file mode 100644
index 11b573ea0..000000000
--- a/src/views/login/register.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="dialogShow"
-    width="500px"
-    :before-close="doClose"
-    :z-index="9000"
-    :show-close="false"
-    :close-on-click-modal="false"
-    top="25vh"
-  >
-    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="110px" class="demo-ruleForm">
-      <el-form-item prop="nickname">
-        <template slot="label">
-          <span>昵&emsp;&emsp;称：</span>
-        </template>
-        <el-input v-model="form.nickname" autocomplete="new-password" />
-      </el-form-item>
-      <el-form-item prop="email">
-        <template slot="label">
-          <span>邮箱(账号)：</span>
-        </template>
-        <el-input v-model="form.email" />
-      </el-form-item>
-      <el-form-item label="密码：" prop="password">
-        <template slot="label">
-          <span>密&emsp;&emsp;码：</span>
-        </template>
-        <el-input v-model="form.password" autocomplete="new-password" show-password />
-      </el-form-item>
-      <el-form-item label="密码确认：" prop="repeatPassword">
-        <el-input v-model="form.repeatPassword" autocomplete="new-password" show-password />
-      </el-form-item>
-      <div style="display: flex;justify-content: space-around;">
-        <el-button type="primary" @click="submitForm()">立即创建</el-button>
-        <el-button @click="doClose()">返回登录</el-button>
-      </div>
-    </el-form>
-  </el-dialog>
-</template>
-
-<script>
-import { registerUser } from '@/api/management/user';
-import { ProjectCode } from '@/scripts/ProjectConfig';
-import { getSessionStorage } from '@/utils/auth';
-import md5 from 'js-md5';
-export default {
-    name: 'Register',
-
-    data() {
-        var validateEmail = (rule, value, callback) => {
-            const regu = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
-            const re = new RegExp(regu);
-            if (!re.test(value) ) {
-                callback(new Error('邮箱格式不正确'));
-            } else {
-                callback();
-            }
-        };
-        var validatePassword = (rule, value, callback) => {
-            if (this.form.repeatPassword) {
-                this.$refs.ruleForm.validateField('repeatPassword');
-            }
-            callback();
-        };
-        var validateRepeatPassword = (rule, value, callback) => {
-            if (value !== this.form.password) {
-                callback(new Error('两次密码不相同，请确认密码'));
-            } else {
-                callback();
-            }
-        };
-        return {
-            dialogShow: false,
-            message: '',
-            operation: '',
-            title: '账号注册',
-            form: {
-                email: '',
-                nickname: '',
-                password: '',
-                repeatPassword: ''
-            },
-            rules: {
-                email: [
-                    { required: true, message: '请输入邮箱', trigger: 'blur' },
-                    { validator: validateEmail, trigger: 'blur' }
-                ],
-                nickname: [
-                    { required: true, message: '请输入昵称', trigger: 'blur' },
-                    { min: 1, max: 32, message: '长度在 1 到 32 个字符', trigger: 'blur' }
-                ],
-                password: [
-                    { required: true, message: '请输入密码', trigger: 'blur' },
-                    { validator: validatePassword, trigger: 'blur' },
-                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
-                ],
-                repeatPassword: [
-                    { required: true, message: '请重复输入密码', trigger: 'blur' },
-                    { validator: validateRepeatPassword, trigger: 'blur' },
-                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
-                ]
-            }
-        };
-    },
-    computed: {
-    },
-    mounted() {
-
-    },
-    methods: {
-        doShow() {
-            this.form = {
-                email: '',
-                nickname: '',
-                password: '',
-                repeatPassword: ''
-            };
-            this.dialogShow = true;
-        },
-        doClose() {
-            this.dialogShow = false;
-            this.form = {
-                email: '',
-                nickname: '',
-                password: '',
-                repeatPassword: ''
-            };
-            this.$refs.ruleForm.clearValidate();
-        },
-        submitForm() {
-            this.$refs.ruleForm.validate((valid) => {
-                if (valid) {
-                    const project = getSessionStorage('project');
-                    const data = { email: this.form.email, nickname: this.form.nickname, password: md5(this.form.password), source: ProjectCode[project] || '' };
-                    registerUser(data).then(resp => {
-                        this.$message.success('账号注册成功！' );
-                        this.doClose();
-                    }).catch(error => {
-                        this.$message.error('账号注册失败：' + error.message);
-                    });
-                }
-            });
-        }
-    }
-};
-
-</script>
-<style scoped>
-	.confirm-control-speed .context {
-		padding-bottom: 40px !important;
-		border: 1px solid lightgray;
-	}
-	.ningbo-01__systerm .el-dialog .el-button{
-		display: block;
-		margin: 0 auto;
-	}
-</style>
diff --git a/src/views/login/registerUser.vue b/src/views/login/registerUser.vue
new file mode 100644
index 000000000..cd7a71879
--- /dev/null
+++ b/src/views/login/registerUser.vue
@@ -0,0 +1,350 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="dialogShow"
+    class="rigisterDialog"
+    width="500px"
+    :before-close="doClose"
+    :z-index="9000"
+    :show-close="false"
+    :close-on-click-modal="false"
+    top="18vh"
+  >
+    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="110px" class="rigister-ruleForm" style="margin-left:30px;width:380px">
+      <el-form-item prop="type">
+        <template slot="label">
+          <span>注册途径：</span>
+        </template>
+        <el-radio-group v-model="form.type" size="small" @change="changeType">
+          <el-radio label="mobile" border>手机号注册</el-radio>
+          <el-radio label="email" border>邮箱注册</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="form.type === 'email'" prop="email">
+        <template slot="label">
+          <span>邮箱(账号)：</span>
+        </template>
+        <el-input v-model="form.email" size="small" style="width:260px" />
+      </el-form-item>
+      <el-form-item v-if="form.type === 'mobile'" prop="mobile">
+        <template slot="label">
+          <span>手机号：</span>
+        </template>
+        <el-input v-model="form.mobile" size="small" style="width: 260px;" />
+      </el-form-item>
+      <el-form-item prop="nickname">
+        <template slot="label">
+          <span>昵&emsp;&emsp;称：</span>
+        </template>
+        <el-input v-model="form.nickname" autocomplete="new-password" size="small" style="width:260px" />
+      </el-form-item>
+      <el-form-item label="密码：" prop="password">
+        <template slot="label">
+          <span>密&emsp;&emsp;码：</span>
+        </template>
+        <el-input v-model="form.password" autocomplete="new-password" show-password size="small" style="width:260px" />
+      </el-form-item>
+      <el-form-item label="密码确认：" prop="repeatPassword">
+        <el-input v-model="form.repeatPassword" autocomplete="new-password" show-password size="small" style="width:260px" />
+      </el-form-item>
+      <el-form-item prop="verificationCode">
+        <template slot="label">
+          <span>验证码：</span>
+        </template>
+        <el-input v-model="form.verificationCode" size="small" style="display: inline-block;width:140px" />
+        <el-button
+          size="small"
+          type="primary"
+          style="margin-top: 10px; margin-right: 10px;"
+          :loading="sendVfcodeLoading"
+          :disabled="passWordCodeTime != 0"
+          @click="sendVfcodeFunc"
+        >
+          {{ $t('global.sendCode') }}
+          <span
+            v-if="passWordCodeTime"
+          >{{ passWordCodeTime }}</span>
+        </el-button>
+      </el-form-item>
+      <div style="display: flex;justify-content: space-around;margin-top:40px;">
+        <el-button type="primary" size="small" :loading="loading" @click="submitForm()">立即创建</el-button>
+        <el-button size="small" @click="doClose()">返回登录</el-button>
+      </div>
+    </el-form>
+    <Vcode
+      :show="isShow"
+      @success="success"
+      @close="close"
+    />
+  </el-dialog>
+</template>
+<script>
+import md5 from 'js-md5';
+import Vcode from '@/components/VCode/index';
+import { registerUserNew, sendPhoneVfcode, sendEmailVfcode, isExistMobile, isExistEmail } from '@/api/management/user';
+export default {
+    name: 'RegisterUser',
+    components:{
+        Vcode
+    },
+    props: {
+        project: {
+            type: String,
+            default: () => {
+                return '';
+            }
+        }
+    },
+    data() {
+        var validateEmail = (rule, value, callback) => {
+            const regu = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+            const re = new RegExp(regu);
+            if (!re.test(value) ) {
+                callback(new Error('邮箱格式不正确'));
+            } else {
+                callback();
+            }
+        };
+        var validateMobile = (rule, value, callback) => {
+            const regu = /^1(3[0-9]|4[5,7]|5[0,1,2,3,5,6,7,8,9]|6[2,5,6,7]|7[0,1,7,8]|8[0-9]|9[1,8,9])\d{8}$/;
+            const re = new RegExp(regu);
+            if (!re.test(value)) {
+                callback(new Error('手机号格式不正确'));
+            } else {
+                callback();
+            }
+        };
+        var validatePassword = (rule, value, callback) => {
+            if (this.form.repeatPassword) {
+                this.$refs.ruleForm.validateField('repeatPassword');
+            }
+            callback();
+        };
+        var validateRepeatPassword = (rule, value, callback) => {
+            if (value !== this.form.password) {
+                callback(new Error('两次密码不相同，请确认密码'));
+            } else {
+                callback();
+            }
+        };
+        var validateVfCode = (rule, value, callback) => {
+            if (this.form.verificationCode.length !== 4) {
+                callback(new Error('验证码长度错误'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            dialogShow: false,
+            passWordCodeTime: 0,
+            passWordTime: null,
+            message: '',
+            loading:false,
+            sendVfcodeLoading:false,
+            isShow: false, // 验证码模态框是否出现
+            operation: '',
+            title: '账号注册',
+            form: {
+                type: 'mobile',
+                mobile: '',
+                email: '',
+                nickname: '',
+                password: '',
+                repeatPassword: '',
+                verificationCode:''
+            },
+            rules: {
+                mobile: [
+                    { required: true, message: '请输入手机号', trigger: 'blur' },
+                    { validator: validateMobile, trigger: 'blur' }
+                ],
+                email: [
+                    { required: true, message: '请输入邮箱', trigger: 'blur' },
+                    { validator: validateEmail, trigger: 'blur' }
+                ],
+                nickname: [
+                    { required: true, message: '请输入昵称', trigger: 'blur' },
+                    { min: 1, max: 32, message: '长度在 1 到 32 个字符', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'blur' },
+                    { validator: validatePassword, trigger: 'blur' },
+                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
+                ],
+                repeatPassword: [
+                    { required: true, message: '请重复输入密码', trigger: 'blur' },
+                    { validator: validateRepeatPassword, trigger: 'blur' },
+                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
+                ],
+                verificationCode: [
+                    { required: true, message: '请输入验证码', trigger: 'blur' },
+                    { validator: validateVfCode, trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+    },
+    mounted() {
+
+    },
+    methods: {
+        doShow() {
+            this.form = {
+                type: 'mobile',
+                mobile: '',
+                email: '',
+                nickname: '',
+                password: '',
+                repeatPassword: '',
+                verificationCode: ''
+            };
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.form = {
+                type: 'mobile',
+                mobile: '',
+                email: '',
+                nickname: '',
+                password: '',
+                repeatPassword: '',
+                verificationCode: ''
+            };
+            clearInterval(this.passWordTime);
+            this.passWordCodeTime = 0;
+            this.$refs.ruleForm.clearValidate();
+        },
+        changeType() {
+            this.$refs.ruleForm.clearValidate();
+        },
+        sendVfcodeFunc() {
+            const reguEmail = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+            const reguMobile = /^1(3[0-9]|4[5,7]|5[0,1,2,3,5,6,7,8,9]|6[2,5,6,7]|7[0,1,7,8]|8[0-9]|9[1,8,9])\d{8}$/;
+            const reMobile = new RegExp(reguMobile);
+            const reEmail = new RegExp(reguEmail);
+            if (this.form.type === 'mobile' && this.form.mobile && reMobile.test(this.form.mobile)) {
+                this.sendVfcodeLoading = true;
+                isExistMobile({mobile:this.form.mobile}).then(response=>{
+                    this.sendVfcodeLoading = false;
+                    if (response.data) {
+                        this.$message.error('该账号已存在');
+                    } else {
+                        this.isShow = true;
+                    }
+                }).catch(()=>{
+                    this.sendVfcodeLoading = false;
+                });
+            } else if (this.form.type === 'email' && this.form.email && reEmail.test(this.form.email)) {
+                this.sendVfcodeLoading = true;
+                isExistEmail({email:this.form.email}).then(response=>{
+                    this.sendVfcodeLoading = false;
+                    if (response.data) {
+                        this.$message.error('该账号已存在');
+                    } else {
+                        this.isShow = true;
+                    }
+                }).catch(()=>{
+                    this.sendVfcodeLoading = false;
+                });
+            } else {
+                this.$refs.ruleForm.validateField('email');
+                this.$refs.ruleForm.validateField('mobile');
+            }
+        },
+        success() {
+            this.isShow = false; // 通过验证后，需要手动隐藏模态框
+            if (this.form.type === 'mobile') {
+                this.sendVfcode('mobile');
+            } else if (this.form.type === 'email') {
+                this.sendVfcode('email');
+            }
+        },
+        close() {
+            this.isShow = false;
+        },
+        async sendVfcode(type) {
+            if (type === 'mobile') {
+                const random = Math.floor(Math.random() * 10000 + 1);
+                const timeCount = Date.parse(new Date()) / 1000;
+                const pass = `${timeCount}86${this.form.mobile}${random}`;
+                const param = {
+                    mobile: this.form.mobile,
+                    nationCode: '86',
+                    rd: random + '',
+                    time: timeCount + '',
+                    token: md5(pass)
+                };
+                try {
+                    this.passWordCodeTime = 60;
+                    this.passWordTime = setInterval(() => {
+                        this.passWordCodeTime--;
+                        if (this.passWordCodeTime <= 0) {
+                            this.passWordCodeTime = 0;
+                            clearInterval(this.passWordTime);
+                            this.passWordTime = null;
+                        }
+                    }, 1000);
+                    await sendPhoneVfcode(param);
+                } catch (error) {
+                    this.$message.info(this.$t('global.codeFaile'));
+                }
+            } else if (type === 'email') {
+                const param = { email: this.form.email };
+                try {
+                    this.passWordCodeTime = 60;
+                    this.passWordTime = setInterval(() => {
+                        this.passWordCodeTime--;
+                        if (this.passWordCodeTime <= 0) {
+                            this.passWordCodeTime = 0;
+                            clearInterval(this.passWordTime);
+                            this.passWordTime = null;
+                        }
+                    }, 1000);
+                    await sendEmailVfcode(param);
+                } catch (error) {
+                    this.$message.info(this.$t('global.codeFaile'));
+                }
+            }
+        },
+        submitForm() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    const data = {
+                        nickname: this.form.nickname,
+                        verificationCode:this.form.verificationCode,
+                        password: md5(this.form.password),
+                        source:this.project
+                    };
+                    if (this.form.type == 'mobile') {
+                        data.mobile = this.form.mobile;
+                        data.nationCode = '86';
+                    } else {
+                        data.email = this.form.email;
+                    }
+                    this.loading = true;
+                    registerUserNew(data).then(resp => {
+                        this.loading = false;
+                        this.$message.success('账号注册成功！' );
+                        this.doClose();
+                    }).catch(error => {
+                        this.loading = false;
+                        if (error.code == '10012') {
+                            this.$message.error('账号注册失败：账号已存在');
+                        } else {
+                            this.$message.error('账号注册失败：' + error.message);
+                        }
+
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss">
+.rigisterDialog .el-dialog__body{
+    padding-top:15px;
+}
+</style>
diff --git a/src/views/login/wechatLogin.vue b/src/views/login/wechatLogin.vue
new file mode 100644
index 000000000..b8b2c95c0
--- /dev/null
+++ b/src/views/login/wechatLogin.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="qrcode-main">
+    <div class="login-code-box" @click="loginRefresh">
+      <qrcode-vue
+        v-loading="loadingCode"
+        :value="loginUrl"
+        :class-name="qrcodeClassName"
+        :size="150"
+        :element-loading-text="this.$t('login.clickRefresh')"
+        element-loading-spinner="el-icon-refresh"
+        element-loading-background="rgba(255, 255, 255, 0.9)"
+      />
+    </div>
+    <div class="login-tip">
+      <span class="sub-title">{{ $t('login.scanCodeLogin') }}</span>
+    </div>
+    <div class="tip-info">
+      <fieldset>
+        <legend>
+          {{ $t('login.recommendedConfiguration') }}
+        </legend>
+        <span>{{ $t('login.browser') }}
+          <a href="https://www.google.cn/chrome/" target="_blank" style="text-decoration: underline;">{{
+            $t('login.googleChrome')
+          }}</a>
+        </span>
+        <br>
+        <span>{{ $t('login.screenResolution') + '1920*1080' }}</span>
+      </fieldset>
+    </div>
+  </div>
+</template>
+<script>
+// , gtLoginInfo, getOrgList, selectOrgnization
+import QrcodeVue from 'qrcode.vue';
+import { getLoginWmurl, checkLoginStatus} from '@/api/login';
+import { LoginParams } from '@/utils/login';
+export default {
+    name:'WeChatLogin',
+    components: { QrcodeVue },
+    props: {
+        project: {
+            type: String,
+            default: () => {
+                return '';
+            }
+        },
+        syncLogin:{
+            type: Boolean,
+            default: () => {
+                return false;
+            }
+        }
+    },
+    data() {
+        return {
+            loadingCode: false,
+            loginUrl: '',
+            sessionId: '',
+            checkLogin: null,
+            qrcodeClassName: 'login-qrcode',
+            loginClient:'LianKeTang'
+        };
+    },
+    watch: {
+        'project': function(val) {
+            this.loginRefresh();
+        }
+    },
+    methods:{
+        loginRefresh() {
+            // this.loadingCode = true;
+            const params = LoginParams[this.loginClient];
+            params.project = this.project;
+            if (this.$route.query.projectDevice) {
+                params.deviceCode = this.$route.query.projectDevice;
+            }
+            const self = this;
+            getLoginWmurl(params)
+                .then(response => {
+                    self.sessionId = response.data.sessionId;
+                    self.loginUrl = response.data.url;
+                    self.loadingCode = false;
+                    self.checkLoginStatus();
+                })
+                .catch(() => {
+                    if (self.syncLogin) {
+                        setTimeout(() => {
+                            self.loginRefresh();
+                        }, 3000);
+                    } else {
+                        self.loadingCode = false;
+                        self.$messageBox(this.$t('login.getLoginQrCode'));
+                    }
+                });
+        },
+        checkLoginStatus() {
+        // 销毁则不再定时
+            if (this && this._isDestroyed) {
+                return;
+            }
+            // 清空已存在的定时器
+            this.clearTimer(this.checkLogin);
+            // 设置定时器检测
+            const self = this;
+            self.checkLogin = setTimeout(() => {
+                checkLoginStatus(self.sessionId)
+                    .then(response => {
+                    // 设置扫码登录
+                        debugger;
+                        self.$store
+                            .dispatch('QrLoginSetting', { key: 'SET_TOKEN', value: response.data.token, type: 'class' })
+                            .then(() => {
+                            // 清除定时器，设置路由
+                                self.clearTimer(self.checkLogin);
+                                // this.handleLoginSucessRoute();
+                                self.checkOrgnizationInfo();
+                            });
+                    })
+                    .catch(error => {
+                        if ((error.data && error.data.status === 'EXPIRE') || error.code != 200) {
+                            if (self.syncLogin) {
+                                self.loginRefresh();
+                            } else {
+                                self.loadingCode = true;
+                                self.loginUrl = '';
+                            }
+                        } else {
+                            self.checkLoginStatus();
+                        }
+                    });
+            }, 3000);
+        },
+        clearTimer(timer) {
+            if (timer) {
+                clearTimeout(timer);
+                timer = null;
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+$qrbg: #fff;
+.qrcode-main {
+	width:300px;
+	background-color: $qrbg;
+	text-align: center;
+	border-right: 1px solid #ececec;
+	.tip-info {
+		text-align: left;
+		display: inline-block;
+		color: green;
+		margin: 0 auto;
+	}
+
+	.login-code-box {
+		width: 150px;
+		margin: 0 auto;
+		cursor: pointer;
+	}
+
+	.system-type {
+		margin: 5px 0;
+		display: block;
+	}
+	.sub-title {
+		font-size: 16px;
+		text-align: center;
+		color: #353535;
+		line-height: 30px;
+	}
+}
+.el-loading-spinner i {
+    font-size: 100px;
+}
+.el-loading-spinner .el-loading-text {
+    font-size: 24px;
+}
+.login-code-box {
+    .el-loading-spinner i {
+        font-size: 14px;
+    }
+    .el-loading-spinner .el-loading-text {
+        font-size: 14px;
+    }
+}
+</style>
diff --git a/src/views/messageBoard/index.vue b/src/views/messageBoard/index.vue
index 7ecb4af34..6efe76a17 100644
--- a/src/views/messageBoard/index.vue
+++ b/src/views/messageBoard/index.vue
@@ -204,7 +204,7 @@ export default {
         },
         avatarUrl(val) {
             if (val && val.creatorAvatarPath) {
-                return this.$store.state.user.resourcesUrl + val.creatorAvatarPath;
+                return this.$store.state.user.ossUrl + val.creatorAvatarPath;
             } else {
                 return 'https://joylink.club/oss/wxmicro_assistant/userhead/defaultuser.png';
             }
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index 2a4756ab5..bdad46f2a 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -298,14 +298,14 @@ export default {
                 }
             });
         },
-        '$store.state.socket.createConversition':function(val) {
+        '$store.state.socket.createConversation':function(val) {
             val.memberList.forEach(member => {
                 // if (val.creatorId == member.memberId) {
                 this.$set(this.conversitionStateMap, member.memberId, {conversitionId: val.id, privateMemberList: val.memberList, privateMessageList: [], connect:member.connect});
                 // }
             });
         },
-        '$store.state.socket.inviteSimulationConversition':function(val) {
+        '$store.state.socket.inviteSimulationConversation':function(val) {
             this.treeData.forEach(item => {
                 if (item.children) {
                     const memberList = Object.values(item.children);
@@ -350,7 +350,7 @@ export default {
             },
             deep: true
         },
-        '$store.state.socket.exitConversition': function (val) {
+        '$store.state.socket.exitConversation': function (val) {
             for (const memberId in this.conversitionStateMap) {
                 if (memberId == val.memberId) {
                     this.conversitionStateMap[memberId].connect = false;
@@ -414,8 +414,8 @@ export default {
                         electricDispatcherList[item.id] = this.memberData[item.id];
                         break;
                     case 'DEPOT_DISPATCHER':
-                        this.memberData[item.id].label = '车辆段信号楼';
-                        this.memberData[item.id].labelName = '车辆段信号楼' + (item.name || '');
+                        this.memberData[item.id].label = '车辆段/停车场调度';
+                        this.memberData[item.id].labelName = item.name ? item.name : '调度-' + device.name;
                         depotDispatcherList[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_SUPERVISOR':
@@ -440,9 +440,9 @@ export default {
                         this.memberData[item.id].labelName = '上级部门' + (item.name || '');
                         parentDepartmentList[item.id] = this.memberData[item.id];
                         break;
-                    case 'PARKING_LOT_SIGNAL_BUILDING':
-                        this.memberData[item.id].label = '停车场信号楼' + (item.name || '');
-                        this.memberData[item.id].labelName = '停车场信号楼' + (item.name || '');
+                    case 'SIGNAL_BUILDING':
+                        this.memberData[item.id].label = '车辆段/停车场信号楼';
+                        this.memberData[item.id].labelName = item.name ? item.name : '信号楼-' + device.name;
                         parkingLotSignalBuilding[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_ASSISTANT':
@@ -520,7 +520,7 @@ export default {
                     type: 'role',
                     children: maintainerList
                 }, {
-                    label: '车辆段信号楼',
+                    label: '车辆段/停车场调度',
                     id: 'depotDispatcher',
                     type: 'role',
                     children: depotDispatcherList
@@ -536,7 +536,7 @@ export default {
                     type: 'role',
                     children: electricDispatcherList
                 }, {
-                    label: '停车场信号楼',
+                    label: '车辆段/停车场信号楼',
                     id: 'parkingLotSignalBuilding',
                     type: 'role',
                     children: parkingLotSignalBuilding
diff --git a/src/views/newMap/chatView/chatContent.vue b/src/views/newMap/chatView/chatContent.vue
index 4364ec822..f560461c2 100644
--- a/src/views/newMap/chatView/chatContent.vue
+++ b/src/views/newMap/chatView/chatContent.vue
@@ -87,7 +87,7 @@ export default {
             // yuyin:yuyin,
             currentAudioIndex:0,
             isPlay:false,
-            baseUrl: this.$store.state.user.resourcesUrl
+            baseUrl: this.$store.state.user.ossUrl
         };
     },
     watch:{
diff --git a/src/views/newMap/chatView/voiceChatBox.vue b/src/views/newMap/chatView/voiceChatBox.vue
index ccc23c38f..36f0cecaa 100644
--- a/src/views/newMap/chatView/voiceChatBox.vue
+++ b/src/views/newMap/chatView/voiceChatBox.vue
@@ -54,6 +54,7 @@ import { getSimulationMemberList} from '@/api/simulation';
 import { getUserListCommon } from '@/api/rtSimulation';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {UserOperationType} from "../../../scripts/ConstDic";
 export default {
     name: 'NewChatBox',
     components:{
@@ -201,14 +202,14 @@ export default {
                 }
             });
         },
-        '$store.state.socket.createConversition':function(val) {
+        '$store.state.socket.createConversation':function(val) {
             val.memberList.forEach(member => {
                 // if (val.creatorId == member.memberId) {
                 this.$set(this.conversitionStateMap, member.memberId, {conversitionId: val.id, privateMemberList: val.memberList, privateMessageList: [], connect:member.connect});
                 // }
             });
         },
-        '$store.state.socket.inviteSimulationConversition':function(val) {
+        '$store.state.socket.inviteSimulationConversation':function(val) {
             this.treeData.forEach(item => {
                 if (item.children) {
                     const memberList = Object.values(item.children);
@@ -259,7 +260,7 @@ export default {
             },
             deep: true
         },
-        '$store.state.socket.exitConversition': function (val) {
+        '$store.state.socket.exitConversation': function (val) {
             for (const memberId in this.conversitionStateMap) {
                 if (memberId == val.memberId) {
                     this.conversitionStateMap[memberId].connect = false;
@@ -323,8 +324,8 @@ export default {
                         electricDispatcherList[item.id] = this.memberData[item.id];
                         break;
                     case 'DEPOT_DISPATCHER':
-                        this.memberData[item.id].label = '车辆段信号楼';
-                        this.memberData[item.id].labelName = '车辆段信号楼' + (item.name || '');
+                        this.memberData[item.id].label = '车辆段/停车场调度';
+                        this.memberData[item.id].labelName = item.name ? item.name : '调度-' + device.name;
                         depotDispatcherList[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_SUPERVISOR':
@@ -349,9 +350,9 @@ export default {
                         this.memberData[item.id].labelName = '上级部门' + (item.name || '');
                         parentDepartmentList[item.id] = this.memberData[item.id];
                         break;
-                    case 'PARKING_LOT_SIGNAL_BUILDING':
-                        this.memberData[item.id].label = '停车场信号楼' + (item.name || '');
-                        this.memberData[item.id].labelName = '停车场信号楼' + (item.name || '');
+                    case 'SIGNAL_BUILDING':
+                        this.memberData[item.id].label = '车辆段/停车场信号楼';
+                        this.memberData[item.id].labelName = item.name ? item.name : '信号楼-' + device.name;
                         parkingLotSignalBuilding[item.id] = this.memberData[item.id];
                         break;
                     case 'STATION_ASSISTANT':
@@ -429,7 +430,7 @@ export default {
                     type: 'role',
                     children: maintainerList
                 }, {
-                    label: '车辆段信号楼',
+                    label: '车辆段/停车场调度',
                     id: 'depotDispatcher',
                     type: 'role',
                     children: depotDispatcherList
@@ -445,7 +446,7 @@ export default {
                     type: 'role',
                     children: electricDispatcherList
                 }, {
-                    label: '停车场信号楼',
+                    label: '车辆段/停车场信号楼',
                     id: 'parkingLotSignalBuilding',
                     type: 'role',
                     children: parkingLotSignalBuilding
@@ -631,9 +632,9 @@ export default {
             const operate = {
                 operation: this.sideButtonDom.operation,
                 param: { drawer: this.drawer },
-                userOperationType: 'leftClick'
+                userOperationType: UserOperationType.LEFTCLICK
             };
-            this.$store.dispatch('training/nextNew', operate);
+            this.$store.dispatch('trainingNew/next', operate);
         },
         acceptUser() {
             acceptConversitionInvite(this.group, this.conversitionId).then(res=>{
diff --git a/src/views/newMap/display/chatBox.vue b/src/views/newMap/display/chatBox.vue
new file mode 100644
index 000000000..62fe02706
--- /dev/null
+++ b/src/views/newMap/display/chatBox.vue
@@ -0,0 +1,550 @@
+<template>
+  <div v-quickMenuDrag class="voice-chat-box">
+    <div v-if="chatBoxMin" :id="sideButtonDom.domId" @click="clickBtn">
+      <el-button circle style="color: #0C161A;" icon="el-icon-mic" />
+    </div>
+    <div v-show="!chatBoxMin" class="chat-box-main">
+      <div class="chat-box-header">
+        <div style="margin-right: 10px;cursor: pointer;">
+          <i class="el-icon-minus" style="color: #000;" @click="minimize" />
+        </div>
+      </div>
+      <div class="chat-box-content">
+        <div v-for="(content,index) in messageList" :key="index" style="width: 100%;height: 65px;">
+          <div :class="content.memberId == myMemberId?'rightUser':'leftUser'">
+            <div class="userHeader">
+              <div class="userName">{{ covertName(content.memberId) }}</div>
+              <div :class="content.memberId == myMemberId?'userChatTime textRight':'userChatTime'">{{ content.time }}</div>
+            </div>
+            <div v-if="content.type === 'Text'" class="userBubble">
+              <div class="userMessage">
+                <span class="messageText">{{ content.content }}</span>
+              </div>
+            </div>
+            <div v-else class="userBubble" style="height: 30px;width: 140px;" @click="playAudio(content.audioPath, content)">
+              <div class="userMessage">
+                <div class="wifi-symbol">
+                  <div class="wifi-circle first" />
+                  <div class="wifi-circle second" :class="{'second-amit': content.activeAuto}" />
+                  <div class="wifi-circle third" :class="{'third-amit': content.activeAuto}" />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="chat-box-footer">
+        <el-input v-model="textContent" size="small" placeholder="请输入会话文字，点击T发送" style="flex: 1; margin-left: 5px;" :rows="1" />
+        <el-button :id="sendTextId" size="mini" class="chat-box-footer-create" :disabled="contentSend" @click="sendText">T</el-button>
+        <el-button :id="recordVoice" class="chat-box-footer-create chat-box-footer-send" :class="{'active': recordSending}" :disabled="audioPlay || (trainingDesign && !trainingSwitch)" size="mini" type="primary" @click="startRecording()">
+          <el-progress id="voice_progress_bar" type="circle" :show-text="false" :percentage="100/60*seconds" :width="40" :stroke-width="2" status="success" />
+          <i v-if="recordSending" class="el-icon-close close_icon" @click.stop="cancelRecording()" />
+          <span class="iconfont icon-yuyin">&#xe62b;</span>
+        </el-button>
+      </div>
+    </div>
+    <audio id="audioPlay" style="display:none" />
+  </div>
+</template>
+
+<script>
+import RecordRTC from 'recordrtc';
+import {getAllConversition} from '@/api/chat';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import {UserOperationType} from '@/scripts/ConstDic';
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+export default {
+    name: 'ChatBox',
+    data() {
+        return {
+            recordSending:false,
+            seconds:0,
+            inter:null,
+            recorders: null,
+            microphone:null,
+            audioPlay:false,
+            textContent: '',
+            messageList: [], // 消息列表
+            currentAudioList:[],
+            currentMessage: {},
+            trainingDesign: false
+        };
+    },
+    computed:{
+        group() {
+            return this.$route.query.group;
+        },
+        chatBoxMin() {
+            return this.$store.state.training.chatBoxMin;
+        },
+        contentSend() {
+            return !this.textContent;
+        },
+        myMemberId() {
+            return this.$store.state.training.myMemberId;
+        },
+        userId() {
+            return this.$store.state.user.id;
+        },
+        sendTextId() {
+            return OperationEvent.Conversation.Chat.menu.domId;
+        },
+        recordVoice() {
+            return OperationEvent.Conversation.Chat.record.domId;
+        },
+        sideButtonDom() {
+            return OperationEvent.Conversation.Chat.sideButton;
+        },
+        trainingSwitch() {
+            return this.$store.state.trainingNew.trainingSwitch;
+        }
+    },
+    watch: {
+        '$store.state.socket.simulationReset': function () { // 仿真重置
+            this.messageList = [];
+        },
+        '$store.state.training.domConfig': function(val) {
+            this.trainingDesign = val.trainingDesign;
+        },
+        '$store.state.socket.conversationMessage':function (val) { //  仿真聊天
+            const message = {...val};
+            this.messageList.push(message);
+            if (val.memberId != this.myMemberId) {
+                this.currentAudioList.push(message);
+                if (!this.isPlay) {
+                    this.playAllAudio();
+                }
+            }
+            this.scrollTop();
+        }
+    },
+    mounted() {
+        this.trainingDesign = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.trainingDesign : false;
+        this.initConversationData();
+    },
+    methods: {
+        scrollTop() {
+            this.$nextTick(() => {
+                const scrollTop = this.messageList.length * 65 - 250;
+                document.querySelector('.chat-box-content').scrollTop = scrollTop;
+            });
+        },
+        initConversationData() {
+            getAllConversition(this.group).then(resp => {
+                if (resp.data && resp.data.length) {
+                    const conversation = resp.data.find(con => con.id === 'chat_room_key');
+                    this.messageList = conversation ? conversation.messageList : [];
+                    this.scrollTop();
+                } else {
+                    this.messageList = [];
+                }
+            });
+        },
+        playAllAudio() {
+            this.$nextTick(function() {
+                this.currentMessage = this.currentAudioList.shift();
+                document.querySelector('#audioPlay').src = this.currentMessage.audioPath;
+                document.querySelector('#audioPlay').play();
+                this.$set(this.currentMessage, 'activeAuto', true);
+                this.play = true;
+                document.querySelector('#audioPlay').onended = () => {
+                    this.$set(this.currentMessage, 'activeAuto', false);
+                    if (!this.currentAudioList || !this.currentAudioList.length) {
+                        this.play = false;
+                    } else {
+                        this.playAllAudio();
+                    }
+                };
+            });
+        },
+        playAudio(audioPath, data) {
+            this.$set(this.currentMessage, 'activeAuto', false);
+            this.currentAudioList = [];
+            this.currentMessage = data;
+            this.play = true;
+            document.querySelector('#audioPlay').src = audioPath;
+            document.querySelector('#audioPlay').play();
+            this.$set(this.currentMessage, 'activeAuto', true);
+            document.querySelector('#audioPlay').onended = () => { this.play = false; this.$set(this.currentMessage, 'activeAuto', false); };
+        },
+        covertName(memberId) {
+            let name = '';
+            const member = this.$store.state.training.memberData[memberId];
+            if (member && member.userId) {
+                const user = this.$store.state.training.simulationUserList.find(user => user.userId == member.userId);
+                name = member.labelName + '(' + user.nickName + ')';
+            } else if (member) {
+                name = member.labelName;
+            }
+            return name;
+        },
+        clickBtn() {
+            const operate = {
+                operation: this.sideButtonDom.operation,
+                param: { chatBoxMin: this.chatBoxMin },
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            this.$store.dispatch('training/setChatBoxMin', false);
+            if (this.$store.state.trainingNew.trainingSwitch) {
+                this.$nextTick(() => {
+                    this.$store.dispatch('trainingNew/next', operate);
+                });
+            }
+        },
+        minimize() {
+            this.$store.dispatch('training/setChatBoxMin', true);
+        },
+        sendText() {
+            commitOperate(menuOperate.Conversation.Chat, {content: this.textContent}, 3).then(({valid})=>{
+                if (valid) {
+                    this.textContent = '';
+                }
+            }).catch((error) => {
+                this.$message.error('发送会话文字失败：' + error.message);
+            });
+        },
+        cancelRecording() {
+            if (this.microphone) {
+                clearInterval(this.inter);
+                this.seconds = 0;
+                this.microphone.stop();
+                this.microphone = null;
+                this.recordSending = false;
+                this.recorders = null;
+            }
+        },
+        // 停止录制 发送语音
+        stopRecording() {
+            this.audioPlay = true;
+            clearInterval(this.inter);
+            this.seconds = 0;
+            const that = this;
+            this.recorders.stopRecording(function(blobURL) {
+                that.recorders.getDataURL(function(BaseURL) {
+                    const operate = {
+                        over: true,
+                        cmdType: CMD.Conversation.CMD_Conversation_Chat_Audio_Base64,
+                        operation: OperationEvent.Conversation.Chat.record.operation,
+                        userOperationType: UserOperationType.LEFTCLICK,
+                        param: {
+                            fileBase64Str: BaseURL
+                        }
+                    };
+                    that.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                        if (valid) {
+                            that.textContent = '';
+                            that.audioPlay = false;
+                        }
+                    }).catch(error => {
+                        that.$message.error('发送会话语音失败：' + error.message);
+                        that.audioPlay = false;
+                    });
+                    if (that.microphone) {
+                        that.microphone.stop();
+                        that.microphone = null;
+                        that.recordSending = false;
+                        that.recorders = null;
+                    }
+                });
+            });
+        },
+        tipErrorMessage(error) {
+            switch (error.code || error.name) {
+            case 'PERMISSION_DENIED':
+            case 'PermissionDeniedError':
+                this.$message({
+                    showClose: true,
+                    message: '用户拒绝提供信息',
+                    type: 'error'
+                });
+                break;
+            case 'NOT_SUPPORTED_ERROR':
+            case 'NotSupportedError':
+                this.$message({
+                    showClose: true,
+                    message: '浏览器不支持硬件设备',
+                    type: 'error'
+                });
+                break;
+            case 'MANDATORY_UNSATISFIED_ERROR':
+            case 'MandatoryUnsatisfiedError':
+                this.$message({
+                    showClose: true,
+                    message: '无法发现指定的硬件设备',
+                    type: 'error'
+                });
+                break;
+            default:
+                this.$message({
+                    showClose: true,
+                    message: '无法打开麦克风',
+                    type: 'error'
+                });
+                break;
+            }
+        },
+        mediaSuccessCallback(stream) {
+            const StereoAudioRecorder = RecordRTC.StereoAudioRecorder;
+            this.microphone = stream;
+            this.recorders = new RecordRTC(this.microphone, {
+                type: 'audio',
+                recorderType: StereoAudioRecorder,
+                numberOfAudioChannels: 1,
+                bitsPerSecond:256000,
+                desiredSampRate: 16000
+            });
+            this.recorders.startRecording();
+            this.recordSending = true;
+            this.audioPlay = false;
+            this.inter = setInterval(() => {
+                if (this.seconds < 60) {
+                    this.seconds++;
+                } else {
+                    clearInterval(this.inter);
+                    this.stopRecording();
+                }
+            }, 1000);
+        },
+        // 语音录制开始
+        startRecording() {
+            if (!this.recordSending) {
+                const operate = {
+                    operation: OperationEvent.Conversation.Chat.record.operation,
+                    userOperationType: UserOperationType.LEFTCLICK
+                };
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        this.audioPlay = true;
+                        const that = this;
+                        if (!this.recordSending && !this.recorders && !this.microphone) {
+                            navigator.getUserMedia(
+                                { audio: true } // 只启用音频
+                                , function (stream) {
+                                    that.mediaSuccessCallback(stream);
+                                }, function (error) {
+                                    that.audioPlay = false;
+                                    that.tipErrorMessage(error);
+                                }
+                            );
+                        }
+                    }
+                }).catch(() => { console.error('操作失败！'); });
+            } else {
+                this.stopRecording(); // 发送语音
+            }
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.voice-chat-box {
+	position: absolute;
+	left: 20px;
+	bottom: 50%;
+	height: 1px;
+	width: 1px;
+	z-index: 2000;
+}
+.chat-box-header{
+	width: 100%;
+	height: 40px;
+	border-bottom: 1px #dedede solid;
+	display: flex;
+	align-items: center;
+	justify-content: right;
+	padding: 0 10px;
+}
+.chat-box-content{
+	height: 250px;
+	position: relative;
+	border-top: 1px #9a9a9a solid;
+	margin-top: 8px;
+	display: block;
+	overflow-y: auto;
+}
+// 谷歌、safari、qq浏览器、360浏览器滚动条样式
+// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+.chat-box-content::-webkit-scrollbar {
+	width: 6px;
+	height: 6px;
+	// height: 110px;
+	background-color: #FFFFFF;
+}
+/*定义滚动条轨道 内阴影+圆角*/
+.chat-box-content::-webkit-scrollbar-track {
+	// box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+	border-radius: 10px;
+	background-color: #FFFFFF;;
+}
+/*定义滑块 内阴影+圆角*/
+.chat-box-content::-webkit-scrollbar-thumb {
+	border-radius: 10px;
+	// box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+	background-color: #cacaca;
+}
+/*滑块效果*/
+.chat-box-content::-webkit-scrollbar-thumb:hover {
+	border-radius: 5px;
+	// box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+	background: rgba(0,0,0,0.4);
+}
+.chat-box-footer{
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 55px;
+	border-top: 1px solid #afafaf;
+}
+.chat-box-main{
+	position: absolute;
+	left: 0;
+	height: 350px;
+	width: 503px;
+	top: 0;
+	border-right: 1px #dedede solid;
+	z-index: 4;
+	background: #fff;
+	border-radius: 5px;
+}
+.chat-box-footer-create{
+	font-size: 16px;
+	color: #fff;
+	margin-left: 5px;
+	margin-right: 5px;
+	cursor: pointer;
+	width: 40px;
+	height: 40px;
+	border-radius: 50%;
+	background: green;
+	border: none;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.chat-box-footer-send{
+	position: relative;
+	background: #F2F2F2;
+	cursor: pointer;
+	.icon-yuyin{
+		color: #333;
+		font-size: 24px;
+		margin: 0;
+	}
+	&.active{
+		.icon-yuyin{
+			color: green;
+		}
+	}
+	.close_icon{
+		position: absolute;
+		top: -15px;
+		left: 11px;
+		font-size: 16px;
+		color: #333;
+		font-weight: 600;
+	}
+}
+#voice_progress_bar{
+	width: 40px;
+	height: 40px;
+	position: absolute;
+	left: 0;
+	top: 0;
+	border-radius: 50%;
+}
+.chat-box-footer-send.disbled{
+	cursor: no-drop;
+}
+.leftUser{
+	float: left;
+	margin-left: 10px;
+	margin-top: 10px;
+	display: inline-block;
+	max-width: 80%;
+}
+.rightUser{
+	float: right;
+	margin-right: 10px;
+	margin-top: 10px;
+	display: inline-block;
+	max-width: 80%;
+	text-align: right;
+}
+.userHeader{margin-bottom: 2px;}
+.userName{font-size: 12px;display:inline-block;margin-right:10px;}
+.userChatTime{font-size: 12px;display:inline-block;}
+.textRight{text-align: right;}
+.userBubble{
+	font-size: 12px;
+	padding: 5px 10px 6px 10px;
+	min-width: 140px;
+	background: #ccc;
+	border-radius: 5px;
+	cursor: pointer;
+	display:inline-block;
+}
+.userMessage{
+	position: relative;
+	text-align: left;
+}
+.messageText{
+	line-height: 20px;
+	word-break: break-all;
+}
+.wifi-symbol {
+	width: 48px;
+	height: 48px;
+	box-sizing: border-box;
+	overflow: hidden;
+	transform: rotate(135deg);
+	position: absolute;
+	left: 5px;
+	top: -13px;
+}
+.wifi-circle {
+	border: 1px solid #000000;
+	border-radius: 50%;
+	position: absolute;
+}
+
+.first {
+	width: 9px;
+	height: 9px;
+	background: #cccccc;
+	top: 45px;
+	left: 45px;
+	border: 2px solid #000;
+}
+
+.second {
+	width: 20px;
+	height: 20px;
+	top: 40px;
+	left: 40px;
+	&.second-amit{
+		animation: fadeInOut 1s infinite 0.2s;
+	}
+}
+
+.third {
+	width: 26px;
+	height: 26px;
+	top: 36px;
+	left: 36px;
+	&.third-amit{
+		animation: fadeInOut 1s infinite 0.4s;
+	}
+}
+
+@keyframes fadeInOut {
+	0% {
+		opacity: 0; /*初始状态 透明度为0*/
+	}
+	100% {
+		opacity: 1; /*结尾状态 透明度为1*/
+	}
+}
+</style>
+
diff --git a/src/views/newMap/display/exam/examPanel.vue b/src/views/newMap/display/exam/examPanel.vue
new file mode 100644
index 000000000..ad437ab25
--- /dev/null
+++ b/src/views/newMap/display/exam/examPanel.vue
@@ -0,0 +1,211 @@
+<template>
+	<div class="examPanel" v-if="show">
+		<div class="header">
+			<div>满分: {{ composition.fullScore }}</div>
+			<div>考试时间: {{ composition.validDuration }}分钟</div>
+		</div>
+		<!-- <div class="legend-area">
+			<div class="legend">
+				<div class="box finished"></div>
+				<div class="text">已作答</div>
+			</div>
+			<div class="legend">
+				<div class="box"></div>
+				<div class="text">未作答</div>
+			</div>
+		</div> -->
+		<div>理论题</div>
+		<div class="questionList">
+			<div
+				class="item theory"
+				v-for="(question, index) in questionList[0]"
+				:key="index"
+				@click="questionSelect(index, 1)"
+				:class="{
+					current: currentQuestionIndex === index && currentQuestionType === 1,
+					submited: questionStateList[0][index],
+				}"
+			>
+				{{ index + 1 }}
+			</div>
+		</div>
+		<div>实训题</div>
+		<div class="questionList">
+			<div
+				class="item training"
+				v-for="(question, index) in questionList[1]"
+				:key="index"
+				@click="questionSelect(index, 2)"
+				:class="{ current: currentQuestionIndex === index && currentQuestionType === 2 }"
+			>
+				{{ index + 1 }}
+			</div>
+		</div>
+		<div class="footer">
+			<el-button @click="submitExam" size="small" type="primary">交卷</el-button>
+		</div>
+		<TheoryQuestion
+			ref="theoryQuestion"
+			:question-info="
+				questionList[0][currentQuestionIndex]
+					? {
+							...questionList[0][currentQuestionIndex],
+							index: currentQuestionIndex,
+							total: questionList[0].length,
+					  }
+					: {}
+			"
+			@submit="recordSubmit"
+			@navigate="navigate"
+		/>
+	</div>
+</template>
+
+<script>
+import TheoryQuestion from './theoryQuestion'
+import { submitPaper } from '@/api/management/exam'
+export default {
+	name: 'ExamPanel',
+	emits: ['select'],
+	components: { TheoryQuestion },
+	data() {
+		return {
+			show: false,
+			composition: {},
+			paper: {},
+			questionList: [[], []],
+			questionStateList: [[], []],
+			currentQuestionIndex: 0,
+			currentQuestionType: 0, //1-理论, 2-实训
+		}
+	},
+	methods: {
+		init(data) {
+			this.show = true
+			this.currentQuestionIndex = -1
+			this.composition = data.composition
+			this.paper = data.paper
+			this.questionList = [
+				data.questionList.filter(e => e.type === 1),
+				data.questionList.filter(e => e.type === 2),
+			]
+			this.questionStateList = [
+				Array.from(this.questionList[0], () => false),
+				Array.from(this.questionList[1], () => false),
+			]
+		},
+		questionSelect(index, type) {
+			this.currentQuestionIndex = index
+			this.currentQuestionType = type
+			if (type === 1) {
+				this.$refs.theoryQuestion.doShow()
+			}
+		},
+		recordSubmit(index) {
+			this.$set(this.questionStateList[0], index, true)
+		},
+		navigate(direction) {
+			if (direction === '+') {
+				this.currentQuestionIndex++
+			} else if (direction === '-') {
+				this.currentQuestionIndex--
+			}
+		},
+		submitExam() {
+			const execSubmit = () => {
+				submitPaper(this.paper.id).then(resp => {
+					const { score, passScore, commonScore, trainingScore } = resp.data
+					const pass = score >= passScore
+					this.$alert(
+						`${pass ? '恭喜您考试合格' : '考试不通过'}
+            总分: ${score}
+            理论: ${commonScore}
+            实训: ${trainingScore}`,
+						'考试结果'
+					).then(() => {
+						this.show = false
+					})
+				})
+			}
+			const finished = this.questionStateList.every(list => list.every(item => item === true))
+			if (!finished) {
+				this.$confirm('您还有题目未答完, 确认交卷吗?').then(() => {
+					execSubmit()
+				})
+			} else {
+				execSubmit()
+			}
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.examPanel {
+	position: fixed;
+	background: #fff;
+	left: 0;
+	top: 50%;
+	transform: translateY(-50%);
+	width: 190px;
+	.header {
+		padding: 10px;
+	}
+	// .legend-area {
+	// 	display: flex;
+	// 	justify-content: space-evenly;
+	// 	.legend {
+	// 		display: flex;
+	// 		.box {
+	// 			width: 1rem;
+	// 			height: 1rem;
+	// 			background: #eee;
+	// 		}
+	// 		.finished {
+	// 			background: #409eff;
+	// 		}
+	// 	}
+	// }
+	.questionList {
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: center;
+
+		.item {
+			width: 30px;
+			height: 30px;
+			background-color: #eee;
+			text-align: center;
+			line-height: 30px;
+			margin: 3px;
+			border: 2px solid transparent;
+			cursor: pointer;
+			&:hover {
+				background-color: #ccc;
+			}
+			&:active {
+				background: #409eff;
+				color: #fff;
+			}
+		}
+		.current {
+			border: 2px dashed #666;
+			&:hover {
+				background: #66b1ff;
+			}
+		}
+		.submited {
+			background: #409eff;
+			color: #fff;
+			&:hover {
+				background-color: #66b1ff;
+			}
+		}
+	}
+	.footer {
+		padding: 10px;
+		display: flex;
+		justify-content: center;
+	}
+}
+</style>
diff --git a/src/views/newMap/display/exam/selectExam.vue b/src/views/newMap/display/exam/selectExam.vue
new file mode 100644
index 000000000..cd39b7a07
--- /dev/null
+++ b/src/views/newMap/display/exam/selectExam.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog
+    :visible.sync="show"
+    :before-close="doClose"
+    title="选择试卷"
+    width="1200px"
+    :close-on-click-modal="false"
+    @open="onOpen"
+  >
+    <el-table :data="paperList" border>
+      <el-table-column prop="name" label="试卷名称" width="150px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="profile" label="试卷简介">
+        <template slot-scope="scope">
+          <span>{{ scope.row.profile }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="试卷启用时间" width="160px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.startTime }} </span>
+
+          <span>{{ scope.row.endTime }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="validDuration" label="考试时间" width="80px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.validDuration }} 分钟</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="题目数量" width="100px">
+        <template slot-scope="scope">
+          <span>理论:{{
+            scope.row.ruleList.reduce((prev, curr) => prev + (curr.type === 1 ? curr.amount : 0), 0)
+          }}</span><br>
+          <span>实操:{{
+            scope.row.ruleList.reduce((prev, curr) => prev + (curr.type === 2 ? curr.amount : 0), 0)
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fullScore" label="总分" width="80px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.fullScore }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="passScore" label="及格分" width="80px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.passScore }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="100px">
+        <el-button slot-scope="scope" type="primary" size="small" @click="start(scope.row)">开始考试</el-button>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+import { getPapaerListOfOrg, generateExam, getUserExamInfo } from '@/api/management/exam';
+export default {
+    name: 'SelectExam',
+    emits: ['examStart'],
+    data() {
+        return {
+            show: false,
+            paperList: []
+        };
+    },
+    methods: {
+        doShow() {
+            this.show = true;
+        },
+        doClose() {
+            this.show = false;
+        },
+        onOpen() {
+            getPapaerListOfOrg({
+                orgId: this.$store.state.user.companyId,
+                mapId: this.$route.query.mapId,
+                findState: 3
+            }).then(resp => {
+                console.log(resp);
+                this.paperList = resp.data.list;
+            });
+        },
+        start(row) {
+            generateExam(row.id)
+                .then(resp => {
+                    getUserExamInfo(resp.data.id).then(res => {
+                        this.$emit('examStart', res.data);
+                        this.doClose();
+                    });
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.message);
+                });
+        }
+    }
+};
+</script>
+
+<style></style>
diff --git a/src/views/newMap/display/exam/theoryQuestion.vue b/src/views/newMap/display/exam/theoryQuestion.vue
new file mode 100644
index 000000000..f179c246c
--- /dev/null
+++ b/src/views/newMap/display/exam/theoryQuestion.vue
@@ -0,0 +1,146 @@
+<template>
+	<el-dialog
+		v-dialogDrag
+		:title="`第 ${index + 1} 题`"
+		:visible.sync="show"
+		width="860px"
+		:close-on-click-modal="false"
+		:before-close="doClose"
+		:append-to-body="true"
+	>
+		<div class="questionTitle">[{{ questionData.typeString }}] {{ questionData.title }}</div>
+		<div class="options">
+			<component
+				:is="type === 2 ? 'el-checkbox-group' : 'el-radio-group'"
+				v-model="questionData.answer"
+				class="options-container"
+			>
+				<component
+					class="option"
+					:is="type === 2 ? 'el-checkbox' : 'el-radio'"
+					v-for="el in questionData.options"
+					:key="el.value"
+					:label="el.value"
+					>{{ el.label }}</component
+				>
+			</component>
+		</div>
+		<div class="footer">
+			<el-button size="small" :disabled="index === 0" @click="navigate('-')">上一题</el-button>
+			<el-button type="danger" size="small" @click="navigate()">关闭</el-button>
+			<el-button size="small" :disabled="index >= questionInfo.total - 1" @click="navigate('+')"
+				>下一题</el-button
+			>
+		</div>
+	</el-dialog>
+</template>
+
+<script>
+const types = ['', '单选题', '多选题', '判断题']
+import { loadQuestion, submitAnswer } from '@/api/management/exam'
+export default {
+	name: 'theoryQuestion',
+	emits: ['submit'],
+	props: {
+		questionInfo: {
+			type: Object,
+			require: true,
+		},
+	},
+	data() {
+		return {
+			show: false,
+			type: 0,
+			questionData: {
+				title: '',
+				typeString: '',
+				options: [],
+				answer: '',
+			},
+		}
+	},
+	computed: {
+		index() {
+			return this.questionInfo.index
+		},
+		puId() {
+			return this.questionInfo.puId
+		},
+		questionId() {
+			return this.questionInfo.questionId
+		},
+	},
+	watch: {
+		index() {
+			if (this.questionId && this.questionInfo.puId) {
+				this.loadQuestion()
+			}
+		},
+	},
+	methods: {
+		doShow() {
+			this.show = true
+		},
+		loadQuestion() {
+			loadQuestion({ /* 理论题 */ type: 1, questionId: this.questionId, puId: this.questionInfo.puId }).then(
+				resp => {
+					const data = resp.data.common
+					this.questionData = {
+						title: data.question,
+						typeString: types[data.type],
+						options: data.optionList.map(opt => ({ label: opt.content, value: opt.id })),
+						answer: data.type === 2 ? [] : NaN,
+					}
+					this.type = data.type
+					if (resp.data.tmpAnswer) {
+						const tmpAnswer = resp.data.tmpAnswer.split(',').map(s => Number(s))
+						this.questionData.answer = data.type === 2 ? tmpAnswer : tmpAnswer[0]
+					}
+				}
+			)
+		},
+		doClose() {
+			this.show = false
+		},
+		submit() {
+			const data = {
+				puId: this.puId,
+				pqId: this.questionId,
+				type: 1,
+				subType: this.type,
+				answer: this.type === 2 ? this.questionData.answer : [this.questionData.answer],
+			}
+			submitAnswer(data).then(resp => {
+				// console.log(resp)
+			})
+		},
+		navigate(direction) {
+			const selected = this.type === 2 ? !!this.questionData.answer.length : !isNaN(this.questionData.answer)
+			if (selected) {
+				this.submit()
+				this.$emit('submit', this.index, direction)
+			}
+			this.$emit('navigate', direction)
+			if (!direction) this.doClose()
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.questionTitle {
+	margin-bottom: 30px;
+}
+.options-container {
+	display: flex;
+	flex-direction: column;
+	& > .option {
+		line-height: 2rem;
+		height: 2rem;
+	}
+}
+.footer {
+	display: flex;
+	justify-content: center;
+}
+</style>
diff --git a/src/views/newMap/display/index.vue b/src/views/newMap/display/index.vue
new file mode 100644
index 000000000..87a145d7b
--- /dev/null
+++ b/src/views/newMap/display/index.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="main">
+    <transition name="el-zoom-in-bottom">
+      <terminals-picture ref="terminalsPicture" />
+    </transition>
+<!--    <simulation-control ref="simulationControl" />-->
+    <simulation-menu ref="simulationMenu" :mode="mode" />
+    <training-tip ref="trainingTip" />
+    <training-position-tip ref="trainingPositionTip" />
+    <training-menu v-if="hasTraining || (trainingDesign && trainingDetail)" ref="trainingMenu" :offset-bottom="offsetBottom" />
+    <training-design v-if="trainingDesign" ref="trainingDesign" />
+    <chat-box v-if="hasVoice" ref="chatBox" :group="group" />
+    <training-left-slider ref="trainingLeftSlider" @overallTranslation="overallTranslation" />
+  </div>
+</template>
+<script>
+import { getSessionStorage } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+import TerminalsPicture from './terminals/index';
+import SimulationMenu from './simulationMenu/simulationMenu';
+import { getSimulationInfoNew, destroySimulationByAdmin, exitSimulation } from '@/api/simulation';
+import { loadMapDataById, loadRunPlanData } from '@/utils/loaddata';
+import { getByGroupStationList } from '@/api/jmap/map';
+import { EventBus } from '@/scripts/event-bus';
+// import SimulationControl from './simulationControl.vue';
+import TrainingTip from './trainingList/trainingTip';
+import TrainingPositionTip from './trainingList/trainingPositionTip.vue';
+import TrainingMenu from './trainingList/trainingMenu';
+import TrainingDesign from './trainingDesign/designPane.vue';
+import ChatBox from './chatBox';
+import TrainingLeftSlider from './trainingList/trainingLeftSlider';
+export default {
+    name: 'DisplayDraft',
+    components: {
+        TerminalsPicture,
+        SimulationMenu,
+        // SimulationControl,
+        TrainingTip,
+        TrainingPositionTip,
+        TrainingMenu,
+        TrainingDesign,
+        ChatBox,
+        TrainingLeftSlider
+    },
+    data() {
+        return {
+            group: '',
+            offsetBottom: 35,
+            hasTraining: false,
+            hasVoice: false,
+            trainingDesign: false
+        };
+    },
+    computed:{
+        ...mapGetters([
+            'canvasWidth'
+        ]),
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        mode() {
+            return this.$route.params.mode;
+        },
+        simType() {
+            return this.$route.query.simType;
+        },
+        // 当前的所属项目
+        project() {
+            return getSessionStorage('project');
+        },
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        }
+    },
+    watch:{
+        '$store.state.app.windowSizeCount': function() { // 窗口缩放
+            this.setWindowSize();
+        },
+        '$store.state.training.domConfig': function(val) {
+            this.hasVoice = val.hasVoice;
+            this.hasTraining = val.hasTraining;
+            this.trainingDesign = val.trainingDesign;
+            this.$refs.simulationMenu.handleMenuShow();
+        }
+    },
+    async mounted() {
+        this.setWindowSize();
+        this.group = this.$route.query.group;
+        this.initLoadData();
+    },
+    beforeDestroy() {
+        this.$store.dispatch('socket/clearTrainingOverCount');
+        this.$store.dispatch('trainingNew/clearStepOverCount');
+        this.$store.dispatch('trainingNew/trainingEnd');
+        this.$store.dispatch('trainingNew/changeTeachMode', '');
+        if (this.$store.state.training.simulationCreator) {
+            destroySimulationByAdmin(this.group);
+        } else {
+            exitSimulation(this.group);
+        }
+
+    },
+    methods:{
+        overallTranslation(flag) {
+            const panel = document.getElementById('leftSlider');
+            panel.style.transform = flag ? 'translateX(400px)' : '';
+        },
+        // 缩放设置
+        setWindowSize() {
+            const width = this.width;
+            const height = this.height;
+            this.$store.dispatch('config/resize', { width, height });
+        },
+        //  初始化
+        initLoadData() {
+            getSimulationInfoNew(this.group).then(resp => {
+                if (resp && resp.data && !resp.data.dataError) {
+                    this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
+                    this.$store.dispatch('training/setDomConfig', resp.data.paramVO && resp.data.paramVO.domConfig ? resp.data.paramVO.domConfig : {});
+                    loadMapDataById(this.mapId, 'simulation');
+                    if (this.simType === 'METRO') {
+                        this.loadRunPlan();
+                    }
+                } else {
+                    this.endViewLoading();
+                    this.$messageBox('此地图数据正在维护中,无法运行！');
+                }
+            }).catch(e => {
+                console.error(e);
+                this.$store.dispatch('app/animationsClose');
+                this.endViewLoading();
+                this.$message.error('获取仿真信息失败！');
+            });
+        },
+        loadRunPlan() {
+            this.$store.dispatch('runPlan/clear');
+            getByGroupStationList(this.group).then(resp => {
+                this.$store.dispatch('runPlan/setStations', resp.data);
+                loadRunPlanData(this.group);
+            });
+        },
+        // 结束加载状态
+        endViewLoading() {
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.main{
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+}
+</style>
diff --git a/src/views/newMap/display/memberManage/addMember.vue b/src/views/newMap/display/memberManage/addMember.vue
new file mode 100644
index 000000000..988c48c35
--- /dev/null
+++ b/src/views/newMap/display/memberManage/addMember.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    :visible.sync="dialogVisible"
+    width="500px"
+    append-to-body
+    :before-close="handleClose"
+    center
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" :model="formModel" label-width="120px" :rules="rules">
+      <el-form-item label="添加仿真成员:" prop="type">
+        <el-select v-model="formModel.type" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="stationRoleList.includes(formModel.type)" label="值班车站:" prop="deviceCode">
+        <el-select v-model="formModel.deviceCode" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in filterStationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仿真成员名称:" prop="name">
+        <el-input v-model="formModel.name" size="small" placeholder="请输入成员名称" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { addSimulationMember } from '@/api/jointSimulation';
+export default {
+    name: 'AddMember',
+    props: {
+        stationList: {
+            type: Array,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                type: '',
+                name: '',
+                deviceCode: ''
+            },
+            filterStationList: [],
+            rules: {
+                type: [
+                    { required: true, message: '请选择显示位置', trigger: 'change' }
+                ],
+                deviceCode: [
+                    { required: true, message: '请选择值班车站', trigger: 'change' }
+                ]
+            },
+            stationRoleList:[
+                'STATION_SUPERVISOR',
+                'STATION_ASSISTANT',
+                'STATION_MASTER',
+                'STATION_SIGNALER',
+                'STATION_PASSENGER',
+                'STATION_SWITCH_MAN',
+                'STATION_FACILITATOR',
+                'STATION_WORKER',
+                'DEVICE_MANAGER'
+            ],
+            typeList: [
+                {label: '行调', value: 'DISPATCHER'},
+                {label: '通号', value: 'MAINTAINER'},
+                {label: '车站值班员', value: 'STATION_SUPERVISOR'},
+                {label: '车站助理', value: 'STATION_ASSISTANT'},
+                {label: '车站站长', value: 'STATION_MASTER'},
+                {label: '车站信号员', value: 'STATION_SIGNALER'},
+                {label: '车站客运员', value: 'STATION_PASSENGER'},
+                {label: '车站扳道员', value: 'STATION_SWITCH_MAN'},
+                {label: '车站引导员', value: 'STATION_FACILITATOR'},
+                {label: '车站工务工', value: 'STATION_WORKER'},
+                {label: '设备管理员', value: 'DEVICE_MANAGER'},
+                {label: '车务段段长', value: 'TRAIN_MASTER'}
+            ]
+        };
+    },
+    computed: {
+        title() {
+            return '添加仿真角色成员';
+        }
+    },
+    methods: {
+        initData() {
+            this.filterStationList = [];
+            this.stationList.forEach(item => {
+                if (!item.depot) {
+                    this.filterStationList.push(item);
+                }
+            });
+        },
+        doShow() {
+            this.initData();
+            this.dialogVisible = true;
+        },
+        doSave() {
+            this.$refs.form.validate(() => {
+                // if (this.formModel.type !== 'STATION_SUPERVISOR') { delete this.formModel.deviceCode; }
+                if (!this.stationRoleList.includes(this.formModel.type)) { delete this.formModel.deviceCode; }
+                addSimulationMember(this.formModel, this.$route.query.group).then(() => {
+                    this.$message.success('添加仿真角色成员成功！');
+                    this.handleClose();
+                }).catch(() => {
+                    this.$message.error('添加仿真角色成员失败！');
+                });
+            });
+        },
+        handleClose() {
+            this.dialogVisible = false;
+            this.formModel = {
+                type: '',
+                name: '',
+                deviceCode: ''
+            };
+            this.$refs.form.resetFields();
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/memberManage/content-menu.vue b/src/views/newMap/display/memberManage/content-menu.vue
new file mode 100644
index 000000000..0d53204c5
--- /dev/null
+++ b/src/views/newMap/display/memberManage/content-menu.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="jointRoomMenu">
+    <pop-menu ref="popMenu" :menu="menu" />
+  </div>
+</template>
+
+<script>
+import PopMenu from '@/components/PopMenu';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { kickOutMember } from '@/api/jointSimulation';
+
+export default {
+    components: {
+        PopMenu
+    },
+    props: {
+        clickUserId: {
+            type: String,
+            default: ''
+        },
+        menuDisabled: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            // menu: [{
+            //     label: this.$t('trainRoom.kickOutTheRoom'),
+            //     handler: this.kicked
+            // }]
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        },
+        position() {
+            return this.$store.state.menuOperation.menuPosition;
+        },
+        menu() {
+            return [{
+                label: this.$t('trainRoom.kickOutTheRoom'),
+                handler: this.kicked,
+                disabled: this.menuDisabled
+            }];
+        }
+    },
+    watch: {
+        '$store.state.menuOperation.menuCount': function (val) {
+            if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.JointRoom)) {
+                this.doShow();
+            } else {
+                this.doClose();
+            }
+        }
+    },
+    mounted() {
+        this.closeEvent();
+    },
+    beforeDestroy() {
+        window.removeEventListener('click', this.doClose, false);
+    },
+    methods: {
+        closeEvent() {
+            window.addEventListener('click', this.doClose, false);
+        },
+        doShow() {
+            this.closeEvent();
+            if (this.userId != this.clickUserId) {
+                if (this.$refs && this.$refs.popMenu) {
+                    this.$refs.popMenu.resetShowPosition(this.position);
+                }
+            }
+        },
+        doClose() {
+            if (this.$refs && this.$refs.popMenu) {
+                this.$refs.popMenu.close();
+            }
+        },
+        async kicked() {
+            try {
+                await kickOutMember(this.$route.query.group, this.clickUserId);
+            } catch (error) {
+                console.error(error);
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	/deep/ {
+		.menu-item{
+			background: #f1ecec;
+			.pop-menu {
+				background: #5F9EA0;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/memberManage/e-members.vue b/src/views/newMap/display/memberManage/e-members.vue
new file mode 100644
index 000000000..d90f9bd79
--- /dev/null
+++ b/src/views/newMap/display/memberManage/e-members.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="member">
+    <div class="member__head">
+      <div class="member__head--title"> 仿真用户列表</div>
+      <div class="member__head--notes"> {{ onlineNum }}/{{ members.length }}</div>
+    </div>
+    <div class="member__container">
+      <el-input v-model="filterText" :placeholder="this.$t('global.enterNameToFilter')" clearable />
+      <el-scrollbar class="member__container--list" wrap-class="scrollbar-wrapper" style="{height: calc(100% - 64px)}">
+        <el-tree
+          ref="tree"
+          :data="filterMembers"
+          :filter-node-method="handleFilterNode"
+          :lazy="false"
+          :props="defaultProps"
+          @node-contextmenu="handleShowContextMenu"
+        >
+          <span slot-scope="{ node, data }">
+            <span v-if="node.data.online" style="color: green;">{{ data.nickName + (data.userType === 'TEACHER'? '【教员】':'') + (data.referee? '【裁判员】':'') + (data.deviceVO? ` -- (${data.deviceVO.code})`:'') }}</span>
+            <span v-else style="color: #ccc;">{{ data.nickName + (data.userType === 'TEACHER'? '【教员】':'') + (data.referee? '【裁判员】':'') + (data.deviceVO? ` -- (${data.deviceVO.code})`:'') }}</span>
+          </span>
+        </el-tree>
+      </el-scrollbar>
+    </div>
+    <content-menu ref="menu" :click-user-id="clickUserId" :menu-disabled="menuDisabled" />
+  </div>
+</template>
+
+<script>
+import { DeviceMenu } from '@/scripts/ConstDic';
+import ContentMenu from './content-menu';
+import { SimulationUserType } from '@/scripts/ConstDic';
+
+export default {
+    components: {
+        ContentMenu
+    },
+    props: {
+        room: {
+            type: Object,
+            required: true
+        },
+        members: {
+            type: Array,
+            required: true
+        }
+    },
+    data() {
+        return {
+            filterText: '',
+            clickUserId: '',
+            menuDisabled: false,
+            onlineNum: 1
+        };
+    },
+    computed: {
+        defaultProps() {
+            return { label: 'nickName' };
+        },
+        filterMembers() {
+            return this.members.filter(e =>{ return e.nickName.includes(this.filterText); });
+        },
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
+    },
+    watch: {
+        members: {
+            handler(n, o) {
+                let num = 0;
+                if (n && n.length) {
+                    n.forEach(item => {
+                        if (item.online) {
+                            num++;
+                        }
+                    });
+                }
+                this.onlineNum = num;
+            },
+            immediate: true,
+            deep: true
+        }
+    },
+    methods: {
+        handleFilterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        handleShowContextMenu(e, obj, node, vueElem) {
+            e.preventDefault();
+            const position = {
+                x: e.clientX,
+                y: e.clientY
+            };
+            if (this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) {
+                this.clickUserId = `${obj.userId || ''}`;
+                this.menuDisabled = !!obj.deviceVO;
+                this.$store.dispatch('menuOperation/setPopMenu', { position, menu: DeviceMenu.JointRoom });
+            }
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+	.member {
+		background: #f0f0f0;
+		display: flex;
+		flex-direction: column;
+		border: 1px solid #ccc;
+
+		&__head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0 10px;
+			border-bottom: 1px solid #ccc;
+
+			&--title {
+                padding:10px 0px;
+				font-size: 16px;
+				font-weight: bold;
+			}
+
+			&--notes {
+				font-size: 16px;
+                padding:10px 0px;
+				display: flex;
+				align-items: flex-end;
+			}
+		}
+
+		&__container {
+			flex-grow: 1;
+			height: 520px;
+			&--list {
+				background: #fff;
+				height: calc(100% - 109px);
+                border-bottom: 1px #ccc solid;
+
+				&::-webkit-scrollbar {
+					display: none;
+				}
+			}
+		}
+	}
+	/deep/ {
+		.member__container{
+			height: calc(100% - 40px);
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/memberManage/membersManage.vue b/src/views/newMap/display/memberManage/membersManage.vue
new file mode 100644
index 000000000..a55fbe74c
--- /dev/null
+++ b/src/views/newMap/display/memberManage/membersManage.vue
@@ -0,0 +1,496 @@
+<template>
+  <el-drawer
+    title="仿真成员管理"
+    :visible.sync="show"
+    :direction="direction"
+    :before-close="doClose"
+    custom-class="drawer_box"
+    size="43%"
+  >
+    <div class="room">
+      <div class="room__container">
+        <div style="width: 70%;height: calc(100% - 20px);">
+          <div style="margin-left: 10px;margin-right: 10px;">
+            <el-input v-model="queryMember" placeholder="请输入搜索人员">
+              <el-button slot="append" icon="el-icon-search" />
+            </el-input>
+            <el-button @click="addMember">添加仿真成员</el-button>
+          </div>
+          <el-tree
+            ref="tree"
+            :data="treeData"
+            :props="defaultProps"
+            default-expand-all
+            style="margin: 10px;margin-bottom: 0;border: 1px solid #ccc;overflow-y: auto;height: calc(100% - 120px);"
+            :filter-node-method="filterNode"
+          >
+            <span :id="data.id" slot-scope="{ data }" class="custom-tree-node">
+              <span>{{ data.labelName }}</span>
+              <span v-if="data.type">
+                <el-select :key="data.id" v-model="data.userId" :disabled="singleMember && roles !== data.type" placeholder="请选择" clearable size="mini" @change="nodeMemberChange($event, data)">
+                  <el-option
+                    v-for="item in simulationUserList"
+                    :key="item.userId"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  />
+                </el-select>
+              </span>
+            </span>
+          </el-tree>
+        </div>
+        <e-members
+          class="room__container--members"
+          :room="room"
+          :members="simulationUserList"
+          style="height: 100%"
+          @message="messageInfo"
+        />
+      </div>
+      <div class="room__footer" />
+    </div>
+    <add-member ref="addMember" :station-list="stationList" />
+  </el-drawer>
+</template>
+
+<script>
+import eMembers from './e-members';
+import { EventBus } from '@/scripts/event-bus';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
+import AddMember from './addMember';
+export default {
+    name: 'MembersManage',
+    components: {
+        eMembers,
+        AddMember
+    },
+    data() {
+        return {
+            show: false,
+            singleMember: false,
+            direction: 'ltr',
+            queryMember: '',
+            room: {
+                totalNum: 0,
+                group: '',
+                mapId: '',
+                creatorId: '',
+                creator: {
+                    nickName: ''
+                },
+                permissionRest: 0,
+                permissionNum: 0,
+                state: ''
+            },
+            defaultProps: {
+                children: 'children',
+                label: 'labelName'
+            },
+            simulationUserList: [],
+            stationList: [],
+            availableStationList:[],
+            activeTrains: [],
+            standList: [],
+            doorList: [],
+            memberData: {},
+            treeData: [{
+                labelName: '行调',
+                children: []
+            }, {
+                labelName: '车站值班员',
+                children: []
+            }, {
+                labelName: '司机',
+                children: []
+            }, {
+                labelName: '通号',
+                children: []
+            }, {
+                labelName: '车辆段',
+                children: []
+            }, {
+                labelName: 'CTC操作员',
+                children: []
+            }, {
+                labelName: '车站助理',
+                children: []
+            },
+            {
+                labelName: '车站站长',
+                children: []
+            },
+            {
+                labelName: '车站信号员',
+                children: []
+            },
+            {
+                labelName: '车站客运员',
+                children: []
+            },
+            {
+                labelName: '车站扳道员',
+                children: []
+            },
+            {
+                labelName: '车站引导员',
+                children: []
+            },
+            {
+                labelName: '车站工务工',
+                children: []
+            },
+            {
+                labelName: '设备管理员',
+                children: []
+            }
+            ]
+        };
+    },
+    computed: {
+        height() {
+            return this.$store.state.app.height - 130;
+        },
+        group() {
+            return this.$route.query.group;
+        },
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        },
+        username() {
+            return this.$store.state.user.nickname;
+        },
+        roles() {
+            return this.$store.state.training.roles;
+        }
+    },
+    watch: {
+        queryMember(val) {
+            this.$refs.tree.filter(val);
+        },
+        '$store.state.training.simulationUserList': function(val) {
+            this.simulationUserList = val;
+        },
+        '$store.state.training.memberList': function (val) {
+            if (val && val.length) {
+                this.memberData = this.$store.state.training.memberData;
+                const dispatcherList = [];
+                const electricDispatcherList = [];
+                const depotDispatcherList = [];
+                const stationSupervisorList = [];
+                const driverList = [];
+                const maintainerList = [];
+                const ctcOperatorList = [];
+                const stationAssistantList = [];
+                const stationMasterList = [];
+                const stationSignalerList = [];
+                const stationPassengerList = [];
+                const stationSwitchManList = [];
+                const stationFacilitatorList = [];
+                const stationWorkerList = [];
+                const deviceManagerList = [];
+                const trainMasterList = [];
+                val.forEach(item => {
+                    const device = this.$store.getters['map/getDeviceByCode'](item.deviceCode);
+                    switch (item.type) {
+                    case 'DISPATCHER':
+                        this.memberData[item.id].labelName = '行调' + (item.name || '');
+                        dispatcherList.push(this.memberData[item.id]);
+                        break;
+                    case 'ELECTRIC_DISPATCHER':
+                        this.memberData[item.id].labelName = '电力调度' + (item.name || '');
+                        electricDispatcherList.push(this.memberData[item.id]);
+                        break;
+                    case 'DEPOT_DISPATCHER':
+                        this.memberData[item.id].labelName = '车辆段信号楼' + (item.name || '');
+                        depotDispatcherList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_SUPERVISOR':
+                        this.memberData[item.id].labelName = '值班员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationSupervisorList.push(this.memberData[item.id]);
+                        break;
+                    case 'DRIVER':
+                        this.memberData[item.id].labelName = '司机-列车' + item.deviceCode;
+                        driverList.push(this.memberData[item.id]);
+                        break;
+                    case 'MAINTAINER':
+                        this.memberData[item.id].labelName = '通号' + (item.name || '');
+                        maintainerList.push(this.memberData[item.id]);
+                        break;
+                    case 'RAIL_CTC':
+                        this.memberData[item.id].labelName = 'CTC操作员' + device.name;
+                        ctcOperatorList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_ASSISTANT':
+                        this.memberData[item.id].labelName = '车站助理-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationAssistantList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_MASTER':
+                        this.memberData[item.id].labelName = '车站站长-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationMasterList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_SIGNALER':
+                        this.memberData[item.id].labelName = '车站信号员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationSignalerList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_PASSENGER':
+                        this.memberData[item.id].labelName = '车站客运员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationPassengerList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_SWITCH_MAN':
+                        this.memberData[item.id].labelName = '车站扳道员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationSwitchManList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_FACILITATOR':
+                        this.memberData[item.id].labelName = '车站引导员-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationFacilitatorList.push(this.memberData[item.id]);
+                        break;
+                    case 'STATION_WORKER':
+                        this.memberData[item.id].labelName = '车站工务工-' + device.name + (item.name ? `-${item.name }` : '');
+                        stationWorkerList.push(this.memberData[item.id]);
+                        break;
+                    case 'DEVICE_MANAGER':
+                        this.memberData[item.id].labelName = '设备管理员-' + device.name + (item.name ? `-${item.name }` : '');
+                        deviceManagerList.push(this.memberData[item.id]);
+                        break;
+                    case 'TRAIN_MASTER':
+                        // device.name;
+                        this.memberData[item.id].labelName = '车务段段长-' + (item.name ? `-${item.name }` : '');
+                        trainMasterList.push(this.memberData[item.id]);
+                        break;
+                    case 'PARENT_DEPARTMENT':
+                        this.memberData[item.id].labelName = '上级部门' + (item.name ? `-${item.name }` : '');
+                        break;
+                // DEVICE_MANAGER:'设备管理员' deviceManager
+                    }
+                });
+                this.treeData = [{
+                    labelName: '行调',
+                    id: 'dispatcher',
+                    children: dispatcherList
+                }, {
+                    labelName: '车站值班员',
+                    id: 'stationSupervisor',
+                    children: stationSupervisorList
+                }, {
+                    labelName: '司机',
+                    id: 'driver',
+                    children: driverList
+                }, {
+                    labelName: '通号',
+                    id: 'maintainer',
+                    children: maintainerList
+                }, {
+                    labelName: '车辆段信号楼',
+                    id: 'depotDispatcher',
+                    children: depotDispatcherList
+                }, {
+                    labelName: '电力调度',
+                    id: 'electricDispatcher',
+                    children: electricDispatcherList
+                }, {
+                    labelName: 'CTC操作员',
+                    id: 'ctcOperator',
+                    children: ctcOperatorList
+                }, {
+                    labelName: '车站助理',
+                    id: 'stationAssistant',
+                    children: stationAssistantList
+                },
+                {
+                    labelName: '车站站长',
+                    id: 'stationMaster',
+                    children: stationMasterList
+                },
+                {
+                    labelName: '车站信号员',
+                    id: 'stationSignaler',
+                    children: stationSignalerList
+                },
+                {
+                    labelName: '车站客运员',
+                    id: 'stationPassenger',
+                    children: stationPassengerList
+                },
+                {
+                    labelName: '车站扳道员',
+                    id: 'stationSwitchMan',
+                    children: stationSwitchManList
+                },
+                {
+                    labelName: '车站引导员',
+                    id: 'stationFacilitator',
+                    children: stationFacilitatorList
+                },
+                {
+                    labelName: '车站工务工',
+                    id: 'stationWorker',
+                    children: stationWorkerList
+                },
+                {
+                    labelName: '设备管理员',
+                    id: 'deviceManager',
+                    children: deviceManagerList
+                },
+                {
+                    labelName: '车务段段长 ',
+                    id: 'trainMaster',
+                    children: trainMasterList
+                }
+                ];
+                EventBus.$emit('trainTicketMember', [...stationSupervisorList, ...stationAssistantList]);
+                this.$nextTick(() => {
+                    if (this.$refs.tree) {
+                        this.$refs.tree.filter(this.queryMember);
+                    }
+                });
+            }
+        },
+        '$store.state.map.activeTrainListChange': function () {
+            this.activeTrains = [];
+            const activeTrainList = this.$store.state.map.activeTrainList;
+            if (activeTrainList && activeTrainList.length) {
+                activeTrainList.forEach(groupNumber => {
+                    this.activeTrains.push(groupNumber);
+                });
+            }
+            this.$refs.tree && this.$refs.tree.filter(this.queryMember);
+        },
+        '$store.state.socket.simulationRoleList':function(list) {
+            if (list && list.length) { // 人员变化监控
+                this.checkRoleChange(list);
+            }
+        },
+        '$store.state.training.domConfig': function(val) {
+            this.singleMember = val.singleMember;
+        }
+    },
+    methods: {
+        doShow() {
+            this.show = true;
+            this.memberData = this.$store.state.training.memberData;
+            this.simulationUserList = this.$store.state.training.simulationUserList;
+            this.$nextTick(() => {
+                if (this.$refs.tree) {
+                    this.$refs.tree.filter(this.queryMember);
+                }
+            });
+        },
+        doClose() {
+            this.show = false;
+        },
+        messageInfo(info) {
+            this.$message({ showClose: true, ...info });
+        },
+        nodeMemberChange(val, nodeData) {
+            let user = '';
+            this.simulationUserList.forEach(item => {
+                if (val && item.userId === val) {
+                    user = item;
+                } else if (!val && item.memberId === nodeData.id) {
+                    user = item;
+                }
+            });
+            const data = [{userId: user.userId, memberId:val ? nodeData.id : ''}];
+            const self = this;
+            assignUsersPlayRoles(data, this.$route.query.group).then(resp => {
+                this.$message.success('调整角色成员成功！');
+            }).catch(() => {
+                self.memberData[nodeData.id].userId = '';
+                this.$message.error('调整角色成员失败！');
+            });
+        },
+        addMember() {
+            this.$refs.addMember.doShow();
+        },
+        filterNode(value, data) {
+            let flag = false;
+            if (this.memberData[data.id] && this.memberData[data.id].nickName) {
+                flag = this.memberData[data.id].nickName.indexOf(value) !== -1;
+            }
+            let driverNoShow = true;
+            if (data.type && data.type === 'DRIVER' && !this.activeTrains.includes(data.deviceCode)) {
+                driverNoShow = false;
+            }
+            return (data.labelName.indexOf(value) !== -1 || flag) && driverNoShow;
+        },
+        checkRoleChange(list) {
+            list.forEach(each => {
+                const item = each.body;
+                if (item.messageType === 'PLAY_CHANGE' && item.userId == this.userId) {
+                    const userRole = item.type || 'AUDIENCE';
+                    this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode);
+                    this.$store.dispatch('training/setMyMemberId', item.memberId);
+                    this.$store.dispatch('training/setUserRole', userRole);
+                    this.$store.dispatch('training/setRoles', userRole);
+                    this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: [item], userId: this.userId });
+                } else {
+                    this.$store.dispatch('training/updateMemberAndUser', { simulationUserList: [item], userId: this.userId });
+                }
+            });
+        }
+    }
+};
+</script>
+
+<style scoped lang="scss">
+	.drawer_box{
+		width: 800px;
+	}
+	.custom-tree-node {
+		flex: 1;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		font-size: 14px;
+		padding-right: 8px;
+		margin: 2px;
+	}
+	.room {
+		width: 100%;
+		height: 100%;
+		// display: flex;
+		// flex-direction: column;
+		box-sizing: border-box;
+		background: #f0f0f0;
+
+		&__container {
+			height: 100%;
+			display: flex;
+			flex-grow: 1;
+			padding: 10px;
+
+			&--members {
+				flex-shrink: 1;
+				flex-grow: 1;
+			}
+
+			&--roles {
+				flex-grow: 5;
+				flex-shrink: 5;
+			}
+
+			&--chat {
+				flex-basis: 360px;
+			}
+		}
+		&__footer {
+			height: 20px;
+		}
+	}
+	/deep/ {
+		.el-input--mini .el-input__inner {
+			height: 24px;
+			line-height: 24px;
+		}
+		.el-input-group {
+			width: calc(100% - 146px);
+		}
+		.el-dialog__body {
+			padding: 6px 20px;
+		}
+		.el-drawer__body{
+			height: 100%;
+		}
+	}
+
+</style>
diff --git a/src/views/newMap/display/messageBoard.vue b/src/views/newMap/display/messageBoard.vue
new file mode 100644
index 000000000..19b8d4b0f
--- /dev/null
+++ b/src/views/newMap/display/messageBoard.vue
@@ -0,0 +1,452 @@
+<template>
+  <div id="elDialog" class="message-board-box">
+    <div class="message-board-title">留言板</div>
+    <div class="message-board-content">
+      <div v-if="postCommentList.length">
+        <template v-for="(item,i) in postCommentList">
+          <div :key="i" class="eachPostComment">
+            <div style="margin-bottom: 10px;display: flex;align-items: center;">
+              <img :src="avatarUrl(item)" class="head_portrait">
+              <div class="MBCcreatorNickName">{{ 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="replyIcon" class="replyIcon" @click="replyLeaveMessage(item.id, i)">
+              <img v-if="userId == item.creatorId || superAdmin" :src="deleteIcon" class="deleteIcon" @click="deleteMessage(item.id)">
+            </div>
+            <div v-if="item.comments && item.comments.total > 0" class="eachComment">
+              <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;" v-html="$escapeHTML(`${elem.content}`)" />
+                    <span style="margin-right: 10px;">{{ elem.commentTime }}</span>
+                    <span class="replyLeaveMessage" @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;" v-html="$escapeHTML(`${elem.content}`)" />
+                    <span style="margin-right: 10px;">{{ elem.commentTime }}</span>
+                    <span class="replyLeaveMessage" @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;">
+              <quill-editor
+                :ref="'answerInput' + item.id"
+                v-model="commentContent"
+                style="width: 80%;margin-left: 10%;margin-top: 10px;"
+                class-name="answer_input"
+                :margin-bottom="20"
+                editor-type="onlyEmoji"
+                :no-handle-p="true"
+                :height="100"
+                :placeholder="replyUserName"
+              />
+              <div>
+                <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 class="empty-text">
+        <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>
+    </div>
+    <quill-editor ref="quillEditor" v-model="content" style="width: 80%;margin-left: 10%;" :margin-bottom="20" editor-type="imgEmoji" :no-handle-p="true" />
+    <span id="boardBottom" class="dialog-footer">
+      <el-button @click="handleClear">清空</el-button>
+      <el-button type="danger" @click="commitComment">留言</el-button>
+    </span>
+    <el-button size="mini" type="danger" class="goSlide" @click="goSlide">我要留言</el-button>
+    <div v-show="imgShow" class="popUpImgView" @click="handelCloseImg">
+      <img id="targetImg" src="" class="popUpImg">
+    </div>
+  </div>
+</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';
+import { ProjectCode } from '@/scripts/ProjectConfig';
+import QuillEditor from '@/components/QuillEditor/index';
+export default {
+    name: 'MessageBoard',
+    components: {
+        QuillEditor
+    },
+    data() {
+        return {
+            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: '',
+            postId: ''
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user.id;
+        },
+        superAdmin() {
+            return this.$store.state.user.roles.includes(superAdmin);
+        },
+        projectCode() {
+            const project = this.$route.query.project;
+            return ProjectCode[project];
+        }
+    },
+    created() {
+        const that = this;
+        window.handleZoomImg = function () {
+            that.imgShow = true;
+            document.getElementById('targetImg').src = event.target.currentSrc;
+        };
+    },
+    mounted() {
+        getPostByProjectCode(this.projectCode).then(resp => {
+            this.postId = resp.data.id;
+        });
+        this.handleCurrentChange();
+    },
+    methods: {
+        commitComment() {
+            const images = this.content.match(/<img/g);
+            const answerContent = this.handleEmojiContent(this.content);
+            if (images && images.length > 3) {
+                this.$message.error('留言内容使用图片应小于三张！');
+                return;
+            }
+            if (answerContent.length > 1000) {
+                this.$message.error('留言内容超出最大长度！');
+                return;
+            }
+            if (!answerContent) {
+                this.$message.error('留言内容不能为空！');
+                return;
+            }
+            answerPost({postId: this.postId, content: answerContent}).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 => {
+                    item.content = this.replaceEmoji(item.content);
+                    item.comments && item.comments.list && item.comments.list.forEach(elem => {
+                        elem.content = this.replaceEmoji(elem.content);
+                    });
+                    this.postCommentList.push(item);
+                });
+                this.total = resp.data.total;
+            });
+        },
+        replaceEmoji(content) {
+            let value = content.replace(/<img/g, '<img style="width: 100px;height: auto;cursor: zoom-in;" onclick="handleZoomImg()"');
+            const list = value.match(/<<<([^>]*)>>>/g);
+            (list || []).forEach(elem => {
+                const targetValue = elem.substring(3, elem.length - 3);
+                value = value.replace(elem, `<span class="ql-emojiblot" data-name="${targetValue}"><span contenteditable="false"><span class="ap ap-${targetValue}">ss</span></span></span>`);
+            });
+            return value;
+        },
+        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 this.$store.state.user.ossUrl + 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.$nextTick(()=>{
+                this.$refs['answerInput' + messageId][0].getFocus();
+            });
+        },
+        cancelComment() {
+            this.replyMessageId = '';
+            this.commentContent = '';
+            this.replyCommentId = '';
+            this.replyMessageIndex = '';
+            this.replyUserName = '';
+        },
+        commentMessage() {
+            const contentValue = this.handleEmojiContent(this.commentContent);
+            if (contentValue.length > 300) {
+                this.$message.error('回复内容超出最大长度！');
+                return;
+            }
+            if (this.replyCommentId) {
+                commentComents(this.replyMessageId, this.replyCommentId, {content:contentValue}).then(resp => {
+                    this.getCommentList(this.replyMessageId, this.replyMessageIndex);
+                    this.cancelComment();
+                }).catch(error => {
+                    this.$message.error('评论回复失败！');
+                    console.error(error);
+                });
+            } else {
+                commentLevelMessage(this.replyMessageId, {content:contentValue}).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 => {
+                const replaceValue = [];
+                resp.data && resp.data.forEach(item => {
+                    item.content = this.replaceEmoji(item.content);
+                    replaceValue.push(item);
+                });
+                if (this.moreMessageId == messageId) {
+                    this.allCommentList = replaceValue;
+                }
+                if (replaceValue.length > 3) {
+                    this.postCommentList[messageIndex].comments.list = replaceValue.slice(0, 3);
+                    this.postCommentList[messageIndex].comments.total = replaceValue.length;
+                } else {
+                    this.postCommentList[messageIndex].comments.list = replaceValue;
+                    this.postCommentList[messageIndex].comments.total = replaceValue.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 && resp.data.forEach(item => {
+                    item.content = this.replaceEmoji(item.content);
+                    this.allCommentList.push(item);
+                });
+                this.moreMessageId = data.id;
+            }).catch(error => {
+                console.error(error);
+            });
+        },
+        handleEmojiContent(content) {
+            const list = content.match(/<span class="ql-emojiblot" data-name="(\S*)"><span contenteditable="false"><span class="ap ap-(\S*)<\/span><\/span><\/span>/g);
+            (list || []).forEach(item => {
+                let targetValue = item.split(' ')[2];
+                targetValue = targetValue.substring(11, targetValue.length - 8);
+                content = content.replace(item, '<<<' + targetValue + '>>>');
+            });
+            return content;
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+	.dialog-footer{
+		margin: 0 auto;
+		padding: 10px 0 30px;
+		display: flex;
+		justify-content: center;
+	}
+	.empty-text{
+		text-align: center;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
+		font-size: 18px;
+		color: #ccc;
+	}
+	.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;
+	}
+	.message-board-box{
+		width: 100%;
+		background-image:url('../../../assets/bg_board.jpg');
+		background-size: 100% 100%;
+		min-height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 18;
+	}
+	/deep/.ql-container{
+		height: 80%;
+	}
+	.message-board-title{
+		font-size: 30px;
+		color: #F00;
+		font-family: 'fangsong';
+		font-weight: bolder;
+		width: 100%;
+		text-align: center;
+		height: 80px;
+		line-height: 80px;
+	}
+    .message-board-content{
+        width: 80%;
+        margin-left: 10%;
+        padding: 20px;
+        margin-bottom: 20px;
+        background-color: rgba(255,255,255,0);
+        border: 1px solid #ebeef5;
+        border-radius: 4px;
+        box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+    }
+    .eachPostComment{
+        border: 1px solid #C0C0C0;
+        border-radius: 5px;
+        margin-bottom: 20px;
+        box-shadow: 2px 2px 3px #808080;
+        padding: 10px 20px;
+        background-color: #fff
+    }
+    .eachComment{
+        background: #F5F5F5;
+        margin-top: 10px;
+        width: calc(100% - 120px);
+        margin-left: 60px;
+        border-radius: 5px;
+        padding: 1px 10px 10px;
+    }
+    .replyLeaveMessage{color:#409EFF;cursor: pointer;margin-right: 10px;}
+    .MBCcreatorNickName{display: inline-block;margin-right: 20px;margin-left:10px;font-size: 18px;color: #000;}
+    .replyIcon{width: 16px;height: auto;margin-right: 30px;cursor: pointer;}
+    .deleteIcon{width: 16px;height: auto;cursor:pointer;}
+    .goSlide{position: fixed; left: 91%;top: 80px;width: 90px;}
+    .popUpImgView{position: fixed;width: 100%;height: 100%;left: 0;top: 0;background: rgba(0,0,0,0.5);cursor: zoom-out;}
+    .popUpImg{position: fixed;top: 50%;left: 50%;transform: translate(-50%,-50%);min-width: 500px;max-height: 80%;height: auto;}
+</style>
+<style>
+.ql-size-small {
+	font-size: 0.75em;
+}
+.ql-size-large{
+	font-size: 1.5em;
+}
+.ql-size-huge{
+	font-size: 2.5em;
+}
+</style>
diff --git a/src/views/newMap/display/modifyTime.vue b/src/views/newMap/display/modifyTime.vue
new file mode 100644
index 000000000..f05c11ff9
--- /dev/null
+++ b/src/views/newMap/display/modifyTime.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="550px" :before-close="doClose">
+    <el-form ref="form" label-width="120px" :model="formModel" :rules="rules">
+      <el-form-item :label="$t('display.setTime.systemTime')" prop="time">
+        <el-time-picker
+          v-model="formModel.time"
+          :picker-options="pickerOptions"
+          :placeholder="$t('display.setTime.anyTime')"
+        />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="show = false">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" :loading="status" @click="handleSure">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { modifySystemTime } from '@/api/simulation';
+import { prefixIntrger } from '@/utils/date';
+
+// 修改系统时间
+export default {
+    data() {
+        return {
+            show: false,
+            formModel: {
+                time: new Date()
+            },
+            maxNumber: 1,
+            pickerOptions: { selectableRange: '00:00:00 - 23:59:59' },
+            status: false
+        };
+    },
+    computed: {
+        title() {
+            return '修改系统时间';
+        },
+        group() {
+            return this.$route.query.group;
+        },
+        rules() {
+            return {
+                time: [
+                    { required: true, message: this.$t('display.setTime.selectSystemTime'), trigger: 'change' }
+                ]
+            };
+        }
+    },
+    methods: {
+        doShow() {
+            // this.formModel.time = new Date(this.$store.state.training.initTime || null);
+            this.show = true;
+        },
+        doClose() {
+            this.status = false;
+            this.show = false;
+        },
+        formatTime(time) {
+            const hh = prefixIntrger(time.getHours(), 2);
+            const mm = prefixIntrger(time.getMinutes(), 2);
+            const ss = prefixIntrger(time.getSeconds(), 2);
+            return `${hh}:${mm}:${ss}`;
+        },
+        handleSure() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.status = true;
+                    const model = {
+                        time: this.formatTime(this.formModel.time)
+                    };
+                    modifySystemTime(model, this.group).then(resp => {
+                        this.status = false;
+                        this.$message.success('修改系统时间成功！');
+                    }).catch(() => {
+                        this.status = false;
+                        this.$messageBox('修改系统时间失败，请稍后再试');
+                    });
+                    this.doClose();
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/runPlanView.vue b/src/views/newMap/display/runPlanView.vue
new file mode 100644
index 000000000..53d424383
--- /dev/null
+++ b/src/views/newMap/display/runPlanView.vue
@@ -0,0 +1,657 @@
+<template>
+  <el-dialog
+    v-dialogLoading="dialogLoading"
+    :title="title"
+    :width="maxWidth + 'px'"
+    top="0"
+    :style="{left:$store.state.app.width> 1920? '50%': '0'}"
+    :visible.sync="dialogShow"
+    :before-close="doClose"
+    :close-on-click-modal="false"
+    :modal="false"
+  >
+    <div id="PlanSchedule" :style="{top: top+'px', height: height+'px'}">
+      <div class="left">
+        <div :id="runPlanId" />
+      </div>
+      <div class="right">
+        <data-table
+          ref="serviceTable1"
+          :height="height/2"
+          :config="serviceNumberConfig"
+          :style="{top: top-height/2+'px'}"
+          @touch="scheduleTouch"
+        />
+        <data-table
+          ref="tripTable1"
+          :height="height/2"
+          :config="tripNumberConfig"
+          :style="{top: top-height/2+'px'}"
+          @touch="trainNumTouch"
+        />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+import DataTable from '@/views/planSchedule/menusPlan/components/dataTable';
+import echarts from 'echarts';
+import {toTimeStamp, formatDuring} from '@/utils/date';
+import { deepAssign } from '@/utils/index';
+import { EventBus } from '@/scripts/event-bus';
+let myChart = null;
+export default {
+    name: 'PlanSchedule',
+    components: {
+        DataTable
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            top: 0,
+            height: 0,
+            inter:null,
+            runPlanId: 'run-plan-view',
+            // myChart: null,
+            PlanParser: {},
+            serviceNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: '表号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: '车次号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            realData: {},
+            kmRangeMap: {},
+            absoluteTime: 2 * 3600,
+            indexKmRangeMap: {},
+            dialogLoading: false,
+            dialogShow: false,
+            seriesMap: {},
+            staticSeries: [],
+            runSeries: [],
+            selectSeries: [],
+            runPlanData: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        maxWidth() {
+            return this.$store.state.app.width > 1920 ? 1920 : this.$store.state.app.width;
+        },
+        maxHeight() {
+            return this.$store.state.app.height > 1080 ? 1080 : this.$store.state.app.height;
+        },
+        title() {
+            return this.$t('display.runPlan.previewRunDiagram');
+        }
+    },
+    watch: {
+        maxWidth() {
+            this.setPosition();
+        },
+        maxHeight() {
+            this.setPosition();
+        },
+        '$store.state.runPlan.planLoadedCount': async function () {
+            try {
+                await this.loadChartPage();
+                this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+                if (this.dialogShow) {
+                    await this.loadInitData();
+                }
+            } catch (e) {
+                console.error(e);
+            } finally {
+                this.loading = false;
+            }
+        },
+        '$store.state.socket.simulationReset': function (val) {
+            this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+            if (this.dialogShow) {
+                this.loadInitData();
+            }
+        },
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.socket.trainStationList': function (val) {
+            if (val.length) {
+                this.updateRunPlanData(val);
+            }
+        }
+    },
+    mounted() {
+        this.staticSeries = []; this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+        this.PlanParser = this.$theme.loadPlanParser(this.$route.query.lineCode);
+        // this.loadChartPage();
+        EventBus.$on('clearRunSeries', () => {
+            this.runSeries = [];
+        });
+    },
+    beforeDestroy() {
+        this.$store.dispatch('runPlan/setSelected', null);
+        this.destroy();
+    },
+    methods: {
+        async doShow() {
+            try {
+                this.dialogLoading = true;
+                this.dialogShow = true;
+                this.setPosition();
+                this.loadInitData();
+                this.inter && clearInterval(this.inter);
+            } catch (e) {
+                console.error(e);
+            } finally {
+                this.dialogLoading = false;
+            }
+        },
+        async doClose() {
+            this.dialogShow = false;
+            this.inter && clearInterval(this.inter);
+        },
+        serviceNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
+                this.renderTripNumber({ serviceNumber: row.serviceNumber, tripNumber: null });
+                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
+                if (serviceObj) {
+                    this.analyticalTripNumber(serviceObj.trainMap);
+                }
+            }
+        },
+        tripNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+                this.renderTripNumber({ serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+            }
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].tripNumber - data[b].tripNumber; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                const top = 54;
+                const width = this.maxWidth * 0.85;
+                let height = this.maxHeight;
+
+                height = height - top;
+                this.$store.dispatch('runPlan/resize', { width, height });
+
+                if (this.top != top) {
+                    this.top = top;
+                }
+
+                if (this.height != height) {
+                    this.height = height - top;
+                }
+            });
+        },
+        updateRunPlanData(data) {
+            const stations = this.$store.state.runPlan.stations;
+            data.forEach(item => {
+                item.secondTime = item.second;
+            });
+            this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
+            this.runSeries = this.PlanParser.updateDataToModels(data, stations, this.kmRangeMap,
+                this.runPlanData, this.runSeries, { color: '#FF00DE', width: 2 }
+            );
+            const series = [...this.staticSeries, ...this.runSeries, ... this.selectSeries];
+            myChart && myChart.setOption({series: series});
+        },
+        async loadChartPage() {
+            try {
+                this.seriesMap = {};
+                this.staticSeries = [];
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
+                if (this.$route.query.lineCode === '07') {
+                    this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisX(stations)]);
+                } else {
+                    this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisY(stations)]);
+                }
+                this.staticSeries = this.pushModels(this.staticSeries, this.PlanParser.convertDataToModels(planData, stations, this.kmRangeMap, { color: '#000', width: 0.5 }));
+                this.staticSeries.forEach(item => {
+                    this.seriesMap[item.name] = item;
+                });
+                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+            } catch (error) {
+                console.log(error);
+                this.$messageBox(`加载运行图数据失败`);
+            }
+        },
+
+        async loadInitData() {
+            myChart && myChart.showLoading();
+            const option = {
+                tooltip: {
+                    axisPointer: {
+                        trigger: 'item',
+                        type: 'cross'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1
+                },
+                grid: {
+                    right: '40px',
+                    left: '120px',
+                    height: '85%'
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        yAxisIndex: 0,
+                        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'
+                            }
+                        }
+                    }
+                ],
+                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: [
+
+                ]
+            };
+            const hebXAxis = {
+                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
+            };
+            const hebYAxis = [
+                {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: [],
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 2,
+                            color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        formatter: this.xAxisLableFormat,
+                        textStyle: {
+                            color: '#333'
+                        }
+                    },
+                    axisPointer: {
+                        snap: true,
+                        label: {
+                            formatter: this.xAxisPointFormat,
+                            backgroundColor: 'rgb(255,0,0,0.5)',
+                            color: 'white'
+                        }
+                    }
+                }
+            ];
+            const hebDataZoom = [
+                {
+                    type: 'inside',
+                    yAxisIndex: 0
+                },
+                {
+                    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%',
+                    yAxisIndex: 0,
+                    handleStyle: {
+                        color: '#fff',
+                        shadowBlur: 3,
+                        shadowColor: 'rgba(0, 0, 0, 0.6)',
+                        shadowOffsetX: 2,
+                        shadowOffsetY: 2
+                    },
+                    left: '20px'
+                }
+            ];
+            if (this.$route.query.lineCode === '07') {
+                option.xAxis = hebXAxis;
+                option.yAxis = hebYAxis;
+                option.dataZoom = hebDataZoom;
+            }
+            await this.xAxisInit(option);
+            await this.yAxisInit(option);
+            await this.loadInitChart(option);
+            myChart && myChart.hideLoading();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+            return series;
+        },
+        loadInitChart(option) {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.destroy();
+                    let startValue = 3600 + this.PlanParser.getTranslation();
+                    const offsetTime = 3600;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                    startValue = initTime - this.PlanParser.getTranslation();
+                    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];
+                    myChart = echarts.init(document.getElementById(this.runPlanId));
+                    if (myChart) {
+                        myChart.setOption(option);
+                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                        myChart.on('click', this.mouseClick);
+                    }
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.PlanParser.computedFormatAxisY(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            return timeFormat(value);
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit(option) {
+            const list = [];
+            for (var time = 0 + this.PlanParser.getTranslation(); time < 3600 * 24 + this.PlanParser.getTranslation(); time++) {
+                list.push(time);
+            }
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
+
+            if (this.$route.query.lineCode === '07') {
+                option.yAxis[0].data = list;
+            } else {
+                option.xAxis[0].data = list;
+            }
+            if (!option.dataZoom[0].startValue) {
+                option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue - offsetTime;
+            }
+
+            if (!option.dataZoom[0].endValue) {
+                option.dataZoom[0].endValue = option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit(option) {
+            if (Object.keys(this.PlanParser).length && this.$route.query.lineCode !== '07') {
+                option.yAxis.min = this.PlanParser.computedAxisYMinValue(this.stations);
+                option.yAxis.max = this.PlanParser.computedAxisYMaxValue(this.stations);
+            } else if (Object.keys(this.PlanParser).length && this.$route.query.lineCode === '07') {
+                option.xAxis.min = this.PlanParser.computedAxisXMinValue(this.stations);
+                option.xAxis.max = this.PlanParser.computedAxisXMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            const station = (this.$store.getters['map/getDeviceByCode'](param.data[2])) || { name: '', kmRange: '' };
+            if (this.$route.query.lineCode !== '07') {
+                if (station.name) {
+                    return [
+                        `Point Data <hr size=1 style=" margin: 3px 0">`,
+                        `车站名称: ${station.name}<br>`,
+                        `车站公里标: ${station.kmRange} km <br>`,
+                        `到站时间: ${timeFormat(param.data[0] + this.PlanParser.getTranslation())} (${param.data[0]})<br>`
+                    ].join('');
+                } else {
+                    return '';
+                }
+            } else {
+
+                return [
+                    `Point Data <hr size=1 style=" margin: 3px 0">`,
+                    `车站名称: ${station.name}<br>`,
+                    `车站公里标: ${station.kmRange} km <br>`,
+                    `到站时间: ${timeFormat(param.data[1] + this.PlanParser.getTranslation())} (${param.data[1]})<br>`
+                ].join('');
+            }
+
+        },
+        renderTripNumber(params) {
+            const tripNumber = params.tripNumber; // 车次号
+            const serviceNumber = params.serviceNumber; // 服务号
+            let data, markPoint;
+            if (tripNumber && this.seriesMap[serviceNumber]) {
+                const temp = this.seriesMap[serviceNumber].data.filter(elem => elem[3] == tripNumber);
+                if (temp.length) {
+                    data = temp;
+                    this.seriesMap[serviceNumber].markPoint.data.forEach(each=> {
+                        if (each.name == temp[0][4]) {
+                            markPoint = deepAssign({}, {data:[each]});
+                            markPoint.symbol = 'roundRect';
+                            markPoint.symbolSize = 1;
+                            markPoint.data[0].label.color = '#f00';
+                        }
+                    });
+                }
+            } else if (this.seriesMap[serviceNumber]) {
+                markPoint = deepAssign({}, this.seriesMap[serviceNumber].markPoint);
+                markPoint.data.forEach((each, index) => {
+                    if (each.symbol == 'circle') {
+                        markPoint.data.splice(index, 1);
+                    } else {
+                        each.label.color = '#f00';
+                    }
+                });
+                data = this.seriesMap[serviceNumber].data;
+            }
+            this.selectSeries = [{
+                name: 'trainLabel',
+                lineStyle: {
+                    color: '#f00',
+                    width: 2,
+                    type: 'solid'
+                },
+                z: 10,
+                type: 'line',
+                markPoint:markPoint,
+                animation: false,
+                data: data
+            }];
+            const series = [...this.staticSeries, ...this.runSeries, ...this.selectSeries];
+            myChart && myChart.setOption({series: series});
+        },
+        mouseClick(params) {
+            const model = {
+                serviceNumber: params.seriesName
+            };
+            this.$store.dispatch('runPlan/setSelected', model);
+        },
+        reSize(opt) {
+            if (myChart) {
+                myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (myChart && myChart.isDisposed) {
+                myChart.dispose();
+                myChart = null;
+            }
+        },
+        scheduleTouch() {
+
+        },
+        trainNumTouch() {
+
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    #PlanSchedule {
+        z-index: 5;
+        position: absolute;
+        width: 100%;
+
+        .left {
+            height: 100%;
+            width: 85%;
+            float: left;
+        }
+
+        .right {
+            height: 100%;
+            width: 15%;
+            float: right;
+        }
+    }
+
+    /deep/ {
+		.el-dialog {
+			height: 100%;
+			max-height: 1080px;
+		}
+        .el-dialog__body {
+            padding: 0px !important;
+            background-color: floralwhite !important;
+        }
+		.el-dialog__headerbtn .el-dialog__close {
+			font-size: 18px;
+			border: 1px solid #909399;
+			border-radius: 5px;
+		}
+    }
+</style>
diff --git a/src/views/newMap/display/scheduling.vue b/src/views/newMap/display/scheduling.vue
new file mode 100644
index 000000000..1c7c81d2d
--- /dev/null
+++ b/src/views/newMap/display/scheduling.vue
@@ -0,0 +1,356 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      :title="title"
+      :visible.sync="show"
+      top="50px"
+      width="95%"
+      :before-do-close="doClose"
+      :close-on-click-modal="false"
+      :z-index="2000"
+    >
+      <div class="scheduling">
+        <el-card class="scheduling_header">
+          <el-form>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item :label="$t('display.schedule.scheduleSelect')">
+                  <el-date-picker
+                    v-model="formModel.planDate"
+                    clearable
+                    size="small"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    :picker-options="pickerOptions"
+                    @change="handleQuery"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item :label="$t('display.schedule.runDiagramName')">
+                  <!--<el-select v-model="formModel.runPlanName" size="small" style="display: inline-block">-->
+                  <!--<el-option-->
+                  <!--v-for="item in runPlanList"-->
+                  <!--:key="item.value"-->
+                  <!--:label="item.label"-->
+                  <!--:value="item.value"-->
+                  <!--/>-->
+                  <!--</el-select>-->
+                  <el-input v-model="formModel.runPlanName" size="small" style="width:140px;" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item style="text-align: right">
+                  <el-button-group>
+                    <el-button size="small" type="primary" @click="handleSave">{{ $t('display.schedule.save') }}</el-button>
+                  </el-button-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-card>
+        <div class="scheduling_body">
+          <div class="scheduling_body-table">
+            <edit-table ref="table" v-loading="loading" border stripe :table-data="tableData" :table-form="tableForm" :row-style="handleRowStyle" />
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { querySechedulingNew, generateSchedulingNew, saveSchedulingNew } from '@/api/scheduling';
+import { hexColor } from '@/jmapNew/theme/parser/util';
+import EditTable from '@/views/components/editTable/index';
+
+// 排班计划弹窗列表
+export default {
+    name: 'Scheduling',
+    components: {
+        EditTable
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            show: false,
+            loading: false,
+            runPlanList: [],
+            groupNumberList: [],
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() < Date.now() - 24 * 3600 * 1000;
+                }
+            },
+            formModel: {
+                id: '',
+                mode: '',
+                planDate: '',
+                runPlanName: ''
+            },
+            tableForm: {
+                index: true,
+                columns: [
+                    // {
+                    //     title: this.$t('display.schedule.driverNumber'),
+                    //     prop: 'driverCode',
+                    //     type: 'text'
+                    // },
+                    {
+                        title: this.$t('display.schedule.trainNumber'),
+                        prop: 'groupNumber',
+                        type: 'select',
+                        width: '150',
+                        options: () => { return this.groupNumberList; },
+                        editable: true,
+                        editing: true
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineSection'),
+                        prop: 'outDepotTrip.outDepotSectionCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotSectionCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineServerNumber'),
+                        prop: 'outDepotTrip.serviceNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.serviceNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTargetNumber'),
+                        prop: 'outDepotTrip.destinationCode',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.destinationCode; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTime'),
+                        prop: 'outDepotTrip.outDepotTime',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.outDepotTime; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTripNumber'),
+                        prop: 'outDepotTrip.tripNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.tripNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.outDepot'),
+                        prop: 'outDepotTrip.outDepotCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.outDepotStatus'),
+                        prop: 'outDepotTrip.status',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.outDepotTrip.status, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.outDepotTrip.status) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineSection'),
+                        prop: 'offlineSection',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotSectionCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineServerNumber'),
+                        prop: 'offlineServerNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.serviceNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTargetNumber'),
+                        prop: 'offlineTargetNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.destinationCode; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTime'),
+                        prop: 'offlineTime',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.inDepotTime; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTripNumber'),
+                        prop: 'offlineTripNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.tripNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.inDepot'),
+                        prop: 'inDepot',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.inDepotStatus'),
+                        prop: 'inStatus',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.inDepotTrip.status, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.inDepotTrip.status) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    }
+                ]
+            },
+            tableData: []
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('display.schedule.schedulePlan');
+        }
+    },
+    watch: {
+        '$store.state.map.mapDataLoadedCount': function () {
+            const trainList = this.$store.state.map.map.trainList || [];
+            this.groupNumberList = [];
+            trainList.forEach(item => {
+                this.groupNumberList.push({value: item.code, label: item.groupNumber});
+            });
+        }
+    },
+    methods: {
+        doShow() {
+            this.formModel.day = '';
+            this.show = true;
+        },
+        doClose() {
+            this.show = false;
+        },
+        handleQuery(day) {
+            if (day) {
+                this.loading = true;
+                querySechedulingNew(this.group, {day}).then(resp => {
+                    if (!resp.data) {
+                        this.$confirm(this.$t('display.schedule.noSchedulePlan'), this.$t('global.tips'), {
+                            confirmButtonText: this.$t('global.confirm'),
+                            cancelButtonText: this.$t('global.cancel'),
+                            type: 'warning'
+                        }).then(() => {
+                            this.handleGenerate(day);
+                        }).catch(() => {
+                            this.clearData();
+                            this.loading = false;
+                        });
+                    } else {
+                        this.tableData = this.initTableData(resp.data.planList || []);
+                        this.formModel.id = resp.data.id;
+                        this.formModel.planDate = resp.data.planDate;
+                        this.formModel.runPlanName = resp.data.runPlanName;
+                        this.$message.success(`${this.$t('display.schedule.loadData')} ${day} ${this.$t('display.schedule.schedulePlanSuccess')}`);
+                        this.loading = false;
+                    }
+                }).catch(error => {
+                    this.clearData();
+                    this.$messageBox(`${error.message}`);
+                    this.loading = false;
+                });
+            }
+        },
+        handleGenerate(day) {
+            generateSchedulingNew(this.group, {day}).then(resp => {
+                this.loading = false;
+                this.tableData = this.initTableData(resp.data.planList || []);
+                this.formModel.id = resp.data.id;
+                // this.formModel.planDate = resp.data.planDate;
+                this.formModel.runPlanName = resp.data.runPlanName;
+                this.$message.success(this.$t('display.schedule.createSchedulePlanSuccess'));
+            }).catch(error => {
+                this.loading = false;
+                this.clearData();
+                this.$messageBox(`${error.message}`);
+            });
+        },
+        handleSave() {
+            if (this.formModel.planDate) {
+                saveSchedulingNew(this.group, this.tableData).then(resp => {
+                    if (resp.data && !resp.data.pass) {
+                        this.setConflictList(resp.data.conflictList);
+                        this.$message.warning(this.$t('display.schedule.checkFailed'));
+                    } else {
+                        this.setConflictList([]);
+                        this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess'));
+                    }
+                }).catch(() => {
+                    this.$messageBox(this.$t('display.schedule.saveSchedulePlanFail'));
+                });
+            } else {
+                this.$messageBox(this.$t('display.schedule.selectSchedulePlan'));
+            }
+
+        },
+        handleRowStyle({row, rowIndex}) {
+            return row['$conflict'] ? {background: row.$conflict} : {background: '#FFF'};
+        },
+        setConflictList(list) {
+            this.tableData.forEach(elem => { elem['$conflict'] = null; });
+            if (list && list.length) {
+                list.forEach(idList => {
+                    const color = hexColor.colorRandom();
+                    this.tableData.forEach(elem => {
+                        if (idList.includes(parseInt(elem.id))) {
+                            elem['$conflict'] = color;
+                        }
+                    });
+                });
+            }
+            this.tableData = [...this.tableData];
+        },
+        initTableData(tableData) {
+            tableData.forEach(elem => {
+                this.$set(elem, '$conflict', null);
+            });
+
+            return tableData;
+        },
+        clearData() {
+            this.formModel.planDate = '';
+            this.tableData = [];
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code) || {};
+            return device.name;
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+	.scheduling {
+		&_header {
+			background: #fff;
+			padding: 30px 30px 0;
+		}
+		&_body {
+			margin-top: 30px;
+			background: #ffff;
+			border: 1px solid #F1F1F1;
+			width: 100%;
+			overflow: auto;
+		}
+	}
+
+	/deep/ .el-dialog__body {
+		background: #fafafa;
+	}
+
+	/deep/ label {
+		font-weight: 0;
+	}
+</style>
diff --git a/src/views/newMap/display/schedulingView.vue b/src/views/newMap/display/schedulingView.vue
new file mode 100644
index 000000000..3bf481d27
--- /dev/null
+++ b/src/views/newMap/display/schedulingView.vue
@@ -0,0 +1,254 @@
+<template>
+  <div>
+    <el-dialog
+      v-dialogDrag
+      :title="title"
+      :visible.sync="show"
+      top="50px"
+      width="95%"
+      :before-do-close="doClose"
+      :close-on-click-modal="false"
+      :z-index="2000"
+    >
+      <div class="scheduling">
+        <div class="scheduling_body">
+          <div class="scheduling_body-table">
+            <edit-table ref="table" v-loading="loading" border stripe :table-data="tableData" :table-form="tableForm" :row-style="handleRowStyle" />
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { queryCurrentSecheduling } from '@/api/scheduling';
+import { hexColor } from '@/jmapNew/theme/parser/util';
+import EditTable from '@/views/components/editTable/index';
+
+// 排班计划弹窗列表
+export default {
+    name: 'AddQuest',
+    components: {
+        EditTable
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            show: false,
+            loading: false,
+            runPlanList: [],
+            groupNumberList: [],
+            tableForm: {
+                index: true,
+                columns: [
+                    // {
+                    //     title: this.$t('display.schedule.driverNumber'),
+                    //     prop: 'driverCode',
+                    //     type: 'text'
+                    // },
+                    {
+                        title: this.$t('display.schedule.trainNumber'),
+                        prop: 'groupNumber',
+                        type: 'select',
+                        width: '150',
+                        options: () => { return this.groupNumberList; },
+                        editable: false,
+                        editing: false
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineSection'),
+                        prop: 'outDepotTrip.outDepotSectionCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotSectionCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineServerNumber'),
+                        prop: 'outDepotTrip.serviceNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.serviceNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTargetNumber'),
+                        prop: 'outDepotTrip.destinationCode',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.destinationCode; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTime'),
+                        prop: 'outDepotTrip.outDepotTime',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.outDepotTime; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTripNumber'),
+                        prop: 'outDepotTrip.tripNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.tripNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.outDepot'),
+                        prop: 'outDepotTrip.outDepotCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.outDepotStatus'),
+                        prop: 'outDepotTrip.status',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.outDepotTrip.status, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.outDepotTrip.status) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineSection'),
+                        prop: 'offlineSection',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotSectionCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineServerNumber'),
+                        prop: 'offlineServerNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.serviceNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTargetNumber'),
+                        prop: 'offlineTargetNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.destinationCode; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTime'),
+                        prop: 'offlineTime',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.inDepotTime; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTripNumber'),
+                        prop: 'offlineTripNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.tripNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.inDepot'),
+                        prop: 'inDepot',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.inDepotStatus'),
+                        prop: 'inStatus',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.inDepotTrip.status, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.inDepotTrip.status) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    }
+                ]
+            },
+            tableData: []
+        };
+    },
+    computed: {
+        title() {
+            return '派班计划预览';
+        }
+    },
+    watch: {
+        '$store.state.map.mapDataLoadedCount': function () {
+            const trainList = this.$store.state.map.map.trainList || [];
+            this.groupNumberList = [];
+            trainList.forEach(item => {
+                this.groupNumberList.push({value: item.code, label: item.groupNumber});
+            });
+        }
+    },
+    methods: {
+        doShow() {
+            this.initData();
+            this.show = true;
+        },
+        doClose() {
+            this.show = false;
+        },
+        initData() {
+            this.loading = true;
+            queryCurrentSecheduling(this.group).then(resp => {
+                this.tableData = [];
+                if (resp.data) {
+                    this.tableData = this.initTableData(resp.data.planList || []);
+                    // this.$message.success(`${this.$t('display.schedule.loadData')}${this.$t('display.schedule.schedulePlanSuccess')}`);
+                }
+                this.loading = false;
+            }).catch(error => {
+                this.$messageBox(`${error.message}`);
+                this.loading = false;
+            });
+        },
+        handleRowStyle({row, rowIndex}) {
+            return row['$conflict'] ? {background: row.$conflict} : {background: '#FFF'};
+        },
+        setConflictList(list) {
+            this.tableData.forEach(elem => { elem['$conflict'] = null; });
+            if (list && list.length) {
+                list.forEach(idList => {
+                    const color = hexColor.colorRandom();
+                    this.tableData.forEach(elem => {
+                        if (idList.includes(parseInt(elem.id))) {
+                            elem['$conflict'] = color;
+                        }
+                    });
+                });
+            }
+            this.tableData = [...this.tableData];
+        },
+        initTableData(tableData) {
+            tableData.forEach(elem => {
+                this.$set(elem, '$conflict', null);
+            });
+
+            return tableData;
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code) || {};
+            return device.name;
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+	.scheduling {
+		&_header {
+			background: #fff;
+			padding: 30px 30px 0;
+		}
+		&_body {
+			margin-top: 30px;
+			background: #ffff;
+			border: 1px solid #F1F1F1;
+			width: 100%;
+			overflow: auto;
+		}
+	}
+
+	/deep/ .el-dialog__body {
+		background: #fafafa;
+	}
+
+	/deep/ label {
+		font-weight: 0;
+	}
+</style>
diff --git a/src/views/newMap/display/simulationMenu/contectUs.vue b/src/views/newMap/display/simulationMenu/contectUs.vue
new file mode 100644
index 000000000..d24838220
--- /dev/null
+++ b/src/views/newMap/display/simulationMenu/contectUs.vue
@@ -0,0 +1,61 @@
+<template>
+  <el-dialog
+    title="联系方式"
+    :visible.sync="dialogVisible"
+    width="400px"
+    :before-close="handleClose"
+  >
+    <div v-if="thirdLogin">
+      <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;话：4000500081</div>
+      <div class="eachInfo"><span class="el-icon-message" style="font-size:15px;margin-right:7px;" />邮&nbsp;&nbsp;&nbsp;&nbsp;箱：zhrc@richortech.com</div>
+      <div class="eachInfo"><span class="el-icon-connection" style="font-size:15px;margin-right:7px;" />网&nbsp;&nbsp;&nbsp;&nbsp;址：www.richortech.com</div>
+    </div>
+    <div v-else>
+      <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;机：13910989830</div>
+      <div class="eachInfo"><span class="el-icon-message" style="font-size:15px;margin-right:7px;" />邮&nbsp;&nbsp;&nbsp;&nbsp;箱：henry@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>
+    </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';
+import { getSessionStorage } from '@/utils/auth';
+import { RichorContectUsList } from '@/scripts/ProjectConfig';
+export default {
+    name:'',
+    data() {
+        return {
+            dialogVisible:false,
+            wchatImg: wchat
+        };
+    },
+    computed:{
+        thirdLogin() {
+            return RichorContectUsList.includes(getSessionStorage('project'));
+        }
+    },
+    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/displayCity/demon/equipment.vue b/src/views/newMap/display/simulationMenu/deviceManage.vue
similarity index 91%
rename from src/views/newMap/displayCity/demon/equipment.vue
rename to src/views/newMap/display/simulationMenu/deviceManage.vue
index 781517835..222cc0244 100644
--- a/src/views/newMap/displayCity/demon/equipment.vue
+++ b/src/views/newMap/display/simulationMenu/deviceManage.vue
@@ -40,7 +40,7 @@ import { EventBus } from '@/scripts/event-bus';
 import { getSessionStorage } from '@/utils/auth';
 
 export default {
-    name: 'Equipment',
+    name: 'DeviceManage',
     data() {
         return {
             show: false,
@@ -76,11 +76,11 @@ export default {
             this.connect(this.tableData[this.index]);
         });
     },
-    async beforeDestroy() {
+    beforeDestroy() {
         EventBus.$off('selectDevice');
     },
     methods: {
-        async doShow() {
+        doShow() {
             this.show = true;
             this.group = this.$route.query.group;
             this.getList();
@@ -98,8 +98,10 @@ export default {
                     } else {
                         item.buttonShowType = false;
                         item.typeName = this.typeList.find(el => el.value == item.type).label;
-                        if (item.vrDeviceCode) {
+                        if (item.vrDeviceCode && this.$store.getters['map/getDeviceByCode'](item.vrDeviceCode)) {
                             item.vrDeviceName = this.$store.getters['map/getDeviceByCode'](item.vrDeviceCode).name;
+                        } else {
+                            item.vrDeviceName = item.vrDeviceCode;
                         }
                         if (this.project == 'heb' || this.project == 'designheb') {
                             if (item.type == 'SWITCH') {
@@ -123,7 +125,7 @@ export default {
             this.tableData.splice(index, 1, row);
             this.$store.dispatch('map/selectDeviceCode', {flag: row.buttonShowType, type: row.type});
         },
-        async connect(row) {
+        connect(row) {
             this.$confirm(`您确定连接${this.typeObj[this.selected._type] || '设备'}: ${this.selected.name}, 是否继续?`, '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -142,7 +144,7 @@ export default {
                 }
             });
         },
-        async cancel(row, index) {
+        cancel(row, index) {
             this.$confirm('您确定将次设备断开, 是否继续?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -168,29 +170,29 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-	.plc_box{
-		float: left;
-		margin-right: 40px;
-		padding: 9px;
+.plc_box{
+	float: left;
+	margin-right: 40px;
+	padding: 9px;
+}
+.freshen_box{
+	float: right;
+}
+.flex_box{
+	float: left;
+	margin-right: 5px;
+	line-height: 30px;
+}
+/deep/ {
+	.el-dialog__wrapper{
+		width: 800px;
 	}
-	.freshen_box{
-		float: right;
+	.dialog_box{
+		height: 100%;
 	}
-	.flex_box{
-		float: left;
-		margin-right: 5px;
-		line-height: 30px;
-	}
-	/deep/ {
-		.el-dialog__wrapper{
-			width: 800px;
-		}
-		.dialog_box{
-			height: 100%;
-		}
-		.el-dialog__body{
-			padding-top: 6px;
-			height: calc(100% - 54px);
-		}
+	.el-dialog__body{
+		padding-top: 6px;
+		height: calc(100% - 54px);
 	}
+}
 </style>
diff --git a/src/views/newMap/display/simulationMenu/flowData.vue b/src/views/newMap/display/simulationMenu/flowData.vue
new file mode 100644
index 000000000..57f1f44ce
--- /dev/null
+++ b/src/views/newMap/display/simulationMenu/flowData.vue
@@ -0,0 +1,188 @@
+<template>
+  <el-dialog
+    title="切换客流数据"
+    :visible.sync="flowDataShow"
+    top="150px"
+    width="400px"
+    :before-do-close="flowDataClose"
+    :close-on-click-modal="false"
+    :z-index="5000"
+  >
+    <div>
+      <el-form ref="ruleForm" label-width="100px">
+        <el-form-item label="客流数据:" prop="role">
+          <el-select v-model="currentFlowDataId" placeholder="请选择客流数据" @change="changeData">
+            <el-option
+              v-for="item in flowDataList"
+              :key="item.id"
+              :label="item.name==currentFlowDataName?item.name+' [运行中]':item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="flowDataClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" :disabled="isDisabled" :loading="loading" @click="confirmFlowData">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { getPassengerFlowData, changePassengerFlowData } from '@/api/simulation';
+import { getToken } from '@/utils/auth';
+import { creatSubscribe, clearSubscribe, LPFTopic} from '@/utils/stomp';
+import { defaultCallback } from '@/utils/subscribeCallback';
+export default {
+    name:'FlowData',
+    data() {
+        return {
+            group:'',
+            flowDataList:[],
+            currentFlowDataName:'',
+            currentFlowDataId:'',
+            flowDataShow:false,
+            isDisabled:false,
+            loading:false
+        };
+    },
+    computed:{
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        running() {
+            return this.$store.state.training.started;
+        },
+        isDisable() {
+            return this.$store.state.training.started;
+        }
+    },
+    watch:{
+        '$store.state.map.mapViewLoadedCount':function() {
+            // this.$store.dispatch('map/setTrainWindowShow', false);
+            // this.$jlmap.off('zoom');
+            if (this.group) {
+                getPassengerFlowData(this.mapId).then(res=>{
+                    this.flowDataList = res.data;
+                    const currentFlowData = res.data.find(each=>{ return each.initial; });
+                    if (currentFlowData) {
+                        this.currentFlowDataName = currentFlowData.name;
+                        this.currentFlowDataId = currentFlowData.id;
+                    }
+                    // this.subscribe();
+                });
+            }
+        },
+        '$store.state.socket.simulationStart': function(val) {
+            this.$store.dispatch('training/simulationStart').then(() => {
+                this.$store.dispatch('map/setShowCentralizedStationNum');
+            });
+        },
+        '$store.state.socket.standPfiNum':function(val) {
+            if (val) {
+                // console.log(val, 'standPfiNum');
+                const stationNumList = val;
+                stationNumList.forEach(stationNum=>{
+                    stationNum.deviceType = 'STAND';
+                    stationNum.code = stationNum.standCode;
+                });
+                this.$store.dispatch('training/updateMapState', stationNumList);
+            }
+        },
+        '$store.state.socket.trainPfiNum':function(val) {
+            if (val) {
+                // console.log(val, 'trainPfiNum');
+                const trainNumList = this.$store.state.socket.trainPfiNum;
+                trainNumList.forEach(stationNum=>{
+                    stationNum.deviceType = 'TRAIN';
+                });
+                this.$store.dispatch('training/updateMapState', trainNumList);
+            }
+        },
+        '$store.state.socket.trainPfiBL':function(val) {
+            if (val) {
+                const trainNum = this.$store.state.socket.trainPfiBL;
+                // const device = this.$store.getters['map/getDeviceByCode'](trainNum.code);
+                trainNum.deviceType = 'TRAIN';
+                // console.log(trainNum, device, device.num, trainNum.in, trainNum.out, 'changed');
+                trainNum.num = trainNum.remain;
+                //  device.num + trainNum.in - trainNum.out;
+                // console.log(trainNum.num, 'changeder');
+                this.$store.dispatch('training/updateMapState', [trainNum]);
+            }
+        },
+        '$store.state.socket.isFirst':function(val) {
+            if (val) {
+                const header = { group: this.group || '', 'X-Token': getToken() };
+                creatSubscribe(`${LPFTopic}\/${this.$route.query.group}`, header, defaultCallback);
+            }
+        }
+    },
+    beforeDestroy() {
+        if (this.group) {
+            this.clearSubscribe();
+            this.$store.dispatch('socket/resetTrainPassagerNum');
+            this.$store.dispatch('socket/setIsFirst', false);
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+    },
+    methods:{
+        doShow() {
+            if (!this.flowDataShow) {
+                this.flowDataShow = true;
+                this.isDisabled = true;
+                const simulationWorkParam = this.$store.state.socket.simulationWorkParam;
+                if (this.currentFlowDataName) {
+                    const currentFlowData = this.flowDataList.find(each=>{ return each.name == this.currentFlowDataName; });
+                    if (currentFlowData) { this.currentFlowDataId = currentFlowData.id; }
+                } else {
+                    if (simulationWorkParam && simulationWorkParam.itemMap && simulationWorkParam.itemMap.LPF) {
+                        const currentFlowData = this.flowDataList.find(each=>{ return each.id == simulationWorkParam.itemMap.LPF; });
+                        if (currentFlowData) {
+                            this.currentFlowDataId = currentFlowData.id;
+                            this.currentFlowDataName = currentFlowData.name;
+                        }
+                    }
+                }
+
+            }
+        },
+        clearSubscribe() {
+            clearSubscribe(`${LPFTopic}\/${this.group}`);
+            // clearSubscribe(`${displayTopic}\/${this.group}`);
+        },
+        flowDataClose() {
+            this.flowDataShow = false;
+        },
+        confirmFlowData() {
+            if (this.currentFlowDataId) {
+                this.loading = true;
+                changePassengerFlowData(this.group, this.currentFlowDataId).then(res=>{
+                    this.$store.dispatch('socket/resetTrainPassagerNum');
+                    // this.$store.dispatch('map/mapClear');
+                    this.flowDataShow = false;
+                    const currentFlowData = this.flowDataList.find(each=>{ return each.id == this.currentFlowDataId; });
+                    if (currentFlowData) { this.currentFlowDataName = currentFlowData.name; }
+                    this.loading = false;
+                }).catch(error=>{
+                    this.loading = false;
+                    this.$messageBox('切换客流数据失败');
+                    console.log(error.message);
+                });
+            } else {
+                this.$messageBox('当前的客流数据不存在');
+            }
+        },
+        changeData(id) {
+            const currentFlowData = this.flowDataList.find(each=>{ return each.id == id; });
+            if (currentFlowData && currentFlowData.name == this.currentFlowDataName) {
+                this.isDisabled = true;
+            } else {
+                this.isDisabled = false;
+            }
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/displayCity/demon/setTime.vue b/src/views/newMap/display/simulationMenu/setTime.vue
similarity index 52%
rename from src/views/newMap/displayCity/demon/setTime.vue
rename to src/views/newMap/display/simulationMenu/setTime.vue
index d189fea63..52ea3e3a7 100644
--- a/src/views/newMap/displayCity/demon/setTime.vue
+++ b/src/views/newMap/display/simulationMenu/setTime.vue
@@ -1,18 +1,13 @@
 <template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="550px" :before-close="doClose">
+  <el-dialog v-dialogDrag :title="title" :visible.sync="show" width="550px" center :before-close="doClose">
     <el-form ref="form" label-width="120px" :model="formModel" :rules="rules">
       <el-form-item :label="$t('display.setTime.systemTime')" prop="initTime">
         <el-time-picker
           v-model="formModel.initTime"
           :picker-options="pickerOptions"
           :placeholder="$t('display.setTime.anyTime')"
-          @change="handleChange"
         />
       </el-form-item>
-      <el-form-item v-if="hasNumber" :label="$t('display.setTime.loadTrainNum')" prop="loadNum">
-        <el-input-number v-model="formModel.loadNum" :min="1" :max="maxNumber" :label="$t('display.setTime.selectLoadTrainNum')" />
-        <span> {{ ` (${$t('display.setTime.maxTrainNum')} ：${maxNumber}) ` }} </span>
-      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="show = false">{{ $t('global.cancel') }}</el-button>
@@ -23,18 +18,14 @@
 
 <script>
 import { timestampFormat } from '@/utils/date';
-import { getLoadTrainNumber } from '@/api/simulation';
-
 // 计划行车时间选择
 export default {
     data() {
         return {
             show: false,
             formModel: {
-                initTime: new Date(),
-                loadNum: 1
+                initTime: new Date()
             },
-            maxNumber: 1,
             pickerOptions: { selectableRange: '00:00:00 - 23:59:59' },
             status: false
         };
@@ -43,65 +34,34 @@ export default {
         title() {
             return this.$t('display.setTime.setSimulationSystemTime');
         },
-        hasNumber() {
-            return this.$route.params.mode == 'demon' && this.$route.query.prdType == '04';
-        },
         group() {
             return this.$route.query.group;
         },
         rules() {
             return {
                 initTime: [
-                    { required: true, message: this.$t('display.setTime.selectSystemTime'), trigger: 'change' },
-                    {
-                        validator(rule, value, callback) {
-                            if (this.maxNumber == 0) {
-                                callback(new Error(this.$t('display.setTime.selectValidStartTime')));
-                            } else {
-                                callback();
-                            }
-                        },
-                        trigger: 'change',
-                        maxNumber: this.maxNumber
-                    }
-                ],
-                loadNum: [
-                    { required: true, message: this.$t('display.setTime.selectTrainNum'), trigger: 'change' }
-
+                    { required: true, message: this.$t('display.setTime.selectSystemTime'), trigger: 'change' }
                 ]
             };
         }
     },
     methods: {
         doShow() {
-            this.formModel.initTime = new Date(this.$store.state.training.initTime || null);
-            this.handleChange(this.formModel.initTime);
+            this.formModel.initTime = new Date(this.$store.state.socket.simulationTimeSync || null);
             this.show = true;
         },
         doClose() {
             this.status = false;
             this.show = false;
         },
-        handleChange(initTime) {
-            this.formModel.loadNum = 0;
-            if (this.hasNumber) {
-                getLoadTrainNumber({ time: timestampFormat('HH:mm:ss', initTime) }, this.group).then(resp => {
-                    this.maxNumber = parseInt(resp.data);
-                });
-            }
-        },
         handleSure() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
                     this.status = true;
                     const model = {
                         initTime: timestampFormat('HH:mm:ss', this.formModel.initTime),
+                        timestamp:this.formModel.initTime
                     };
-
-                    if (this.hasNumber) {
-                        model['loadNum'] = this.formModel.loadNum;
-                    }
-
                     this.$emit('ConfirmSelectBeginTime', model);
                     this.doClose();
                 }
diff --git a/src/views/newMap/display/simulationMenu/simulationControl.vue b/src/views/newMap/display/simulationMenu/simulationControl.vue
new file mode 100644
index 000000000..d5926cadc
--- /dev/null
+++ b/src/views/newMap/display/simulationMenu/simulationControl.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="simulationControlAll">
+    <div style="color: #fbfbfb;background: #0C161A;margin: 3px;padding: 3px;border-radius: 5px;">
+      <span style="font-size: 16px;">{{ time }}</span>
+      <span style="margin-left: 10px;font-size: 14px;">{{ dateString }}</span>
+    </div>
+    <div style="display: flex;">
+      <el-button
+        class="controlButton"
+        type="info"
+        style="background: #000;"
+        :disabled="isDisabled"
+        :loading="pauseLoading"
+        circle
+        :class="simulationPaused?'el-icon-video-play':'el-icon-video-pause'"
+        @click="startOrPause"
+      />
+      <div>
+        <div class="simulationMenu" :style="{cursor: isDisabled ? 'not-allowed':'pointer'}" @click="showMenuSpeedList">{{ `x${speed}` }}</div>
+        <div v-show="isShowSpeedMenuList" class="simulationMenuList" style="right: 85px;">
+          <div v-for="(each, index) in speedList" :key="index">
+            <div class="eachSimulationMenu" :class="{'active' :speed === each.value}" @click="speedChange(each.value)">{{ each.label }}</div>
+          </div>
+        </div>
+      </div>
+      <div>
+        <div class="simulationMenu" style="width: 70px;" :style="{background: nowMode === '正常操作' ? '#0fb20b' :'#efc007',cursor: isDisabled ? 'not-allowed':'pointer'}" @click="changeOperateMode">{{ nowMode }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { simulationPause, simulationStart, timesSpeedPlayback } from '@/api/rtSimulation';
+import { OperateMode } from '@/scripts/ConstDic';
+import { getSessionStorage } from '@/utils/auth';
+import { timestampFormat } from '@/utils/date';
+import { SimulationUserType } from '@/scripts/ConstDic';
+export default {
+    name:'SimulationControl',
+    data() {
+        return {
+            pauseLoading:false,
+            group:'',
+            speed: 1,
+            isShowSpeedMenuList: false,
+            isShowModeMenuList: false,
+            time: '',
+            dateString: ''
+        };
+    },
+    computed: {
+        simulationPaused() {
+            return this.$store.state.socket.simulationPause;
+        },
+        isAdmin() {
+            return this.$store.state.user.roles.includes('04') || this.$store.state.user.roles.includes('05');
+        },
+        speedList() {
+            return this.isAdmin ? [
+                { value: 10, label: 'x10' },
+                { value: 9, label: 'x9' },
+                { value: 8, label: 'x8' },
+                { value: 7, label: 'x7' },
+                { value: 6, label: 'x6' },
+                { value: 5, label: 'x5' },
+                { value: 4, label: 'x4' },
+                { value: 3, label: 'x3' },
+                { value: 2, label: 'x2' },
+                { value: 1, label: 'x1' }
+            ] : [
+                { value: 5, label: 'x5' },
+                { value: 4, label: 'x4' },
+                { value: 3, label: 'x3' },
+                { value: 2, label: 'x2' },
+                { value: 1, label: 'x1' }
+            ];
+        },
+        project() {
+            return getSessionStorage('project');
+        },
+        nowMode() {
+            if (this.$store.state.training.operatemode === OperateMode.FAULT) {
+                return '特殊操作';
+            } else if (this.$store.state.training.operatemode === OperateMode.NORMAL) {
+                return '正常操作';
+            } else {
+                return '正常操作';
+            }
+        },
+        isDisabled() {
+            return this.$store.state.training.simulationUserType !== SimulationUserType.TEACHER;
+        }
+    },
+    watch: {
+        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
+            this.initDate(time);
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        window.addEventListener('click', this.close, false);
+    },
+    beforeDestroy() {
+        window.removeEventListener('click', this.close);
+    },
+    methods:{
+        initDate(date) {
+            this.time = timestampFormat('HH:mm:ss', date);
+            this.dateString = timestampFormat('YYYYMMDD', date);
+        },
+        changeOperateMode() {
+            if (this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) {
+                let val = '';
+                if (this.nowMode === '正常操作') {
+                    val = OperateMode.FAULT;
+                } else {
+                    val = OperateMode.NORMAL;
+                }
+                this.$store.dispatch('training/changeOperateMode', { mode: val });
+            }
+        },
+        showMenuModeList() {
+            event.stopPropagation();
+            this.isShowModeMenuList = !this.isShowModeMenuList;
+        },
+        showMenuSpeedList(event) {
+            if (this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) {
+                event.stopPropagation();
+                this.isShowSpeedMenuList = !this.isShowSpeedMenuList;
+            }
+        },
+        startOrPause() {
+            this.pauseLoading = true;
+            if (this.simulationPaused) {
+                simulationStart(this.group).then(resp => {
+                    this.pauseLoading = false;
+                }).catch(() => {
+                    this.pauseLoading = false;
+                    this.$messageBox('开始失败，请稍后再试');
+                });
+            } else {
+                simulationPause(this.group).then(resp => {
+                    this.pauseLoading = false;
+                }).catch(() => {
+                    this.pauseLoading = false;
+                    this.$messageBox('暂停失败，请稍后再试');
+                });
+            }
+        },
+        speedChange(val) {
+            timesSpeedPlayback(this.$route.query.group, val).then(resp => {
+                this.speed = val;
+                this.$message.success(`设置${val}倍速成功!`);
+            }).catch(e => {
+                this.$message.error('设置倍速失败！');
+            });
+        },
+        close() {
+            this.isShowModeMenuList = false;
+            this.isShowSpeedMenuList = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.simulationControlAll{
+    position: absolute;
+    bottom: 9px;
+    right: 78px;
+	width: 162px;
+	padding: 2px 5px;
+	border-radius: 5px;
+	align-items: center;
+	background: #ccc;
+	-webkit-user-select:none;
+	-moz-user-select:none;
+	-ms-user-select:none;
+	user-select:none;
+}
+.controlButton{
+    font-size: 22px;
+    padding: 3px;
+    background: #fff;
+}
+.simulationMenu {
+	width: 30px;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+	border: 1px solid #000000;
+	border-radius: 3px;
+	background: #000;
+	color: #fbfbfb;
+	margin: 5px;
+	padding: 2px 0;
+}
+.simulationMenuList {
+	position: absolute;
+	right: 5px;
+	width: 40px;
+	bottom: 35px;
+	background: #ccc;
+	border-radius: 5px 5px 0 0;
+	font-size: 14px;
+	padding: 5px;
+}
+.eachSimulationMenu {
+	text-align: center;
+	cursor: pointer;
+	position: relative;
+	white-space: nowrap;
+	margin-top: 2px;
+	border: 1px solid #000000;
+	border-radius: 3px;
+	background: #757171;
+	color: #fbfbfb;
+	padding: 2px 0;
+}
+.eachSimulationMenu:hover {
+	background: #000;
+}
+.active{
+	background: #000;
+}
+</style>
diff --git a/src/views/newMap/display/simulationMenu/simulationMenu.vue b/src/views/newMap/display/simulationMenu/simulationMenu.vue
new file mode 100644
index 000000000..2fda148ef
--- /dev/null
+++ b/src/views/newMap/display/simulationMenu/simulationMenu.vue
@@ -0,0 +1,317 @@
+<template>
+  <div>
+    <div v-quick-menu-drag class="allSimulationMenu">
+      <simulation-control ref="simulationControl" />
+      <div class="simulationMenu" @click="showMenuList">菜单</div>
+      <div v-show="isShowMenuList" class="simulationMenuList">
+        <div v-for="(each, index) in allMenuList" :key="index">
+          <div v-if="each.show" class="eachSimulationMenu" :class="{'menuDisabled' :each.disabled}" @click="() => { each.disabled? '' : each.click(); }">{{ each.label }}</div>
+        </div>
+      </div>
+    </div>
+    <contect-us ref="contectUs" />
+    <jl3d-device v-if="deviceif" v-show="deviceShow" ref="Jl3dDevice" :panel-show="deviceShow" @closedevice3dview="jlmap3dmodel" />
+    <set-time ref="setTime" @ConfirmSelectBeginTime="startSim" />
+    <flow-data ref="flowData" />
+    <member-manage ref="memberManage" />
+    <select-exam ref="selectExam" @examStart="examStart" />
+    <exam-panel ref="examPanel" />
+    <device-manage ref="deviceManage" />
+    <qr-code ref="qrCode" />
+  </div>
+</template>
+<script>
+import { getSimulationQrcode } from '@/api/jointSimulation';
+import { initSimulation } from '@/api/rtSimulation';
+import ContectUs from './contectUs';
+import FlowData from './flowData';
+import SetTime from './setTime';
+import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
+import MemberManage from '../memberManage/membersManage';
+import SelectExam from '../exam/selectExam';
+import ExamPanel from '../exam/examPanel';
+import getErrorTip from '@/scripts/errorTip';
+import DeviceManage from './deviceManage';
+import QrCode from '@/components/QrCode';
+import { SimulationUserType } from '@/scripts/ConstDic';
+import { destroySimulationByAdmin, ranAsPlan} from '@/api/simulation';
+import { EventBus } from '@/scripts/event-bus';
+import SimulationControl from './simulationControl';
+export default {
+    name: 'SimulationMenu',
+    components: {
+        SetTime,
+        FlowData,
+        SelectExam,
+        ExamPanel,
+        ContectUs,
+        Jl3dDevice,
+        MemberManage,
+        DeviceManage,
+        QrCode,
+        SimulationControl
+    },
+    data() {
+        return {
+            isShowMenuList: false,
+            menuList: [],
+            active: -1,
+            deviceif: false,
+            deviceShow: true,
+            allMenuList: [
+                { label: '切换', name: 'switchOffset', click: this.switchOffset, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.ibp.moreScreen; } },
+                { label: '设备视图', name: 'jlmap3dmodel', click: this.jlmap3dmodel, isDisabled: () => { return false; }, isShow: () => { return this.$route.query.client !== 'diagramEdit'; } },
+                { label: '设备管理', name: 'deviceManage', click: this.deviceManage, isDisabled: () => { return false; }, isShow: () => { return (this.$store.state.training.domConfig.hasDeviceManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER) || (this.$route.query.client === 'interlockWork' && this.$route.query.projectDevice === 'ILW'); } },
+                { label: '联系方式', name: 'contectUs', click: this.contectUs, isDisabled: () => { return false; }, isShow: () => { return true; } },
+                { label: '生成二维码', name: 'generateQrCode', click: this.generateQrCode, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.joint && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
+                { label: '切换客流数据', name: 'changeFlowData', click: this.changeFlowData, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasLpf && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
+                { label: '成员管理', name: 'memberManage', click: this.memberManage, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasMemberManage && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
+                { label: '考试', name: 'exam', click: this.goExam, isDisabled: () => { return false; }, isShow: () => { return this.$store.state.training.domConfig.hasExam && this.$store.state.training.simulationUserType === SimulationUserType.TEACHER; } },
+                { label: '按计划行车', name: 'drivingPlan', click: this.drivingPlan, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, isShow: () => { return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$route.query.client !== 'diagramEdit'; } },
+                { label: '初始化', name: 'initialize', click: this.initializeSim, isDisabled: () => { return this.$store.state.trainingNew.trainingSwitch; }, isShow: () => { return this.$store.state.training.simulationUserType === SimulationUserType.TEACHER && this.$route.query.client !== 'diagramEdit'; } },
+                { label: '退出', name: 'quit', click: this.exitSim, isDisabled: () => { return false; }, isShow: () => { return true; } }
+            ]
+        };
+    },
+    computed: {
+        group() {
+            return this.$route.query.group;
+        },
+        projectDevice() {
+            return this.$route.query.projectDevice;
+        },
+        simType() {
+            return this.$route.query.simType;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    watch: {
+        '$store.state.ibp.moreScreen': function (val) {
+            this.handleMenuShow();
+        },
+        '$store.state.training.simulationUserType': function (val) {
+            this.handleMenuShow();
+        },
+        '$store.state.socket.simulationOver':function(val) {
+            this.back();
+        },
+        '$store.state.socket.simulationRoleList':function(val) {
+            (val || []).forEach(item => {
+                if (item.body.messageType === 'KICK_OUT' && item.body.userId == this.$store.state.user.id) {
+                    this.back();
+                }
+            });
+        }
+    },
+    mounted() {
+        window.addEventListener('click', this.hideMenuList, false);
+    },
+    beforeDestroy() {
+        window.removeEventListener('click', this.hideMenuList);
+    },
+    methods: {
+        switchOffset() {
+            EventBus.$emit('switchOffset');
+        },
+        generateQrCode() {
+            this.hideMenuList();
+            getSimulationQrcode(this.$route.query.group).then(resp => {
+                const param = {
+                    url: resp.data,
+                    title: this.$t('综合演练二维码'),
+                    group: this.$route.query.group
+                };
+                if (this.$refs) {
+                    this.$refs.qrCode.doShow(param);
+                }
+            }).catch(() => {
+                this.$messageBox('仿真生成二维码失败！');
+            });
+        },
+        deviceManage() {
+            this.hideMenuList();
+            this.$refs.deviceManage.doShow();
+        },
+        showMenuList(event) {
+            event.stopPropagation();
+            this.isShowMenuList = !this.isShowMenuList;
+            this.active = -1;
+        },
+        initMenuList() {
+            this.allMenuList.forEach(item => {
+                item.show = item.isShow();
+            });
+        },
+        hideMenuList() {
+            this.isShowMenuList = false;
+            this.active = -1;
+        },
+        startSim(model) {
+            // 开始仿真
+            this.hideMenuList();
+            const data = {time: model.initTime};
+            ranAsPlan(data, this.group).then(() => {
+                this.$store.dispatch('training/setInitTime', new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+            }).catch(error => {
+                const message = getErrorTip(error.code) || '按计划行车异常,请退出重试';
+                this.$messageBox(message + '，' + this.$t('error.startSimulationFailed'));
+            });
+        },
+        examStart(data) {
+            this.$refs.examPanel.init(data);
+        },
+        jlmap3dmodel() {
+            this.hideMenuList();
+            if (this.deviceif == false) {
+                this.deviceif = true;
+            } else {
+                this.deviceShow = !this.deviceShow;
+            }
+        },
+        // 登出
+        logout() {
+            this.$store.dispatch('LogOut').then(() => {
+                location.reload();
+            });
+        },
+        // 返回或者退出
+        exitSim() {
+            this.hideMenuList();
+            this.$confirm('是否退出仿真？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                this.back();
+            });
+        },
+        back() {
+            if (this.projectDevice && this.$store.state.training.simulationCreator) {
+                destroySimulationByAdmin(this.group).then(() => {
+                    this.logout();
+                });
+            } else if (this.$route.query.labels) {
+                window.close();
+            } else if (this.projectDevice) {
+                this.logout();
+            } else {
+                this.$router.go(-1);
+            }
+        },
+        initializeSim() {
+            initSimulation(this.group).then(() => {
+                this.$store.dispatch('training/setMapDefaultState').then(() => {
+                    this.$store.dispatch('map/clearJlmapTrainView');
+                    this.$store.dispatch('map/resetActiveTrainList', false);
+                    this.$store.dispatch('map/setTrainWindowShow', false);
+                    this.$store.dispatch('map/initSimulationButton');
+                });
+            }).catch(() => {
+                this.loading = false;
+                this.$messageBox(this.$t('display.demon.endSimulationFail'));
+            });
+        },
+        // 修改系统时间
+        modifySysTime() {
+            this.hideMenuList();
+            this.$refs.modifySysTime.doShow();
+        },
+        // 按计划行车
+        drivingPlan() {
+            this.hideMenuList();
+            this.$refs.setTime.doShow();
+        },
+        // 联系我们弹窗
+        contectUs() {
+            this.hideMenuList();
+            this.$refs.contectUs.doShow();
+        },
+        goExam() {
+            this.hideMenuList();
+            this.$refs.selectExam.doShow();
+        },
+        // 成员管理
+        memberManage() {
+            this.hideMenuList();
+            this.$refs.memberManage.doShow();
+        },
+        changeFlowData() {
+            this.hideMenuList();
+            this.$refs.flowData.doShow();
+        },
+        handleMenuShow() {
+            this.allMenuList.forEach(item => {
+                item.show = item.isShow();
+                item.disabled = item.isDisabled();
+            });
+        }
+    }
+};
+
+</script>
+
+<style lang="scss" scoped>
+.allSimulationMenu {
+	position: absolute;
+	width: 230px;
+	height: 35px;
+	left: calc(100% - 330px);
+	bottom: 0;
+	z-index: 2009;
+}
+.simulationMenu {
+	position: absolute;
+	width: 60px;
+	right: 10px;
+	padding: 9px 0;
+	background: #409EFF;
+	color: #fbfbfb;
+	text-align: center;
+	bottom: 10px;
+	border-radius: 2px;
+	font-size: 14px;
+	cursor: pointer;
+}
+.simulationMenuList {
+	position: absolute;
+	right: 71px;
+	width: 95px;
+	bottom: 10px;
+	background: #409EFF;
+	color: #fbfbfb;
+	// min-height: 100px;
+	border-radius: 2px;
+	font-size: 14px;
+}
+.eachSimulationMenu {
+	padding: 9px 0;
+	// border-bottom:1px #dedede solid;
+	text-align: center;
+	cursor: pointer;
+	position: relative;
+	white-space: nowrap;
+	-moz-user-select: none;
+	-khtml-user-select: none;
+	user-select: none;
+}
+.eachSimulationMenu:hover {
+	background: #499cef;
+}
+.menuDisabled {
+	background: #ccc !important;
+	color: #5B6163;
+	cursor: not-allowed;
+}
+.simulationMenuGroup {
+	position: absolute;
+	right: 96px;
+	top: 0px;
+	background: #fff;
+	display: inline-block;
+	border-radius: 4px;
+	width: 95px;
+	border-right: 1px #000 solid;
+}
+</style>
diff --git a/src/views/newMap/display/stationDiagram/index.vue b/src/views/newMap/display/stationDiagram/index.vue
new file mode 100644
index 000000000..5e130b207
--- /dev/null
+++ b/src/views/newMap/display/stationDiagram/index.vue
@@ -0,0 +1,271 @@
+<template>
+  <div class="mainContext">
+    <map-common ref="mapCommon" @onSelect="clickEvent" @onMenu="contextmenu" />
+  </div>
+</template>
+
+<script>
+import MapCommon from './jlmap/index';
+// import parseStatus from '@/utils/parseStatus';
+import {mapGetters} from 'vuex';
+import { getDeviceMenuByDeviceType, MouseEvent } from '@/scripts/ConstDic';
+import deviceType from '@/jmapNew/constant/deviceType';
+import { EventBus } from '@/scripts/event-bus';
+export default {
+    name: 'MapSystemDraft',
+    components: {
+        MapCommon
+    },
+    data() {
+        return {
+            stomp: null,
+            currentMap: null,
+            mouseNum: 1,
+            mode: '',
+            selected: null,
+            typeObj: {
+                SECTION: '区段',
+                SIGNAL: '信号机',
+                SWITCH: '道岔',
+                PSD: '屏蔽门',
+                STATIONSTAND: '站台'
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('config', [
+            'canvasId'
+        ]),
+        group() {
+            return this.$route.query.group;
+        },
+        userId() {
+            return this.$store.state.user.id;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
+        }
+    },
+    watch: {
+        '$store.state.socket.equipmentStatus': function (val) {
+            if (val.length) {
+                this.statusMessage(val);
+            }
+        },
+        // '$store.state.socket.deviceStateMessages': function (val) {
+        //     if (val) {
+        //         this.statusMessageNew(val);
+        //     }
+        // },
+        '$store.state.map.mousemove': function (val) {
+            this.mousemove();
+        },
+        '$store.state.socket.simulationError': function (val) {
+            if (val) {
+                this.simulationError(val);
+            }
+        }
+    },
+    mounted() {
+        this.mode = this.$route.params.mode || '';
+        this.currentMap = this.$refs.mapCommon;
+        this.$nextTick(() => {
+            setTimeout(() => {
+                this.$store.dispatch('config/resetCanvasOffset');
+            }, 100);
+        });
+    },
+    methods: {
+        async mapViewLoaded(loading) {
+            this.currentMap.mapViewLoaded(loading);
+        },
+        async statusMessage(list) {
+            await this.$store.dispatch('training/updateMapState', list);
+            await this.$store.dispatch('socket/setEquipmentStatus');
+        },
+        // async statusMessageNew(deviceStatus) {  // 之前的新版订阅消息处理
+        //     const list = parseStatus(deviceStatus);
+        //     await this.$store.dispatch('training/updateMapState', list);
+        //     await this.$store.dispatch('socket/setDeviceStateMessages');
+        // },
+        simulationError() {
+            this.$store.dispatch('map/clearJlmapTrainView');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.$confirm(this.$t('tip.getMapStateDataException'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('global.confirm'),
+                showCancelButton: false,
+                type: 'warning'
+            }).then(() => {
+            }).catch(() => {
+            });
+        },
+        mousemove() {
+            this.mouseNum = 1;
+        },
+        // 鼠标左键点击事件
+        clickEvent(em) {
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            var device = { _type: em.deviceType, _code: em.deviceCode, _event: MouseEvent.Left };
+
+            if (em.deviceType === 'StationStand' && this.lineCode === '01') {
+                const menu = getDeviceMenuByDeviceType(device._type) || [];
+                this.$store.dispatch('menuOperation/setPopMenu', { position: { x: em.clientX, y: em.clientY }, menu: menu });
+            }
+
+            if (em.deviceCode) {
+                device = this.getDeviceByEm(em);
+            }
+            this.selected = { ...device, _event: MouseEvent.Left };
+            this.$emit('setSelected', this.selected);
+            this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+            this.$store.dispatch('menuOperation/setLeftClickCount');
+            if (this.lineCode == '07') {
+                this.$store.dispatch('menuOperation/setMenuChange', {device: device, subType: em.subType});
+            }
+            this.$store.dispatch('training/emitTipFresh');
+            if (this.$store.state.map.selectDevice && this.$store.state.map.selectDevice.flag && device._type) {
+                if (device._type.toUpperCase() == this.$store.state.map.selectDevice.type.toUpperCase()) {
+                    EventBus.$emit('selectDevice', device);
+                } else {
+                    const name = this.typeObj[this.$store.state.map.selectDevice.type];
+                    const info = '选择的设备类型不正确' + (name ? `，请选择${name}类型` : '');
+                    this.$message.info(info);
+                }
+            }
+        },
+        // 鼠标右键点击事件
+        contextmenu(em) {
+            var menu = null;
+            var device = null;
+            const point = { x: em.clientX, y: em.clientY };
+            if (em.subType === 'TrainWindow') {
+                if (this.lineCode != '06' && this.lineCode != '16') {
+                    device = { _type: deviceType.TrainWindow, code: em.deviceCode, _event: MouseEvent.Right };
+                    this.$store.dispatch('map/setTrainWindowShow', true);
+                }
+            } else if (em.subType === 'button' && em.deviceType === 'Station') { // 宁波一号线右键显示控制模式
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', {device:equipment, subType: em.subType});
+                menu = getDeviceMenuByDeviceType('StationControl');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('training/emitTipFresh');
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                this.$emit('setSelected', this.selected);
+                return;
+            } else if (em.subType === 'light' && em.deviceType === 'Station') { // 宁波一号线右键显示强制点灯
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                menu = getDeviceMenuByDeviceType('StationLight');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('training/emitTipFresh');
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                this.$emit('setSelected', this.selected);
+                return;
+            } else if (em.subType === 'preReset' && em.deviceType === 'Station') { // 宁波一号线右键显示计轴复位
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                menu = getDeviceMenuByDeviceType('StationPreReset');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                this.$store.dispatch('training/emitTipFresh');
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                this.$emit('setSelected', this.selected);
+                return;
+            } else if (em.subType === 'enabled' && em.deviceType === 'Switch') {
+                menu = getDeviceMenuByDeviceType('Enabled');
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                this.$emit('setSelected', this.selected);
+                return;
+            } else if (em.subType === 'enabled' && em.deviceType === 'Signal') {
+                menu = getDeviceMenuByDeviceType('Enabled');
+                const equipment = this.getDeviceByEm(em);
+                this.$store.dispatch('menuOperation/setSelected', { device: equipment, subType: em.subType });
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu});
+                device = this.getDeviceByEm(em);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                this.$emit('setSelected', this.selected);
+                return;
+            } else if (em.deviceCode && !this.isScreen) {
+                device = this.getDeviceByEm(em);
+            }
+            if (device) {
+                device = this.getSelectedByLineCode(device);
+                this.selected = { ...device, _event: MouseEvent.Right};
+                this.$emit('setSelected', this.selected);
+                if (!this.buttonOperation) {
+                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+                    if (!this.checkShouldPop(device)) {
+                        this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: null });
+                    } else {
+                        if (em.deviceType === 'StationStand' && this.lineCode === '01') {
+                            return;
+                        }
+                        menu = getDeviceMenuByDeviceType(device._type);
+                        this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                    }
+                } else if (this.$route.query.ctc) {
+                    this.$store.dispatch('menuOperation/setSelected', {device: this.selected, subType: em.subType});
+                    menu = getDeviceMenuByDeviceType(device._type);
+                    this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+                }
+            } else {
+                menu = getDeviceMenuByDeviceType('Cancel');
+                this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: menu });
+            }
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 根据皮肤类型转换激活的菜单类型
+        getSelectedByLineCode(device) {
+            const switchSectionIsWitchLineCodeList = ['03'];
+            const lineCode = this.$store.getters['map/lineCode'];
+            if (switchSectionIsWitchLineCodeList.includes(lineCode) && device._type == deviceType.Section) {
+                const section = this.$store.getters['map/getDeviceByCode'](device._code);
+                if (section) {
+                    device = this.$store.getters['map/getDeviceByCode'](section.relSwitchCode);
+                }
+            }
+            // 过滤道岔相关区段变成道岔model
+            if (device._type == 'Section' && device.type == '03') {
+                device = this.$store.getters['map/getDeviceByCode'](device.switch.code);
+            }
+            return device;
+        },
+        // 获取设备数据
+        getDeviceByEm(em) {
+            const device = this.$store.getters['map/getDeviceByCode'](em.deviceCode) || null;
+            if (device) {
+                device._viewVal = em.val;
+            }
+            return device;
+        },
+        checkShouldPop(device) {
+            if (device) {
+                if (device._type === 'Signal') {
+                    return device._viewVal === '3';
+                } else if (device._type === 'StationControl' && this.lineCode == '01') { // 中控模式显示范围
+                    return device._viewVal === '1';
+                } else {
+                    return true;
+                }
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+@import "src/styles/mixin.scss";
+
+.mainContext {
+	font-family: "Helvetica Neue ", Helvetica, "PingFang SC ", "Hiragino Sans GB ", "Microsoft YaHei ", "PingFang SC ", Arial, 'consolas';
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+</style>
diff --git a/src/views/newMap/display/stationDiagram/jlmap/index.vue b/src/views/newMap/display/stationDiagram/jlmap/index.vue
new file mode 100644
index 000000000..92a4928f4
--- /dev/null
+++ b/src/views/newMap/display/stationDiagram/jlmap/index.vue
@@ -0,0 +1,412 @@
+<template>
+  <div ref="jlmapCanvas" class="jlmap-canvas" :style="{ width: width+'px', height: height+'px' }" @mousemove="mousemove">
+    <div v-show="maskOpen" class="mask" />
+    <div :id="canvasId" class="display_canvas" />
+    <progress-bar ref="progressBar" />
+    <div v-if="zoomShow" class="zoom-view" :style="{ width: width +'px'}">
+      <el-form :model="dataZoom" label-width="60px" size="mini" inline>
+        <el-form-item label="偏 移:">
+          <el-input v-model="dataZoom.offsetX" :disabled="true" style="width: 95px" />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="dataZoom.offsetY" :disabled="true" style="width: 95px" />
+        </el-form-item>
+        <div style="display: inline-block">
+          <span class="title" style="width: 90px; height: 28px; line-height: 30px;">鼠标偏移:</span>
+          <el-form-item label="x" label-width="12px">
+            <el-input ref="offsetX" v-model="offset.x" :disabled="true" style="width: 95px" />
+          </el-form-item>
+          <el-form-item label="y" label-width="12px">
+            <el-input v-model="offset.y" :disabled="true" style="width: 95px" />
+          </el-form-item>
+        </div>
+        <el-form-item label="缩 放:">
+          <el-input v-model="dataZoom.scaleRate" :disabled="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import Jlmap from '@/jmapNew/map';
+import ProgressBar from '@/views/components/progressBar/index';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import { EventBus } from '@/scripts/event-bus';
+import Theme from '@/jmapNew/theme/factory';
+export default {
+    name: 'JlmapVisual',
+    components: {
+        ProgressBar
+    },
+    props: {
+        noMenu: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            loading: true,
+            dataZoom: {
+                offsetX: '0',
+                offsetY: '0',
+                scaleRate: '1'
+            },
+            offset: {
+                x: 0,
+                y: 0
+            },
+            sectionActive: false,
+            operate: null,
+            concentrationStationList: [],
+            showMode: '02',
+            canvasId:'',
+            previewOrMapDraw: false
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode'
+        ]),
+        ...mapGetters('menuOperation', [
+            'buttonOperation'
+        ]),
+        width() {
+            return this.$store.state.config.width;
+        },
+        height() {
+            return this.$store.state.config.height;
+        },
+        zoomShow() {
+            if (this.mode == TrainingMode.EDIT || this.mode == TrainingMode.MAP_EDIT) {
+                return true;
+            }
+            return false;
+        },
+        showZoom() {
+            return this.$route.path.includes('bigSplitScreen');
+        },
+        maskOpen() {
+            return this.$store.state.config.maskOpen;
+        },
+        isDesign() {
+            return this.$route.path.indexOf('mapPreviewNew') !== -1 || this.$route.path.indexOf('map/draw') !== -1;
+        },
+        lineCode() {
+            return this.$store.getters['map/lineCode'];
+        }
+    },
+    watch: {
+        '$store.state.config.canvasSizeCount': function (val) {
+            this.resetSize();
+        },
+        '$store.state.menuOperation.magnifyCount': function () {
+            this.setMagnify();
+        },
+        '$store.state.menuOperation.shrinkCount': function () {
+            this.setShrink();
+        },
+        $route() {
+            this.mapViewLoaded(true);
+        },
+        '$store.state.socket.simulationReset': function (val) { // 仿真结束标识
+            if (val) {
+                this.simulationReset(val);
+            }
+        },
+        '$store.state.training.rezoomCount': function () {
+            let code = this.$store.state.training.offsetStationCode; // 偏移集中站坐标
+            if (code && code.includes('Cycle')) { // 单独处理 自动折返
+                const cycleButtonList = this.$store.state.map.map.cycleButtonList;
+                if (cycleButtonList && cycleButtonList.length > 0) {
+                    cycleButtonList.forEach(element => {
+                        if (code == element.cycleCode) {
+                            code = element.code;
+                        }
+                    });
+                }
+            }
+            code && this.setCenter(code);
+        }
+    },
+    created() {
+        EventBus.$on('viewLoading', (loading) => {
+            this.mapViewLoaded(loading);
+        });
+        EventBus.$on('viewProgressAt', (percentage) => {
+            this.mapViewProgressAt(percentage);
+        });
+        EventBus.$on('refresh', () => {
+            this.refresh(this.$store.state.map.map);
+        });
+        this.canvasId = ['map', (Math.random().toFixed(5)) * 100000].join('_');
+        this.$store.dispatch('config/setCurrentCancasId', { id: this.canvasId });
+    },
+    mounted() {
+        this.initLoadPage();
+    },
+    beforeDestroy() {
+        EventBus.$off('refresh');
+        EventBus.$off('viewLoading');
+        EventBus.$off('viewProgressAt');
+        this.$store.dispatch('menuOperation/resetRequestList');
+        this.$store.dispatch('socket/setSimulationReset');
+        if (this.$jlmap) {
+            this.$jlmap.dispose();
+            Vue.prototype.$jlmap = null;
+        }
+    },
+    methods: {
+        // 初始化jlmap
+        initLoadPage() {
+            document.getElementById(this.canvasId).oncontextmenu = function (e) {
+                return false;
+            };
+            // 默认个人地图绘制可以滚轮放大缩小 其他地图显示不允许此操作
+            const path = window.location.href;
+            const mouseWheelFlag = true;
+            this.previewOrMapDraw = false;
+            if (path.indexOf('map/draw') !== -1 || path.indexOf('mapPreviewNew') !== -1 || path.indexOf('pictureDraw') !== -1) {
+                this.previewOrMapDraw = true;
+            }
+
+            Vue.prototype.$theme = new Theme();
+            this.selfJlmap = Vue.prototype.$jlmap = new Jlmap({
+                dom: document.getElementById(this.canvasId),
+                config: {
+                    renderer: 'canvas',
+                    width: this.width,
+                    height: this.height
+                },
+                options: {
+                    scaleRate: 1,
+                    offsetX: 0,
+                    offsetY: 0,
+                    zoomOnMouseWheel: mouseWheelFlag
+                },
+                showConfig: {
+                    previewOrMapDraw: this.previewOrMapDraw
+                },
+                methods: {
+                    dataLoaded: this.handleDataLoaded,
+                    viewLoaded: this.handleViewLoaded,
+                    stateLoaded: this.handleStateLoaded,
+                    stateUpdate: this.handleStateUpdate,
+                    initJlmap: this.handleInitJlmap
+                }
+            });
+            this.$jlmap.on('dataZoom', this.onDataZoom, this);
+            this.$jlmap.on('selected', this.onSelected, this);
+            this.$jlmap.on('contextmenu', this.onContextMenu, this);
+            if (this.$route.path.startsWith('/lineDesign/usermap/map/draw')) {
+                this.$jlmap.on('keyboard', this.onKeyboard, this);
+            } else {
+                this.$jlmap.on('keyboard', this.onSimulationKeyboard, this);
+            }
+            window.document.oncontextmenu = function () {
+                return false;
+            };
+        },
+        // 重置jlmap宽高
+        resetSize() {
+            this.$nextTick(() => {
+                this.$jlmap && this.$jlmap.resize({ width: this.width, height: this.height });
+                setTimeout(() => {
+                    this.$store.dispatch('config/resetCanvasOffset');
+                    this.$store.dispatch('training/emitTipFresh');
+                }, 100);
+            });
+        },
+        // 设置显示图层
+        setLevelVisible(levels) {
+            this.$jlmap && this.$jlmap.setLevelVisible(levels);
+        },
+        // 设置显示中心
+        setCenter(deviceCode) {
+            this.$jlmap && this.$jlmap.setCenter(deviceCode);
+        },
+        // 地图数据加载完成
+        handleDataLoaded() {
+            this.$store.dispatch('map/mapDataLoaded');
+            const concentrationStationList = [];
+            this.$store.state.map.map.stationList.forEach(item => {
+                if (item.centralized) {
+                    concentrationStationList.push({value: item.code, name: item.name});
+                }
+            });
+            this.concentrationStationList = concentrationStationList;
+            this.$store.dispatch('map/setTrainWindowShow', this.previewOrMapDraw);
+        },
+        // 地图视图加载完成
+        handleViewLoaded() {
+            this.$store.dispatch('map/mapViewLoaded');
+            this.mapViewLoaded(false);
+        },
+        // 地图状态加载完成
+        handleStateLoaded() {
+            this.mapViewLoaded(false);
+        },
+        // 地图状态更新
+        handleStateUpdate(list) {
+            this.$store.dispatch('map/mapStateLoaded');
+        },
+        // 画布初始化完成
+        handleInitJlmap() {
+            this.$store.dispatch('map/initJlmapLoaded');
+        },
+        // 视图参数改变
+        handleOptionsUpdate(options) {
+        },
+        // 键盘快捷键事件
+        onKeyboard(hook) {
+            switch (hook) {
+            case 'Ctrl_Z': this.$store.dispatch('map/setRevocation');
+                break;
+            case 'Ctrl_Y': this.$store.dispatch('map/setRecover');
+                break;
+            case 'Delete': this.$store.dispatch('map/setDeleteCount');
+                break;
+            case 'Update':
+                this.$refs.offsetX.focus();
+                this.$store.dispatch('map/setUpdateCount');
+                break;
+            }
+        },
+        onSimulationKeyboard(hook) {
+            switch (hook) {
+            case 'Update': this.$store.dispatch('map/setKeyboardEnter');
+                break;
+            case 'Tab': EventBus.$emit('CheckFaultModeEvent');
+                break;
+            }
+        },
+        simulationReset() {
+            this.$store.dispatch('socket/setSimulationStart');// 设置仿真状态-结束
+            this.$store.dispatch('map/initClearTrainData'); // 清除战场图列车显示
+            this.$store.dispatch('map/setTrainWindowShow', false); // 结束清除车次窗显示
+            this.$store.dispatch('training/over'); // 设置实训状态-结束
+            this.$store.dispatch('map/resetActiveTrainList'); // 清除活动列车列表
+            this.$store.dispatch('training/setMapDefaultState'); // 设置默认状态
+        },
+        // 视图缩放事件
+        onDataZoom(dataZoom) {
+            this.dataZoom.offsetX = dataZoom.offsetX.toFixed(1) + '';
+            this.dataZoom.offsetY = dataZoom.offsetY.toFixed(1) + '';
+            this.dataZoom.scaleRate = dataZoom.scaleRate + '';
+            this.offset.x = this.dataZoom.offsetX;
+            this.offset.y = this.dataZoom.offsetY;
+
+            if (this.lineCode) {
+                this.$store.commit('map/setDataZoom', this.dataZoom);
+            }
+            // 刷新实训提示位置
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 鼠标左键点击事件
+        onSelected(em) {
+            this.$emit('onSelect', em);
+        },
+        // 鼠标右键点击事件
+        onContextMenu(em) {
+            this.$emit('onMenu', em);
+        },
+        // 设置地图加载状态
+        mapViewLoaded(loading) {
+            this.loading = loading;
+            if (loading) {
+                this.$refs.progressBar && this.$refs.progressBar.start();
+            } else {
+                this.$refs.progressBar && this.$refs.progressBar.end(true);
+            }
+        },
+        // 设置地图加载进度
+        mapViewProgressAt(percentage) {
+            this.$nextTick(() => {
+                this.$refs.progressBar.progressAt(percentage);
+            });
+        },
+        // 设置新的地图数据
+        setMap(map) {
+            this.$jlmap.setMap(map, this.$store.state.map.mapDevice, {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData});
+        },
+        // 刷新地图数据
+        refresh(map) {
+        },
+        // 缩小
+        setShrink() {
+            this.$jlmap.setOptions({type: 'zoom', scale: -1});
+        },
+        // 放大
+        setMagnify() {
+            this.$jlmap.setOptions({type: 'zoom', scale: 1});
+        },
+        mousemove(e) {
+            this.offset = {
+                x: e.offsetX + Number(this.dataZoom.offsetX),
+                y: e.offsetY + Number(this.dataZoom.offsetY)
+            };
+            this.$store.dispatch('map/setMousemove');
+        },
+        // bigSplitScreen.vue  changeSplit 中调用    分屏切换
+        setOffset(data, num, sum, obj) {
+            this.$jlmap.switchScreen(data, num, sum, obj);
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.mask{
+	opacity: 0;
+	background: #000;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 9;
+}
+.jlmap-canvas {
+	position: relative;
+	-moz-user-select: none;
+	-o-user-select: none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	background: #000;
+	float: left;
+}
+.title{
+	text-align: right;
+	font-size: 14px;
+	color: #606266;
+	line-height: 32px;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+	font-weight: 700;
+}
+
+.zoom-view {
+	position: absolute;
+	bottom: 0;
+	background: #fff;
+	padding-top: 5px;
+	height: 42px;
+	border-bottom: 1px #f3f3f3 solid;
+	border-right: 1px #f3f3f3 solid;
+}
+
+/deep/ {
+	.el-form.el-form--inline {
+		height: 28px !important;
+		line-height: 28px !important
+	}
+
+	.el-loading-mask {
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+}
+</style>
diff --git a/src/views/newMap/display/terminals/bigScreen.vue b/src/views/newMap/display/terminals/bigScreen.vue
new file mode 100644
index 000000000..a67e34b82
--- /dev/null
+++ b/src/views/newMap/display/terminals/bigScreen.vue
@@ -0,0 +1,69 @@
+<template>
+  <div>
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+export default {
+    name: 'BigScreen',
+    components: {
+        StationDiagram
+    },
+    data() {
+        return {
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    watch: {
+        '$store.state.map.initJlmapLoadedCount': function () {
+            this.handleBigScreenData();
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleBigScreenData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
+                if (picture) {
+                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                    const deviceList = [];
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    for (const deviceCode in mapDevice) {
+                        deviceList.push(deviceCode);
+                    }
+                    this.$jlmap.updatePicture(deviceList);
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/cctvView.vue b/src/views/newMap/display/terminals/cctvView.vue
new file mode 100644
index 000000000..f1db5481a
--- /dev/null
+++ b/src/views/newMap/display/terminals/cctvView.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="CctvView">
+    <div v-if="RealCctvList.includes(project)&&this.$route.query.projectDevice">
+      <real-cctv ref="realCctv" />
+    </div>
+    <div v-else>
+      <jl3d-passflow ref="cctvView3d" />
+    </div>
+  </div>
+</template>
+<script>
+import Jl3dPassflow from '@/views/jlmap3d/passflow/jl3dpassflow';
+import RealCctv from './realCctv';
+export default {
+    name:'CctvView',
+    components:{
+        Jl3dPassflow,
+        RealCctv
+    },
+    data() {
+        return {
+            RealCctvList:['richorjoint', 'richorhhcj']
+        };
+    },
+    computed: {
+        project() {
+            return this.$route.query.project || 'login';
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/addPlanningTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/addPlanningTrain.vue
new file mode 100644
index 000000000..9865b6ddd
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/addPlanningTrain.vue
@@ -0,0 +1,172 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" :rules="rules" :model="formModel" label-width="100px" size="medium" @submit.native.prevent>
+      <el-form-item prop="serviceNumber" :label="$t('planMonitor.serviceNumber2')+$t('global.colon')" :required="true">
+        <el-input v-model="formModel.serviceNumber" type="text" size="mini" maxlength="3" minlength="2" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { checkServiceNumberExist } from '@/api/runplan';
+
+export default {
+    name: 'AddPlanningTrain',
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            formModel:{
+                serviceNumber: ''
+            },
+            rules:{
+                serviceNumber:[
+                    {required: true, validator: this.validateServiceNumber, trigger: 'blur'},
+                    {required: true, validator: this.validateServiceNo, trigger: 'change'}
+                ]
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.addPlanTrain');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow() {
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        validateServiceNo(rule, value, callback) {
+            if (typeof value == 'string' && value.trim().length == 0) {
+                return callback(new Error('请填写服务号'));
+            } else {
+                const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
+                if (serviceNumberList.includes(value)) {
+                    // new Error('该服务号已存在')
+                    return callback();
+                } else {
+                    return callback();
+                }
+            }
+        },
+        validateServiceNumber(rule, value, callback) {
+            if (typeof value == 'string' && value.trim().length == 0) {
+                return callback(new Error('请填写服务号'));
+            } else {
+                const figuresOfServiceNumber = this.$store.state.map.mapConfig.figuresOfServiceNumber;
+                let newValue = parseInt(value);
+                if (newValue) {
+                    // if (newValue > 0 & newValue < 9) {
+                    //     newValue = '00' + newValue;
+                    // } else if (newValue > 10 & newValue < 99) {
+                    //     newValue = '0' + newValue;
+                    // }
+                    if (newValue.toString().length > figuresOfServiceNumber) {
+                        return callback(new Error('该服务号长度最多为' + figuresOfServiceNumber + '位'));
+                    } else {
+                        newValue = newValue.toString().padStart(figuresOfServiceNumber, '0');
+                        this.formModel.serviceNumber = newValue;
+                        return callback();
+                    }
+
+                    // const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
+                    // if (serviceNumberList.includes(value)) {
+                    //     // new Error('该服务号已存在')
+                    //     return callback();
+                    // } else {
+                    //     return callback();
+                    // }
+                } else {
+                    this.formModel.serviceNumber = '';
+                }
+
+            }
+        },
+        handleCommit() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    if (this.$route.query.planId || this.loadRunPlanId) {
+                        checkServiceNumberExist({ planId: this.$route.query.planId || this.loadRunPlanId, serviceNumber: this.formModel.serviceNumber }).then(resp => {
+                            if (resp.data) {
+                                this.$emit('dispatchDialog', {
+                                    name: 'offLine',
+                                    params: {
+                                        type: 'warning',
+                                        operate: 'AddPlanningTrain',
+                                        width: 460,
+                                        message: this.$t('tip.serviceNumberExistHint')
+                                    }
+                                });
+
+                                this.doClose();
+                            } else {
+                                this.handleConfirm(true);
+                            }
+                        });
+                    } else {
+                        this.$messageBox(this.$t('tip.chooseToOpenTheRunGraph'));
+                    }
+                }
+            });
+            // if (this.serviceNumber.length >= 2 && this.serviceNumber.length <= 3) {
+            // } else {
+            //     this.$messageBox('长度在二到三位');
+            // }
+        },
+        handleConfirm(isNew = false) {
+            this.doClose();
+            this.$store.dispatch('runPlan/addServiceNumber', this.formModel.serviceNumber);
+            this.$emit('dispatchDialog', { name: 'editPlanningTrain', params: { serviceNumber: this.formModel.serviceNumber, isNew:isNew } });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-input {
+            width: 120px;
+        }
+    }
+	.add-planning-train{
+		/deep/ {
+			.el-dialog__body{
+				padding: 10px 20px;
+			}
+			.dialog-footer{
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/addTask.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/addTask.vue
new file mode 100644
index 000000000..367fc2e4c
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/addTask.vue
@@ -0,0 +1,456 @@
+<template>
+  <div>
+    <el-row>
+      <!-- <el-col :span="3" style="height: 28px;line-height: 28px;">
+        <el-radio v-model="addModel.forward" :label="true">{{ $t('planMonitor.addToTheFront') }}</el-radio>
+      </el-col> -->
+      <el-col :span="3" style="margin-left: 10px;height: 28px;line-height: 28px;">
+        <span>{{ $t('planMonitor.tripNumber')+$t('global.colon') }}</span>
+      </el-col>
+      <el-col :span="5">
+        <el-select v-model="addModel.tripNumber" size="mini" :placeholder="this.$t('global.choose')" disabled>
+          <el-option
+            v-for="item in tripNumberList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+      <el-col :span="3" style="margin-left: 20px;height: 28px;line-height: 28px;">
+        <span>{{ $t('global.startTime')+$t('global.colon') }}</span>
+      </el-col>
+      <el-col :span="5">
+        <el-time-picker v-model="addModel.startTime" size="mini" value-format="HH:mm:ss" :clearable="false" :picker-options="{selectableRange:'02:00:00-23:59:59'}" />
+      </el-col>
+    </el-row>
+    <el-row style="margin-top: 5px;height: 28px;line-height: 28px;">
+      <!-- <el-col :span="3">
+        <el-radio v-model="addModel.forward" :label="false">{{ $t('planMonitor.addToTheEnd') }}</el-radio>
+      </el-col> -->
+      <!-- <el-col :span="3" style="margin-left: 10px;height: 28px;line-height: 28px;">
+        <span>{{ $t('planMonitor.defaultStopTime') }}</span>
+      </el-col>
+      <el-col :span="5">
+        <el-input-number v-model="defaultStopTime" placeholder="请输入时间" size="mini" :controls="false" :min="0" /> -->
+      <!-- <el-select v-model="defaultStopTime" size="mini" :placeholder="this.$t('global.choose')">
+          <el-option
+            v-for="item in defaultStopTimeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select> -->
+      <!-- </el-col> -->
+      <el-col :span="3" style="margin-left:10px;height: 28px;line-height: 28px;">
+        <!-- {{ $t('planMonitor.defaultRunLevel') }} -->
+        <span>运行等级</span>
+      </el-col>
+      <el-col :span="5">
+        <el-select v-model="defaultSpeedLevel" size="mini" :placeholder="this.$t('global.choose')">
+          <el-option
+            v-for="item in defaultSpeedLevelList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+
+    </el-row>
+    <el-row style="margin-bottom: 5px;">
+      {{ $t('planMonitor.crossRailway')+$t('global.colon') }}
+    </el-row>
+    <el-row>
+      <el-table
+        v-loading="tableLoading"
+        :data="routingList"
+        border
+        highlight-current-row
+        :height="230"
+        @row-click="handleClick"
+      >
+        <el-table-column
+          prop="startStationCode"
+          :label="this.$t('planMonitor.startingStation')"
+          :filters="startStationFilters"
+          :filter-method="filterStartStation"
+          column-key="startStationCode"
+        >
+          <template slot-scope="scope">
+            {{ formatName(scope.row.startStationCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="startSectionCode" :label="this.$t('planMonitor.startingSection')" width="95">
+          <template slot-scope="scope">
+            {{ formatName(scope.row.startSectionCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endStationCode"
+          :label="this.$t('planMonitor.terminal')"
+          :filters="endStationFilters"
+          :filter-method="filterEndStation"
+          column-key="endStationCode"
+        >
+          <template slot-scope="scope">
+            {{ formatName(scope.row.endStationCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="endSectionCode" :label="this.$t('planMonitor.endingSection')" width="95">
+          <template slot-scope="scope">
+            {{ formatName(scope.row.endSectionCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="routingType" label="交路类型">
+          <template slot-scope="scope">
+            {{ routingTypeMap[scope.row.routingType] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="类别" width="240">
+          <template slot-scope="scope">
+            {{ `${frontMap[String(scope.row.startTbFront)]} - ${frontMap[String(scope.row.endTbFront)]}` }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="remarks" width="auto" :label="this.$t('planMonitor.description')" />
+      </el-table>
+    </el-row>
+    <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+      {{ '经停转换轨 / 站台轨'+$t('global.colon') }}
+    </el-row>
+    <el-row>
+      <el-table v-loading="routeLoading" :data="addModel.arriveConfigList" border :height="230">
+        <el-table-column prop="stationCode" :label="this.$t('planMonitor.station')" width="160">
+          <template slot-scope="scope">
+            {{ formatName(scope.row.stationCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="sectionCode" :label="this.$t('planMonitor.section')" width="95">
+          <template slot-scope="scope">
+            {{ formatName(scope.row.sectionCode) }}
+          </template>
+        </el-table-column>
+        <!-- prop="arriveTime"  -->
+        <el-table-column :label="this.$t('planMonitor.arriveTime')" width="100px">
+          <template v-if="scope.$index!=0" slot-scope="scope">
+            {{ scope.row.arriveTime }}
+          </template>
+        </el-table-column>
+        <!-- prop="stopTime"  -->
+        <el-table-column :label="this.$t('planMonitor.stopTime')" width="100px">
+          <template v-if="scope.$index!=0&&scope.$index!=addModel.arriveConfigList.length-1" slot-scope="scope">
+            {{ scope.row.stopTime+'s' }}
+            <!-- <el-input v-model="scope.row.stopTime" placeholder="请输入时间" size="mini" @input="changeStopTime(scope.$index, scope.row.stopTime)" /> -->
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.departureTime')" width="100px">
+          <template v-if="scope.$index!=addModel.arriveConfigList.length-1" slot-scope="scope">
+            {{ scope.row.departureTime }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.runLevel')">
+          <template slot-scope="scope">
+            <span style="font-size:13px;">{{ scope.row.speedLevel }}</span>
+            <span>{{ '('+scope.row.speedLevelTime+'s)' }}</span>
+            <!-- <el-input v-model="scope.row.speedLevelTime" style="width:70px" placeholder="请输入运行等级" size="mini" @input="changeSpeedLevelTime(scope.$index, scope.row.speedLevelTime)" /> -->
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+    <!-- <el-row>
+      <el-col :offset="16">
+        <el-checkbox v-model="showDefault">{{ $t('planMonitor.showDefaultStopTimeAndRunLevel') }}</el-checkbox>
+      </el-col>
+    </el-row> -->
+    <div style="text-align:center;margin-top:15px;">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listUserRoutingData, addPlanTrip, getMapStationRunUser, getStationStopTime, querySectionListByRouting } from '@/api/runplan';
+import { getRunplanConfig } from '@/api/jmap/mapdraft';
+import { formatTime, formatName } from '@/jmapNew/theme/parser/util';
+
+export default {
+    name: 'AddTask',
+    components: {
+    },
+    data() {
+        return {
+            tableLoading:false,
+            routeLoading:false,
+            isPlan: false,
+            loadRunPlanId:'',
+            // showDefault: true,
+            stopStationMap: {},
+            stopTimeMap:{},
+            params: {},
+            routingList: [],
+            startStationFilters:[],
+            endStationFilters:[],
+            // defaultStopTime: '30',
+            defaultSpeedLevel: 'l3',
+            reentryData: {},
+            addModel: {
+                routingCode: '',
+                endStationCode: '',
+                startStationCode: '',
+                startTime: '02:00:00',
+                endTime: '',
+                arriveConfigList: [],
+                tripNumber: '',
+                planId: '',
+                serviceNumber: '',
+                startTbFront: false,
+                endTbFront: false
+            },
+            tripNumberList: [{ value: '', label: this.$t('planMonitor.automatic') }],
+            defaultSpeedLevelList: [
+                { value: 'l1', label: '等级一' },
+                { value: 'l2', label: '等级二' },
+                { value: 'l3', label: '等级三'},
+                { value: 'l4', label: '等级四' },
+                { value: 'l5', label: '等级五' }
+            ],
+            routingTypeMap: {
+                OUTBOUND: '出库',
+                INBOUND: '入库',
+                LOOP: '环路'
+            },
+            frontMap: {
+                'true': '折返轨(站前)',
+                'false': '折返轨(站后)',
+                'undefined': '转换轨',
+                'null': '转换轨'
+            }
+        };
+    },
+    watch: {
+        'addModel.routingCode': function (val) {
+            if (val) {
+                this.computedDetailList('routingCode');
+            }
+        },
+        'addModel.startTime': function () {
+            this.computedDetailList();
+        },
+        'defaultSpeedLevel': function () {
+            this.computedDetailList('defaultSpeedLevel');
+        }
+    },
+    methods: {
+        loadInitData(params) {
+            this.loadRunPlanId = params.loadRunPlanId;
+            this.isPlan = params.isPlan;
+            this.addModel.serviceNumber = params.serviceNumber;
+            this.addModel.planId = this.$route.query.planId || this.loadRunPlanId;
+            this.addModel.arriveConfigList = [];
+            const mapId = this.$route.query.mapId;
+
+            if (mapId) {
+                this.tableLoading = true;
+                getRunplanConfig(mapId).then(resp => {
+                    const data = resp.data;
+                    this.reentryData = data.config.reentryData;
+                });
+
+                listUserRoutingData(mapId).then(resp => {
+                    this.routingList = resp.data;
+                    const startStationFilterMap = {};
+                    const endStationFilterMap = {};
+                    this.routingList.forEach(routing=>{
+                        if (!startStationFilterMap[routing.startStationCode]) {
+                            startStationFilterMap[routing.startStationCode] = {text:formatName(routing.startStationCode), value:routing.startStationCode};
+                        }
+                        if (!endStationFilterMap[routing.endStationCode]) {
+                            endStationFilterMap[routing.endStationCode] = {text:formatName(routing.endStationCode), value:routing.endStationCode};
+                        }
+                    });
+                    this.startStationFilters = Object.values(startStationFilterMap).sort((a, b)=>{
+                        const startStationA = this.$store.getters['map/getDeviceByCode'](a.value);
+                        const startStationB = this.$store.getters['map/getDeviceByCode'](b.value);
+                        return startStationA.kmRange - startStationB.kmRange;
+                    });
+                    this.endStationFilters = Object.values(endStationFilterMap).sort((a, b)=>{
+                        const endStationA = this.$store.getters['map/getDeviceByCode'](a.value);
+                        const endStationB = this.$store.getters['map/getDeviceByCode'](b.value);
+                        return endStationA.kmRange - endStationB.kmRange;
+                    });
+                    this.tableLoading = false;
+                });
+
+                getMapStationRunUser(mapId).then(resp =>{
+                    const list = resp.data.list;
+                    list.forEach(elem => {
+                        this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
+                    });
+                    getStationStopTime(mapId).then(response=>{
+                        const stopTimeList = response.data.list;
+                        stopTimeList.forEach(element=>{
+                            this.stopTimeMap[element.stationCode] = {parkingTime:element.parkingTime};
+                        });
+                    });
+                });
+            }
+        },
+        filterStartStation(value, row) {
+            return row.startStationCode == value;
+        },
+        filterEndStation(value, row) {
+            return row.endStationCode == value;
+        },
+        doClose() {
+            this.$emit('doClose');
+        },
+        formatName(code) {
+            return formatName(code);
+        },
+        computedTimeByString(timeStr) {
+            const bTime = +new Date(`2019-01-01 00:00:00`);
+            const eTime = +new Date(`2019-01-01 ${timeStr}`);
+            return Number(eTime) - Number(bTime);
+        },
+        compuntedRunTime(list, index, runLevel) {
+            let runTime = 0;
+
+            if ((index == 0 && String(this.addModel.startTbFront) == false) ||
+				(index == list.length - 1 && String(this.addModel.endTbFront) == false)) {
+                return 0;
+            }
+
+            if (index < list.length - 1) {
+                const stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
+                if (stopStationObj) {
+                    if (stopStationObj.runPlanLevelVO) {
+                        runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
+                    } else if (stopStationObj[runLevel]) {
+                        runTime = parseInt(stopStationObj[runLevel]);
+                    } else {
+                        this.$messageBox(this.$t('planMonitor.addTaskHint1') + stopStationObj.startSectionCode + this.$t('planMonitor.addTaskHint2') + stopStationObj.endSectionCode + this.$t('planMonitor.addTaskHint3'));
+                    }
+                }
+            }
+
+            return runTime;
+        },
+        computedDetailList(type = null) {
+            if (this.addModel.routingCode) {
+                let tempTime = this.computedTimeByString(this.addModel.startTime) / 1000;
+                const list = Object.assign([], this.addModel.arriveConfigList);
+                const runLevel = this.defaultSpeedLevel || 'l1'; // 默认等级三
+
+                list.forEach((elem, index) => {
+                    if (type == 'routingCode') {
+                        if (index == 0 || index == list.length - 1) {
+                            elem.stopTime = 0;
+                        } else if (this.stopTimeMap[elem.stationCode]) {
+                            elem.stopTime = this.stopTimeMap[elem.stationCode].parkingTime;
+                        } else {
+                            elem.stopTime = 0;
+                        }
+                    }
+
+                    tempTime = tempTime || this.computedTimeByString('23:59:59') / 1000 + 1;
+                    elem.arriveTime = formatTime(tempTime);
+                    if (index == list.length - 1 && String(this.addModel.endTbFront) == 'true') {
+                        const data = this.reentryData[list[index].stationCode] || {};
+                        elem.departureTime = formatTime(tempTime + elem.stopTime + data.tbFront || 0);
+                    } else {
+                        elem.departureTime = formatTime(tempTime + elem.stopTime);
+                    }
+
+                    const runLevelObj = this.defaultSpeedLevelList.find(speedLevel=>{ return speedLevel.value == runLevel; });
+                    const realRunlevel = this.compuntedRunTime(list, index, runLevel);
+
+                    elem.speedLevelTime = realRunlevel;
+                    elem.speedLevel = runLevelObj.label;
+
+                    let fronTime = 0;
+                    if (index == 0 && String(this.addModel.startTbFront) == 'false') {
+                        const data = this.reentryData[elem.stationCode] || {};
+                        fronTime = data.tbTo || 0;
+                    } else if (index == list.length - 2 && String(this.addModel.endTbFront) == 'false') {
+                        const data = this.reentryData[list[index + 1].stationCode] || {};
+                        fronTime = data.tbTo || 0;
+                    } else if (index == list.length - 1 && String(this.addModel.endTbFront) == 'true') {
+                        const data = this.reentryData[list[index].stationCode] || {};
+                        fronTime = data.tbFront || 0;
+                    }
+
+                    tempTime = tempTime + fronTime + elem.stopTime + elem.speedLevelTime;
+                });
+
+                this.addModel.endTime = formatTime(tempTime - list[list.length - 1].stopTime);
+            }
+        },
+        handleClick(row, column, event) {
+            this.routeLoading = true;
+            const arriveConfigList = [];
+            querySectionListByRouting(row.id).then(resp=>{
+                resp.data.forEach((parkSectionCode, index)=>{
+                    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.endSectionCode = row.endSectionCode;
+                this.addModel.startSectionCode = row.startSectionCode;
+                this.addModel.routingCode = row.id;
+                this.addModel.startTbFront = row.startTbFront;
+                this.addModel.endTbFront = row.endTbFront;
+                this.computedDetailList('routingCode');
+                this.routeLoading = false;
+            });
+        },
+        handleCommit() {
+            if (this.addModel.arriveConfigList.length > 0) {
+                if (this.isPlan) {
+                // 计划添加任务
+                    this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmAddTask', params: Object.assign({}, this.addModel) });
+                    this.addModel.routingCode = '';
+                } else {
+                // 直接添加任务
+                    delete this.addModel.tripNumber;
+                    addPlanTrip(this.addModel).then(resp => {
+                    // this.$emit('dispatchOperate', {
+                    // 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+                    // });
+                        this.$emit('refresh');
+                        this.$message.success(this.$t('tip.addTaskSuccessfully'));
+                    }).catch((error) => {
+                        this.$messageBox(this.$t('tip.addTaskFailed') + ': ' + error.message);
+                    });
+                }
+                this.doClose();
+            } else {
+                this.$messageBox('请选择交路');
+            }
+
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-row {
+            margin-bottom: 5px !important;
+        }
+    }
+
+	.add-task{
+		/deep/ {
+			.el-dialog__body{
+				padding: 0 20px;
+			}
+			.dialog-footer{
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/components/dataTable.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/components/dataTable.vue
new file mode 100644
index 000000000..ede0b7757
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/components/dataTable.vue
@@ -0,0 +1,233 @@
+<template>
+  <div v-if="show">
+    <template v-if="maxmini">
+      <div class="nav">
+        <div class="title">{{ config.title }}</div>
+        <el-tooltip class="item" effect="dark" placement="bottom">
+          <div slot="content" v-html="config.handleTips" />
+          <div class="el-icon-info handleTips" />
+        </el-tooltip>
+        <!-- <div v-show="config.showClose" class="cls-status" @click="touch('Close')"><span /></div>
+        <div class="min-status" @click="touch('Minim')"><span /></div> -->
+      </div>
+      <el-table
+        ref="table"
+        :data="config.data"
+        :highlight-current-row="config.highlightCurrentRow"
+        class="table_box"
+        :show-header="config.showHeader"
+        border
+        @current-change="handleChange"
+        @cell-dblclick="handleModify"
+      >
+        <template v-for="(item,index) in config.columns">
+          <el-table-column :key="index" :prop="item.prop" :label="item.label" :width="item.width" />
+        </template>
+      </el-table>
+    </template>
+    <template v-else>
+      <div class="nav">
+        <!-- <div class="title">{{ config.title }}</div> -->
+        <!-- <div class="max-status" @click="touch('Maxim')"><span /></div> -->
+      </div>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'DataTable',
+    props: {
+        config: {
+            type: Object,
+            required: true
+        }
+    },
+    data() {
+        return {
+            show: true,
+            maxmini: true,
+            touchStrategy: {
+                'Close': [false, true],
+                'Minim': [true, false],
+                'Maxim': [true, true]
+            }
+        };
+    },
+    methods: {
+        handleChange(row) {
+            if (this.config.handleChange) {
+                this.config.handleChange(row);
+            }
+        },
+        handleModify(row) {
+            if (this.config.handleModify) {
+                this.config.handleModify(row);
+            }
+        },
+        setCurrentRow(row) {
+            this.$refs.table.setCurrentRow(row);
+        },
+        touch(operate) {
+            this.$nextTick(() => {
+                [this.show, this.maxmini] = this.touchStrategy[operate];
+                this.$emit('touch', this.maxmini);
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $height: 20px;
+    $width: 20px;
+
+    .nav {
+        display: table;
+        float: right;
+        width: 100%;
+        color: #0000;
+        background: -webkit-linear-gradient(#FDFDFE, #B1CBF3);
+        background: -o-linear-gradient(#FDFDFE, #B1CBF3);
+        background: -moz-linear-gradient(#FDFDFE, #B1CBF3);
+        background: linear-gradient(#FDFDFE, #B1CBF3);
+        border: 1px solid #B6BCCC !important;
+        border-bottom: 2px solid #B6BCCC !important;
+        list-style: none;
+        height: 20px;
+        line-height: 20px;
+        .title{
+          float: left;
+          color: #000;
+          font-size: 13px;
+          line-height: 21px;
+          padding-left: 10px;
+        }
+    }
+    .table_box{
+        height: calc(100% - 20px);
+        overflow: auto;
+    }
+    .handleTips{
+        font-size: 16px;
+        color: #316AC5;
+        margin-left: 0px;
+        margin-top: 2px;
+        display: table;
+        cursor: pointer;
+    }
+
+    /deep/ {
+        .el-table--border th.gutter {
+            background: #EBEADB !important;
+        }
+
+        .el-table {
+            width: 100%;
+
+            th.is-leaf {
+                padding: 0px 0;
+                background: #EBEADB;
+                border-right: none !important;
+                border-left: 1px solid #D1CDBD !important;
+                border-top: 1px solid #D1CDBD !important;
+                border-bottom: 1px inset #D1CDBD !important;
+                color: #000;
+
+                .cell {
+                    height: $height;
+                    line-height: $height;
+                }
+            }
+
+            td {
+                padding: 0px 0;
+
+                .cell {
+                    height: $height;
+                    line-height: $height;
+                    font-size: smaller !important;
+                }
+
+            }
+
+            .current-row>td {
+                background: #316AC5 !important;
+                color: #fff !important;
+            }
+        }
+
+        .cls-status {
+            float: right;
+            width: 12px;
+            height: 100%;
+            line-height: 100%;
+            margin-left: 5px;
+            cursor: pointer;
+
+            span {
+                display: inline-block;
+                content: '/';
+                background: black;
+                width: 2px;
+                height: 12px;
+                vertical-align: middle;
+                transform: rotate(45deg);
+            }
+
+            span::after {
+                display: block;
+                content: '/';
+                background: black;
+                width: 2px;
+                height: 12px;
+                transform: rotate(-90deg);
+            }
+        }
+
+        .min-status {
+            float: right;
+            width: 20px;
+            height: 100%;
+            line-height: 100%;
+            cursor: pointer;
+
+            span {
+                display: inline-block;
+                content: '-';
+                background: black;
+                width: 2px;
+                height: 12px;
+                vertical-align: middle;
+                transform: rotate(-90deg);
+            }
+        }
+
+        .max-status {
+            float: right;
+            width: 20px;
+            height: 100%;
+            line-height: 100%;
+            cursor: pointer;
+
+            span {
+                display: inline-block;
+                content: '';
+                background: black;
+                width: 2px;
+                height: 12px;
+                transform: rotate(0deg);
+            }
+
+            span::after {
+                display: block;
+                content: '';
+                background: black;
+                width: 2px;
+                height: 12px;
+                transform: rotate(90deg);
+            }
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/deleteTask.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/deleteTask.vue
new file mode 100644
index 000000000..229d0ea3e
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/deleteTask.vue
@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <el-row>
+      <el-radio v-model="model.deleteBefore" :label="true">{{ $t('planMonitor.deleteAllPreviousTasks') }}</el-radio>
+    </el-row>
+    <el-row>
+      <el-radio v-model="model.deleteBefore" :label="false">{{ $t('planMonitor.deleteAllSubsequentTasks') }}</el-radio>
+    </el-row>
+    <div style="text-align:center;margin-top:15px;">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { deletePlanTrip } from '@/api/runplan';
+
+export default {
+    name: 'DeleteTask',
+    components: {
+    },
+    data() {
+        return {
+            isPlan: false,
+            loadRunPlanId:'',
+            model: {
+                routingCode: '',
+                deleteBefore: false,
+                tripNumber: '',
+                serviceNumber: ''
+            }
+        };
+    },
+    mounted() {
+    },
+    methods: {
+        loadInitData(params) {
+            this.loadRunPlanId = params.loadRunPlanId;
+            this.isPlan = params.isPlan;
+            this.model.taskIndex = params.taskIndex;
+            this.model.tripNumber = params.tripNumber;
+            this.model.serviceNumber = params.serviceNumber;
+            this.model.routingCode = params.routingCode;
+        },
+        doClose() {
+            this.$emit('doClose');
+        },
+        handleCommit() {
+            if (this.isPlan) {
+                // 计划删除任务
+                this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmDeleteTask', params: this.model });
+            } else {
+                // 直接删除任务
+                const model = {
+                    planId: this.$route.query.planId || this.loadRunPlanId,
+                    SDTNumber: `${this.model.serviceNumber}${this.model.tripNumber}`,
+                    deleteBefore: this.model.deleteBefore
+                };
+
+                deletePlanTrip(model).then(resp => {
+                    this.$store.dispatch('runPlan/setSelected', {});
+                    this.$store.dispatch('runPlan/setDraftSelected', {});
+                    this.$emit('refresh');
+                    // this.$emit('dispatchOperate', {
+                    // 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+                    // });
+                    this.$message.success(this.$t('tip.deleteTaskSuccessfully'));
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.deleteTaskFailed'));
+                });
+            }
+            this.doClose();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-row {
+            margin: 10px;
+        }
+    }
+	.delete-task{
+		/deep/ {
+			.el-dialog__body{
+				padding: 0 20px;
+			}
+			.dialog-footer{
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/duplicateTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/duplicateTrain.vue
new file mode 100644
index 000000000..752f61b2a
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/duplicateTrain.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool duplicate-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center">
+      <el-radio-group v-model="model.forward">
+        <el-radio :label="true">{{ $t('planMonitor.forward') }}</el-radio>
+        <el-radio :label="false">{{ $t('planMonitor.backward') }}</el-radio>
+      </el-radio-group>
+    </el-row>
+    <el-row style="margin-top: 20px">
+      <el-col :span="5" :offset="4">{{ $t('planMonitor.frequency') }}</el-col>
+      <el-col :span="10">
+        <el-input-number v-model="model.times" size="mini" :min="1" controls-position="right" />
+      </el-col>
+    </el-row>
+    <el-row style="margin: 10px 0px">
+      <el-col :span="5" :offset="4">{{ $t('planMonitor.intervals') }}</el-col>
+      <el-col :span="10">
+        <el-input-number v-model="model.intervals" size="mini" :min="30" controls-position="right" />
+        <span>{{ $t('global.second') }}</span>
+      </el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { duplicateService } from '@/api/runplan';
+
+export default {
+    name: 'DuplicateTrain',
+    components: {
+    },
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            model: {
+                serviceNumber: '',
+                forward: false,
+                times: 0,
+                intervals: 0
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.duplicateTrain');
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(params) {
+            this.model.serviceNumber = params.serviceNumber;
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+            this.model['planId'] = this.$route.query.planId || this.loadRunPlanId;
+            this.model['serviceNumber'] = this.model.serviceNumber;
+            this.doClose();
+            duplicateService(this.model).then(resp => {
+                // this.$emit('dispatchOperate', {
+                // 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+                // });
+                this.$emit('refresh');
+                this.$message.success(this.$t('tip.duplicatePlanSuccessful'));
+            }).catch((error) => {
+                if (error.code === 500001) {
+                    this.$messageBox(this.$t('tip.duplicatePlanFailed') + this.$t('tip.duplicatePlanFailedTips'));
+                } else {
+                    this.$messageBox(this.$t('tip.duplicatePlanFailed'));
+                }
+
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+	.duplicate-train{
+		/deep/ {
+			.el-dialog__body{
+				padding: 0 20px;
+			}
+			.dialog-footer{
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/editPlanName.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/editPlanName.vue
new file mode 100644
index 000000000..3d1bc99f9
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/editPlanName.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool create-empty-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="3000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div>
+      <el-row>
+        <el-form ref="form" :model="editModel" label-width="140px" size="mini" :rules="rules" @submit.native.prevent>
+          <el-form-item :label="this.$t('planMonitor.runGraphName')+this.$t('global.colon')" prop="name">
+            <el-input v-model="editModel.name" autofocus />
+          </el-form-item>
+        </el-form>
+      </el-row>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="doClose">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="handleEdit">{{ $t('global.modify') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { putRunPlanDetail } from '@/api/runplan';
+
+export default {
+    name: 'CreateEmptyPlan',
+    components: {
+    },
+    data() {
+        return {
+            activeTab: 'first',
+            dialogShow: false,
+            loading: false,
+            publishMapList: [],
+            editModel: {
+                planId: '',
+                name: ''
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifyRunningDiagramName');
+        },
+        rules() {
+            return {
+                name: [
+                    { required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
+                ]
+            };
+        }
+    },
+    mounted() {
+
+    },
+    methods: {
+        doShow(data) {
+            this.dialogShow = true;
+            if (data && data.name) {
+                this.editModel.name = data.name;
+                this.editModel.planId = data.id;
+            }
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.editModel.name = '';
+            if (this.$refs.form) {
+                this.$refs.form.resetFields();
+            }
+        },
+        handleEdit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    putRunPlanDetail(this.editModel).then(resp => {
+                        const params = {
+                            dialogName: 'openRunPlan',
+                            operate: 'loadRunPlanData',
+                            params: { planId: resp.data, lineCode: this.$route.query.lineCode, planName: this.editModel.name, refresh: true }
+                        };
+
+                        this.$emit('dispatchOperate', params);
+                        this.$message.success(this.$t('tip.runGraphNameModifiedSuccessfully'));
+                        this.$emit('renewal', this.editModel.name);
+                        this.doClose();
+                    }).catch(error => {
+                        this.$messageBox(this.$t('tip.modifyRunGraphNameFailed') + error.message);
+                        this.doClose();
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-input {
+            width: 160px;
+        }
+
+        .el-input-number {
+            width: 120px;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/editPlanningTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/editPlanningTrain.vue
new file mode 100644
index 000000000..86f397a36
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/editPlanningTrain.vue
@@ -0,0 +1,365 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool edit-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="3">{{ $t('planMonitor.serviceNumber')+$t('global.colon') }}</el-col>
+      <el-col :span="4">
+        <el-input v-model="model.serviceNumber" disabled size="mini" />
+      </el-col>
+      <!-- <el-col :span="4" :offset="1">
+        <el-checkbox v-model="model.debugTrain">{{ $t('planMonitor.commissioningTrain') }}</el-checkbox>
+      </el-col> -->
+    </el-row>
+    <el-row style="margin-top: 5px">
+      {{ $t('planMonitor.task') }}
+    </el-row>
+    <el-row>
+      <div style=" float: left;  width: 78%">
+        <el-table :data="model.tripConfigList" highlight-current-row border :height="380" @current-change="handleCurrentChange">
+          <el-table-column prop="beginStationCode" :label="this.$t('planMonitor.startingStation')">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.startStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="startTime" :label="this.$t('planMonitor.startTime')">
+            <template slot-scope="scope">
+              {{ scope.row.startTime }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endStationCode" :label="this.$t('planMonitor.terminal')">
+            <template slot-scope="scope">
+              {{ formatName(scope.row.endStationCode) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="endTime" :label="this.$t('planMonitor.endTime')">
+            <template slot-scope="scope">
+              {{ scope.row.endTime }}
+            </template>
+          </el-table-column>
+          <el-table-column width="20" />
+        </el-table>
+      </div>
+      <div style="float: right; width: 22%">
+        <el-button class="view-button" :disabled="disabled" @click="handleEditTask">{{ $t('planMonitor.modifyTask') }}</el-button>
+        <el-button class="view-button" :disabled="disabled" @click="handleAddTask">
+          {{ $t('planMonitor.addTask') }}
+        </el-button>
+        <el-button class="view-button" :disabled="disabled" @click="handleDeleteTask">{{ $t('planMonitor.deleteTask') }}</el-button>
+        <el-button class="view-button" :disabled="disabled" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+      </div>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+import { formatName, formatTime } from '@/jmapNew/theme/parser/util';
+import { addPlanService, updatePlanService, getRoutingBySDTNumber } from '@/api/runplan';
+
+export default {
+    name: 'EditPlanningTrain',
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            currentRow: {},
+            isNew:true,
+            model: {
+                serviceNumber: '',
+                // debugTrain: false,
+                tripConfigList: []
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.editPlanningTrain');
+        },
+        disabled() {
+            return !this.model.serviceNumber;
+        }
+    },
+    methods: {
+        formatTime(time) {
+            return formatTime(time);
+        },
+        formatName(code) {
+            return formatName(code);
+        },
+        getEachTripNumber(editData, tripNumberList, index) {
+            const tripNumber = tripNumberList[index];
+            const trainInfo = editData.trainMap[tripNumber];
+            const lastIndex = trainInfo.stationTimeList.length - 1;
+
+            const taskObj = {
+                id:index + 1,
+                tripNumber: tripNumber,
+                startStationCode:trainInfo.stationTimeList[0].stationCode,
+                endStationCode:trainInfo.stationTimeList[lastIndex].stationCode,
+                startTime: formatTime(trainInfo.startSecondTime + 7200),
+                endTime: formatTime(trainInfo.endSecondTime + 7200),
+                arriveConfigList: [],
+                startSectionCode:trainInfo.startSectionCode,
+                endSectionCode:trainInfo.endSectionCode,
+                endTbFront:undefined,
+                startTbFront:undefined
+            };
+            if (trainInfo.startSectionCode != trainInfo.stationTimeList[0].sectionCode) {
+                taskObj.startTbFront = false;
+                taskObj.startTime = formatTime(trainInfo.startSecondTime + 7200);
+                const newModel = {
+                    sectionCode:trainInfo.startSectionCode,
+                    stationCode:trainInfo.stationTimeList[0].stationCode,
+                    // // speedLevel:'默认',
+                    departureTime: formatTime(trainInfo.startSecondTime + 7200),
+                    arriveTime: formatTime(trainInfo.startSecondTime + 7200),
+                    stopTime:0
+                };
+                taskObj.arriveConfigList.push(newModel);
+            }
+            const newstationTimeList = [];
+            let current = {};
+            trainInfo.stationTimeList.forEach((stationTime, index)=>{
+                if (index % 2 == 0) {
+                    current = {};
+                    current.stationCode = stationTime.stationCode;
+                    current.sectionCode = stationTime.sectionCode;
+                    current.arriveTime = stationTime.secondTime;
+                } else {
+                    current.departureTime = stationTime.secondTime;
+                    newstationTimeList.push(current);
+                }
+            });
+
+            newstationTimeList.forEach((newstationTime, index)=>{
+                if (trainInfo.startSectionCode != trainInfo.stationTimeList[0].sectionCode) {
+                    index += 1;
+                }
+                const newModel = {
+                    sectionCode:newstationTime.sectionCode,
+                    stationCode:newstationTime.stationCode,
+                    arriveTime: formatTime(newstationTime.arriveTime + 7200),
+                    departureTime: formatTime(newstationTime.departureTime + 7200),
+                    stopTime:newstationTime.departureTime - newstationTime.arriveTime
+                };
+                taskObj.arriveConfigList.push(newModel);
+            });
+
+            if (trainInfo.endSectionCode != trainInfo.stationTimeList[lastIndex].sectionCode) {
+                taskObj.endTbFront = false;
+                taskObj.endTime = formatTime(trainInfo.endSecondTime + 7200);
+                const newModel = {
+                    sectionCode:trainInfo.endSectionCode,
+                    stationCode:trainInfo.stationTimeList[lastIndex].stationCode,
+                    // // speedLevel:'默认',
+                    departureTime: formatTime(trainInfo.endSecondTime + 7200),
+                    arriveTime: formatTime(trainInfo.endSecondTime + 7200),
+                    stopTime:0
+                };
+                taskObj.arriveConfigList.push(newModel);
+            } else {
+                if (trainInfo.reentry) {
+                    taskObj.endTbFront = true;
+                }
+            }
+            this.model.tripConfigList.push(taskObj);
+            index++;
+            if (index <= tripNumberList.length - 1) {
+                this.getEachTripNumber(editData, tripNumberList, index);
+            }
+        },
+        loadInitData(params) {
+            this.isNew = params.isNew;
+            this.model.planId = this.$route.query.planId || this.loadRunPlanId;
+            this.model.serviceNumber = params.serviceNumber;
+            this.model.tripConfigList = [];
+            if (!this.isNew) {
+                const editData = this.$store.state.runPlan.editData[params.serviceNumber];
+                if (editData) {
+                    const tripNumberList = Object.keys(editData.trainMap).sort((a, b) => { return editData.trainMap[a].oldIndex - editData.trainMap[b].oldIndex; });
+                    if (tripNumberList.length > 0) {
+                        this.getEachTripNumber(editData, tripNumberList, 0);
+                    }
+                }
+            }
+        },
+        doShow(params) {
+            this.loadInitData(params);
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCurrentChange(val) {
+            this.currentRow = val || {};
+        },
+        handleAddTask() {
+            this.$emit('dispatchDialog', {
+                name: 'showDialog', params: {
+                    isPlan: true,
+                    dialogType:'addTask',
+                    taskIndex: this.currentRow.taskIndex,
+                    serviceNumber: this.model.serviceNumber,
+                    tripNumber: this.currentRow.tripNumber
+                }
+            });
+        },
+        handleEditTask() {
+            if (this.currentRow.id) {
+                this.$emit('dispatchDialog', {
+                    name: 'showDialog', params: {
+                        isPlan: true,
+                        dialogType:'modifyingTask',
+                        serviceNumber: this.model.serviceNumber,
+                        tripNumber: this.currentRow.tripNumber,
+                        rowData:this.currentRow
+                    }
+                });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPieceOfData'));
+            }
+        },
+        handleDeleteTask() {
+            if (this.currentRow.id) {
+                let index = -1;
+                index = this.model.tripConfigList.findIndex(
+                    elem => { return elem.id == this.currentRow.id; }
+                );
+                this.model.tripConfigList.splice(index, 1);
+            } else {
+                this.$messageBox(this.$t('tip.selectAPieceOfData'));
+            }
+        },
+        handleConfirmUpdateTask(model) {
+            const tripConfigList = Object.assign([], this.model.tripConfigList);
+            tripConfigList.forEach(tripConfig=>{
+                if (tripConfig.id == model.id) {
+                    Object.assign(tripConfig, model);
+                }
+            });
+            this.model.tripConfigList = tripConfigList;
+        },
+        handleConfirmAddTask(model) {
+            // let index = this.model.tripConfigList.findIndex(
+            //     elem => { return elem.taskIndex == this.currentRow.taskIndex }
+            // );
+
+            // if (index >= 0) {
+            //     if (!model.addToFront) {
+            //         index += 1;
+            //     }
+
+            //     this.model.tripConfigList = [...this.model.tripConfigList.slice(0, index), model, ...this.model.tripConfigList.slice(index)]
+            // } else {
+            //     this.model.tripConfigList.push(model);
+            // }
+            model.id = this.model.tripConfigList.length + 1;
+            if (model.addToFront) {
+                this.model.tripConfigList = [model, ...this.model.tripConfigList];
+            } else {
+                this.model.tripConfigList.push(model);
+            }
+        },
+        // handleConfirmDeleteTask(model) {
+        //     debugger;
+        //     let index = -1;
+        //     if (model.routingCode) {
+        //         index = this.model.tripConfigList.findIndex(
+        //             elem => { return elem.routingCode == model.routingCode; }
+        //         );
+        //     } else {
+        //         index = this.model.tripConfigList.findIndex(
+        //             elem => { return elem.tripNumber == model.tripNumber; }
+        //         );
+        //     }
+        //     // this.model.tripConfigList.
+        //     if (index >= 0) {
+        //         if (model.addToFront) {
+        //             this.model.tripConfigList = this.model.tripConfigList.slice(index + 1);
+        //         } else {
+        //             this.model.tripConfigList = this.model.tripConfigList.slice(0, index);
+        //         }
+        //     }
+        // },
+        handleCommit() {
+            if (this.isNew) {
+                if (this.model.tripConfigList.length > 0) {
+                    this.doClose();
+                    this.model.tripConfigList.map(each=>{
+                        each.startTime = each.arriveConfigList[0].arriveTime;
+                        each.endTime = each.arriveConfigList[each.arriveConfigList.length - 1].departureTime;
+                    });
+                    addPlanService(this.model).then(() => {
+                        this.$emit('refresh');
+                        // this.$emit('dispatchOperate', {
+                        // 	dialogName: 'openRunPlan', operate: 'loadRunPlanData', params: Object.assign({refresh: true}, this.$route.query)
+                        // });
+                        this.$message.success(this.$t('tip.planCreationSuccessful'));
+                    }).catch((error) => {
+                        this.$messageBox(this.$t('tip.createPlanFailed') + error.message);
+                    });
+                } else {
+                    this.$messageBox('请增加任务');
+                }
+            } else {
+                if (this.model.tripConfigList.length > 0) {
+                    this.doClose();
+                    this.model.tripConfigList.map(each=>{
+                        each.startTime = each.arriveConfigList[0].arriveTime;
+                        each.endTime = each.arriveConfigList[each.arriveConfigList.length - 1].departureTime;
+                    });
+                    updatePlanService(this.$route.query.planId || this.loadRunPlanId, this.model.serviceNumber, this.model).then(() => {
+                        this.$emit('refresh');
+                        this.$message.success('修改计划成功');
+                    }).catch(() => {
+                        this.$messageBox('修改计划失败');
+                    });
+                } else {
+                    this.$messageBox('请增加任务');
+                }
+            }
+
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .view-button {
+        display: block !important;
+        height: 36px !important;
+        width: 140px !important;
+        margin: 50px 15px;
+        border: 1px solid black !important;
+        font-weight: bold !important;
+    }
+
+    /deep/ {
+        .el-row {
+            margin-left: 10px;
+        }
+
+        .el-input.is-disabled .el-input__inner {
+            height: 20px !important;
+            line-height: 20px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue
new file mode 100644
index 000000000..752ea1e56
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/gernaratePlanTrain.vue
@@ -0,0 +1,354 @@
+<template>
+  <!-- <el-dialog
+    v-dialogDrag
+    class="planEdit__tool gernarate-plan-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    top="10vh"
+    :close-on-click-modal="false"
+  > -->
+  <div v-loading="dataLoading" style="width:500px;padding:20px 0px;height:100%">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer gerneratePlanDialog">
+      <!-- <el-button size="small" @click="doClose">{{ $t('global.cancel') }}</el-button> -->
+      <el-button type="primary" size="medium" :loading="loading" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </div>
+  <!-- </el-dialog> -->
+</template>
+
+<script>
+import { generatePlanTrain, listUserRoutingData, querySectionListByRouting } from '@/api/runplan';
+export default {
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            // dialogShow: false,
+            dataLoading:false,
+            routingMap: {},
+            loading: false,
+            oldsection:[],
+            runningRoutingMap:{},
+            runLevelList: [
+                { value: 1, label: '等级一' },
+                { value: 2, label: '等级二' },
+                { value: 3, label: '等级三'},
+                { value: 4, label: '等级四' },
+                { value: 5, label: '等级五' }
+            ],
+            formModel: {
+                gernarateType:'02',
+                serviceNumber:'', // 服务号
+                beginTime: '06:00:00', // 开始时间
+                overTime: '22:00:00', // 结束时间
+                runLevel:3, // 运行等级
+                departureInterval:300, // 发车间隔
+                outAndIn:false, // 自动生成出入库
+                runningRouting1: '', // 环路code1
+                runningRouting2: '', // 环路code2
+                runningRouting:''
+            },
+
+            rules: {
+                serviceNumber:[
+                    {required: true, validator: this.validateServiceNumber, trigger: 'blur'},
+                    {required: true, validator: this.validateServiceNo, trigger: 'change'}
+                ],
+                beginTime: [
+                    { required: true, message: '请填写开始时间', trigger: 'blur' }
+                ],
+                overTime: [
+                    { required: true, message: '请填写结束时间', trigger: 'blur' }
+                ],
+                runLevel: [
+                    { required: true, message: '请选择运行等级', trigger: 'change' }
+                ],
+                departureInterval:[
+                    { required: true, message: '请填写发车间隔', trigger: 'blur' }
+                ],
+                runningRouting: [
+                    { required: true, message: '请选择环路', trigger: 'blur' },
+                    { required: true, message: '请选择环路', trigger: 'change' }
+                ]
+            },
+            runningRouteList: []
+        };
+    },
+    computed: {
+        // title() {
+        //     return '生成计划';
+        // },
+        form() {
+            return {
+                labelWidth: '140px',
+                size:'small',
+                items: [
+                    { prop: 'gernarateType', label: '生成类型', type: 'checkBox', children: [
+                        { name: '单条服务', value: '01' },
+                        { name: '多条服务', value: '02' }
+                    ] },
+                    { prop: 'serviceNumber', label: '服务号', type: 'text', rightWidth:true, maxlength:3, show:this.formModel.gernarateType == '01'},
+                    { prop: 'beginTime', label: '开始时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'},
+                    { prop: 'overTime', label: '结束时间', type: 'timePicker', selectableRange:'02:00:00-23:59:59'},
+                    { prop: 'runLevel', label: '运行等级', type: 'select', options: this.runLevelList },
+                    { prop: 'departureInterval', label: '发车间隔', type: 'number', show:this.formModel.gernarateType == '02', min:0, step:1, precisionFlag:true, precision:0, message:'s'},
+                    { prop: 'runningRouting1', label: '环路交路1', type: 'select', show:false},
+                    { prop: 'runningRouting2', label: '环路交路2', type: 'select', show:false},
+                    { prop: 'outAndIn', label: '自动生成出入库', type: 'switchBox', show:true, activeColor:'#409eff', inactiveColor:'#dcdfe6' },
+                    { prop: 'runningRouting', label:'交路', type: 'select', options: this.runningRouteList, noDataText:'请先设置交路', clearable: true, change:true, onChange:this.onRunningRouteChange}
+                ]
+            };
+        }
+    },
+    methods: {
+        doShow(params) {
+            this.loading = false;
+            const mapId = this.$route.query.mapId;
+            if (mapId) {
+                const runningRoutingMap = {};
+                this.dataLoading = true;
+                listUserRoutingData(mapId).then(response => {
+                    const list = response.data;
+                    console.time();
+                    list.forEach(elem=>{
+                        // this.routingMap[elem.id] = {parkSectionCodeList:elem.parkSectionCodeList};
+                        if (elem.routingType === 'LOOP') {
+                            // const name = elem.name;
+                            // let temp = '';
+                            if (elem.right) {
+                                const data = runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode];
+                                if (!data) { runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode] = {}; }
+                                runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].label = elem.name;
+                                runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].value = elem.startSectionCode + '-' + elem.endSectionCode;
+                                runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].runningRouting1 = elem.id;
+                                runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].startStationCode = elem.startStationCode;
+                                runningRoutingMap[elem.startSectionCode + '-' + elem.endSectionCode].endStationCode = elem.endStationCode;
+                            } else {
+                                const data = runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode];
+                                if (!data) { runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode] = {}; }
+                                runningRoutingMap[elem.endSectionCode + '-' + elem.startSectionCode].runningRouting2 = elem.id;
+                            }
+                        }
+                    });
+                    this.runningRoutingMap = runningRoutingMap;
+                    this.onRunningRouteChange();
+                    this.dataLoading = false;
+                }).catch(_ => {
+                    console.log(_);
+                    this.dataLoading = false;
+                    this.$messageBox(`获取交路列表失败`);
+                });
+            }
+            // this.dialogShow = true;
+        },
+        validateServiceNumber(rule, value, callback) {
+            if (typeof value == 'string' && value.trim().length == 0) {
+                return callback(new Error('请填写服务号'));
+            } else {
+                let newValue = parseInt(value);
+                if (newValue) {
+                    if (newValue > 0 & newValue < 9) {
+                        newValue = '00' + newValue;
+                    } else if (newValue > 10 & newValue < 99) {
+                        newValue = '0' + newValue;
+                    }
+                    this.formModel.serviceNumber = newValue;
+                    const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
+                    if (serviceNumberList.includes(value)) {
+                        return callback(new Error('该服务号已存在'));
+                    } else {
+                        return callback();
+                    }
+                } else {
+                    this.formModel.serviceNumber = '';
+                }
+
+            }
+        },
+        validateServiceNo(rule, value, callback) {
+            if (typeof value == 'string' && value.trim().length == 0) {
+                return callback(new Error('请填写服务号'));
+            } else {
+                const serviceNumberList = Object.keys(this.$store.state.runPlan.editData);
+                if (serviceNumberList.includes(value)) {
+                    return callback(new Error('该服务号已存在'));
+                } else {
+                    return callback();
+                }
+            }
+        },
+        checkRouteCurrentValue() {
+            if (!this.runningRouteList.find(route => route.value == this.formModel.runningRouting)) {
+                this.formModel.runningRouting = '';
+                this.formModel.runningRouting1 = '';
+                this.formModel.runningRouting2 = '';
+            }
+
+            this.$nextTick(_ => {
+                this.$refs.dataform && this.$refs.dataform.clearValidate();
+            });
+        },
+        onRunningRouteChange(runningRouting = '') {
+            const temp = this.runningRoutingMap[runningRouting];
+            if (this.oldsection.length > 0) {
+                this.changeSectionSelected(this.oldsection, false);
+            }
+            if (temp) {
+                this.formModel.runningRouting1 = temp.runningRouting1;
+                this.formModel.runningRouting2 = temp.runningRouting2;
+                // if (this.routingMap[temp.runningRouting1] && this.routingMap[temp.runningRouting2]) {
+                // }
+                // 切换显示环路路径
+                this.$emit('mapLoading', true);
+                querySectionListByRouting(temp.runningRouting1).then(resp=>{
+                    querySectionListByRouting(temp.runningRouting2).then(res=>{
+                        const parkSectionCodeList = resp.data;
+                        // this.routingMap[temp.runningRouting1].parkSectionCodeList;
+                        parkSectionCodeList.push(...res.data);
+                        // this.routingMap[temp.runningRouting2].parkSectionCodeList
+                        this.changeSectionSelected(parkSectionCodeList, true);
+                        this.oldsection = parkSectionCodeList;
+                        this.$emit('mapLoading', false);
+                    }).catch(error => {
+                        console.log(error.message + '根据交路查询交路区段列表失败');
+                    });
+                }).catch(error => {
+                    console.log(error.message + '根据交路查询交路区段列表失败');
+                });
+
+            }
+
+            if (!this.formModel.runningRouting) {
+                let list = Object.values(this.runningRoutingMap).filter(route=>{ return route.runningRouting1 && route.runningRouting2; });
+                list = list.sort((a, b) => {
+                    const startStationA = this.$store.getters['map/getDeviceByCode'](a.startStationCode);
+                    const startStationB = this.$store.getters['map/getDeviceByCode'](b.startStationCode);
+                    const endStationCodeA = this.$store.getters['map/getDeviceByCode'](a.endStationCode);
+                    const endStationCodeB = this.$store.getters['map/getDeviceByCode'](b.endStationCode);
+                    return startStationA.kmRange == startStationB.kmRange ? endStationCodeA.kmRange - endStationCodeB.kmRange : startStationA.kmRange - startStationB.kmRange;
+                });
+                this.runningRouteList = list;
+            }
+
+            this.checkRouteCurrentValue();
+        },
+        doClose() {
+            this.loading = false;
+            // this.$refs.dataform.validateField('runningRouting');
+            this.$refs.dataform.resetForm();
+            this.$refs.dataform.allSelectBlur();
+            this.changeSectionSelected(this.oldsection, false);
+            // this.$refs.dataform.clearValidate();
+            // blur
+            this.formModel = {
+                gernarateType:'02',
+                serviceNumber:'', // 服务号
+                beginTime: '06:00:00', // 开始时间
+                overTime: '22:00:00', // 结束时间
+                runLevel:3, // 运行等级
+                departureInterval:300, // 发车间隔
+                outAndIn:false, // 自动生成出入库
+                runningRouting1: '', // 环路code1
+                runningRouting2: '', // 环路code2
+                runningRouting:''
+            };
+            this.$emit('close');
+            // this.dialogShow = false;
+        },
+        covertRouting(list, cb = e => true) {
+            return list.filter(route=> cb(route));
+        },
+        handleCommit() {
+            this.$refs.dataform.validateForm(() => {
+                if (this.formModel.overTime <= this.formModel.beginTime) {
+                    this.$messageBox('结束时间必须大于开始时间');
+                    return false;
+                }
+                const formModel = Object.assign({}, this.formModel);
+                if (formModel.gernarateType == '01') {
+                    delete formModel.departureInterval;
+                } else {
+                    delete formModel.serviceNumber;
+                }
+                delete formModel.gernarateType;
+                delete formModel.runningRouting;
+
+                this.loading = true;
+                generatePlanTrain(this.$route.query.planId || this.loadRunPlanId, formModel).then(res => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.dataform.resetForm();
+                    this.$store.dispatch('runPlan/refresh');
+                }).catch(error => {
+                    console.log(error);
+                    // this.doClose();
+                    this.loading = false;
+                    this.$messageBox(error.message);
+                });
+            });
+        },
+
+        changeSectionSelected(selectedList, flag) {
+            if (selectedList && selectedList.length > 0) {
+                if (flag) {
+                    // if (this.oldsection.length > 0) {
+                    //     this.oldsection.forEach((sectionInfo)=>{
+                    //         const section = this.$store.getters['map/getDeviceByCode'](sectionInfo.sectionCode);
+                    //         section.instance.drawBatchSelected(section, '');
+                    //     });
+                    //     this.oldsection = [];
+                    // }
+                    selectedList.forEach(each=>{
+                        const section = this.$store.getters['map/getDeviceByCode'](each.sectionCode);
+                        const list = section.logicSectionCodeList;
+                        // if()
+                        // relSwitchCode
+                        if (list && list.length > 0) {
+                            list.forEach(logicSectionCode=>{
+                                const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                                this.oldsection.push(logicSection);
+                                logicSection.instance.drawBatchSelected(section, 'routingSection');
+                            });
+                        } else {
+                            this.oldsection.push({sectionCode:section.code});
+                            section.instance.drawBatchSelected(section, 'routingSection');
+                        }
+                    });
+                    this.$jlmap.setCenter(selectedList[0].sectionCode);
+                } else {
+                    selectedList.forEach(each=>{
+                        const section = this.$store.getters['map/getDeviceByCode'](each.sectionCode);
+                        const list = section.logicSectionCodeList;
+                        if (list && list.length > 0) {
+                            list.forEach(logicSectionCode=>{
+                                const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                                logicSection.instance.drawBatchSelected(section, '');
+                            });
+                        } else {
+                            section.instance.drawBatchSelected(section, '');
+                        }
+                    });
+                }
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.gerneratePlanDialog{
+    display: inline-block;
+    margin-top: 20px;
+    margin-left: 150px;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyService.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyService.vue
new file mode 100644
index 000000000..42ea80616
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyService.vue
@@ -0,0 +1,169 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool modify-service"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="400px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div v-if="isModifyServiceNumber">
+      <div class="ModifyServiceName">服务号:</div>
+      <div class="ModifyServiceInput">
+        <el-input v-model="serviceNumber" type="text" :style="{width: '80%'}" :minlength="2" :maxlength="3" @blur="handleServiceNumber" />
+        <div style="color:#f00;margin-top:10px;font-size: 13px;">{{ serviceNumberTips }}</div>
+      </div>
+    </div>
+    <div v-else>
+      <div class="ModifyServiceName">车次号:</div>
+      <div class="ModifyServiceInput">
+        <el-input v-model="tripNumber" type="text" :style="{width: '80%'}" :maxlength="10" />
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { updateTripNumber, updateServiceNumber } from '@/api/runplan';
+export default {
+    name:'ModifyService',
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogShow:false,
+            isModifyServiceNumber:false,
+            serviceNumber:'',
+            tripNumber:'',
+            title:'',
+            oldServiceNumber:'',
+            oldTripNumber:'',
+            serviceNumberTips:''
+        };
+    },
+    methods:{
+        doShow(data) {
+            if (data.tripNumber) {
+                this.oldServiceNumber = data.serviceNumber;
+                this.oldTripNumber = data.tripNumber;
+                this.isModifyServiceNumber = false;
+                this.title = '修改车次号';
+                // this.tripNumber = data.tripNumber;
+            } else {
+                this.oldServiceNumber = data.serviceNumber;
+                this.isModifyServiceNumber = true;
+                this.title = '修改计划号';
+                this.serviceNumber = data.serviceNumber;
+            }
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        handleServiceNumber() {
+            const figuresOfServiceNumber = this.$store.state.map.mapConfig.figuresOfServiceNumber;
+            let newValue = parseInt(this.serviceNumber);
+            if (newValue) {
+                newValue = Math.abs(newValue);
+                if (newValue.toString().length > figuresOfServiceNumber) {
+                    this.serviceNumberTips = '该服务号长度最多为' + figuresOfServiceNumber + '位';
+                } else {
+                    newValue = newValue.toString().padStart(figuresOfServiceNumber, '0');
+                    this.serviceNumber = newValue;
+                    this.serviceNumberTips = '';
+                }
+                // if (newValue > 0 & newValue <= 9) {
+                //     newValue = '0' + newValue;
+                //     // newValue = '00' + newValue;
+                // } else if (newValue > 10 & newValue < 99) {
+                //     newValue = '0' + newValue;
+                // }
+            } else {
+                this.serviceNumber = '';
+                this.serviceNumberTips = '请输入服务号';
+            }
+        },
+        handleCommit() {
+            if (this.isModifyServiceNumber) {
+                const figuresOfServiceNumber = this.$store.state.map.mapConfig.figuresOfServiceNumber;
+                // const result = .test(this.serviceNumber);
+                // \^\[0-9\]
+                // "\*\$"
+                // debugger;
+                // var pattern = '\^\d{' + figuresOfServiceNumber + '}\$';
+                // var reg = new RegExp(pattern, 'g');
+                // const result = this.serviceNumber.match(reg);
+                let result = false;
+                const value = parseInt(this.serviceNumber);
+                if (value.toString().length > figuresOfServiceNumber) {
+                    result = false;
+                } else {
+                    result = true;
+                }
+                if (this.serviceNumber && result) {
+                    updateServiceNumber(this.$route.query.planId || this.loadRunPlanId, this.oldServiceNumber, this.serviceNumber).then(res=>{
+                        this.$message.success('修改计划号成功');
+                        // this.$emit('refresh');
+                        this.dialogShow = false;
+                        this.$store.dispatch('runPlan/refresh');
+                    }).catch(()=>{
+                        this.$message.error('修改计划号失败');
+                    });
+                } else {
+                    // this.$message.error('请输入正确的计划号(' + figuresOfServiceNumber + '位数字以内)');
+                    // this.serviceNumberTips = '请输入正确的计划号(' + figuresOfServiceNumber + '位数字以内)';
+                    this.serviceNumberTips = '该服务号长度最多为' + figuresOfServiceNumber + '位';
+                }
+
+            } else {
+                const result = /^\d{2,}$/.test(this.tripNumber);
+                if (this.tripNumber && result) {
+                    const SDTNumber = this.oldServiceNumber + this.oldTripNumber;
+                    updateTripNumber(this.$route.query.planId || this.loadRunPlanId, SDTNumber, this.tripNumber).then(res=>{
+                        this.$message.success('修改车次号成功');
+                        // this.$emit('refresh');
+                        this.dialogShow = false;
+                        this.$store.dispatch('runPlan/refresh');
+                    }).catch(()=>{
+                        this.$message.error('修改车次号失败');
+                    });
+                } else {
+                    this.$message.error('请输入正确的车次号(两位以上数字)');
+                }
+
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.ModifyServiceName{
+    width: 100px;
+    display: inline-block;
+    float: left;
+    text-align: right;
+    padding-right: 15px;
+    vertical-align: top;
+    margin-top: 11px;
+    font-size: 15px;
+    margin-left: 20px;
+}
+.ModifyServiceInput{
+    width: 180px;
+    display: inline-block;
+    vertical-align: middle;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationIntervalTime.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationIntervalTime.vue
new file mode 100644
index 000000000..ebcbe82c1
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationIntervalTime.vue
@@ -0,0 +1,293 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="1020px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row :gutter="15">
+      <el-form ref="form" :model="form" label-width="60px" size="mini">
+        <el-col :span="4">
+          <el-form-item label="等级一:">
+            <el-input v-model="form.level1" @blur="handleBlur(form.level1, '1')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="等级二:">
+            <el-input v-model="form.level2" @blur="handleBlur(form.level2, '2')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="等级三:">
+            <el-input v-model="form.level3" @blur="handleBlur(form.level3, '3')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="等级四:">
+            <el-input v-model="form.level4" @blur="handleBlur(form.level4, '4')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="等级五:">
+            <el-input v-model="form.level5" @blur="handleBlur(form.level5, '5')" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <div style="line-height: 29px; font-size: 15px;">速度单位: (Km/h)</div>
+        </el-col>
+      </el-form>
+    </el-row>
+    <el-row>
+      <el-table v-loading="dataLoading" :data="stationIntervalData" border style="width: 100%" height="420">
+        <el-table-column
+          prop="startStationCode"
+          :label="$t('planMonitor.modifying.startingStation')"
+          width="140"
+          :filters="startStationFilters"
+          :filter-method="filterStartStation"
+          column-key="startStationCode"
+        >
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ formatName(scope.row.startStationCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="startSectionCode" :label="$t('planMonitor.modifying.startSection')" width="100">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ formatName(scope.row.startSectionCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="endStationCode"
+          :label="$t('planMonitor.modifying.endStation')"
+          width="140"
+          :filters="endStationFilters"
+          :filter-method="filterEndStation"
+          column-key="endStationCode"
+        >
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ formatName(scope.row.endStationCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="endSectionCode" :label="$t('planMonitor.modifying.endSection')" width="100">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ formatName(scope.row.endSectionCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="right" :label="$t('planMonitor.modifying.direction')" width="60">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.right?'上行':'下行' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="distance" :label="$t('planMonitor.modifying.distance')" width="85">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ scope.row.distance }}</span>
+            <!-- <el-input v-model="scope.row.distance" class="input_text_box" /> -->
+          </template>
+        </el-table-column>
+        <div>
+          <el-table-column prop="l1" :label="$t('planMonitor.updateStation.level1')" width="70">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.l1" class="input_text_box" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="l2" :label="$t('planMonitor.updateStation.level2')" width="70">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.l2" class="input_text_box" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="l3" :label="$t('planMonitor.updateStation.level3')" width="70">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.l3" class="input_text_box" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="l2" :label="$t('planMonitor.updateStation.level4')" width="70">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.l4" class="input_text_box" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="l2" :label="$t('planMonitor.updateStation.level5')" width="70">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.l5" class="input_text_box" />
+            </template>
+          </el-table-column>
+        </div>
+      </el-table>
+    </el-row>
+    <div class="button-group" style="text-align: center; margin-top: 10px;">
+      <el-button :loading="loading" :disabled="updateloading" @click="handleStationDistance">更新距离</el-button>
+      <el-button @click="doClose">关闭</el-button>
+      <el-button :loading="updateloading" :disabled="loading" @click="handleStationTime">更新</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { formatName } from '@/jmapNew/theme/parser/util';
+import { setStationRunning, getMapStationRunUser, updateRunlevelDistance } from '@/api/runplan';
+
+export default {
+    name: 'ModifyingStationIntervalTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            dataLoading:false,
+            loading: false,
+            updateloading:false,
+            DirectionCodeMap: {},
+            startStationFilters:[],
+            endStationFilters:[],
+            stationIntervalData: [],
+            params: {},
+            form: {
+                level1: '',
+                level2: '',
+                level3: '',
+                level4: '',
+                level5: ''
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifying.modifyRunLevel') + ' (单位：秒)';
+        }
+    },
+    mounted() {
+        // this.loadInitData();
+    },
+    methods: {
+        formatName(code) {
+            return formatName(code);
+        },
+        loadInitData() {
+            this.DirectionCodeMap = {};
+            this.$ConstSelect.DirectionCodeList.forEach(elem => {
+                this.DirectionCodeMap[elem.value] = elem.label;
+            });
+            if (this.$route.query.lineCode) {
+                this.dataLoading = true;
+                getMapStationRunUser(this.$route.query.mapId).then(resp =>{
+                    const list = resp.data.list;
+                    this.stationIntervalData = [];
+                    this.stationIntervalData = list;
+
+                    const startStationFilterMap = {};
+                    const endStationFilterMap = {};
+                    list.forEach(stationRun=>{
+                        if (!startStationFilterMap[stationRun.startStationCode]) {
+                            startStationFilterMap[stationRun.startStationCode] = {text:formatName(stationRun.startStationCode), value:stationRun.startStationCode};
+                        }
+                        if (!endStationFilterMap[stationRun.endStationCode]) {
+                            endStationFilterMap[stationRun.endStationCode] = {text:formatName(stationRun.endStationCode), value:stationRun.endStationCode};
+                        }
+                    });
+                    this.startStationFilters = Object.values(startStationFilterMap).sort((a, b)=>{
+                        const startStationA = this.$store.getters['map/getDeviceByCode'](a.value);
+                        const startStationB = this.$store.getters['map/getDeviceByCode'](b.value);
+                        return startStationA.kmRange - startStationB.kmRange;
+                    });
+                    this.endStationFilters = Object.values(endStationFilterMap).sort((a, b)=>{
+                        const endStationA = this.$store.getters['map/getDeviceByCode'](a.value);
+                        const endStationB = this.$store.getters['map/getDeviceByCode'](b.value);
+                        return endStationA.kmRange - endStationB.kmRange;
+                    });
+
+                    this.form.level1 = '';
+                    this.form.level2 = '';
+                    this.form.level3 = '';
+                    this.form.level4 = '';
+                    this.form.level5 = '';
+                    this.dataLoading = false;
+                });
+            }
+        },
+        handleBlur(limit, level) {
+            if (limit) {
+                this.stationIntervalData.forEach(item => {
+                    if (level == '1') {
+                        item.l1 = Math.round(item.distance / (this.form.level1 / 3.6));
+                    } else if (level == '2') {
+                        item.l2 = Math.round(item.distance / (this.form.level2 / 3.6));
+                    } else if (level == '3') {
+                        item.l3 = Math.round(item.distance / (this.form.level3 / 3.6));
+                    } else if (level == '4') {
+                        item.l4 = Math.round(item.distance / (this.form.level4 / 3.6));
+                    } else if (level == '5') {
+                        item.l5 = Math.round(item.distance / (this.form.level5 / 3.6));
+                    }
+                });
+            }
+        },
+        handleStationTime() {
+            this.updateloading = true;
+            setStationRunning(this.$route.query.mapId, this.stationIntervalData).then(resp => {
+                this.updateloading = false;
+                this.$message.success(this.$t('planMonitor.modifying.modifySuccess'));
+            }).catch((error) => {
+                this.$messageBox(this.$t('planMonitor.modifying.modifyFailed') + ': ' + error.message);
+            });
+        },
+        handleStationDistance() {
+            this.$confirm('运行等级将重置为默认值，是否确定？', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                this.loading = true;
+                updateRunlevelDistance(this.$route.query.mapId).then(resp => {
+                    if (resp.data) {
+                        this.loading = false;
+                        this.$message.success('更新成功');
+                        this.stationIntervalData = resp.data;
+                    } else {
+                        this.$messageBox('更新失败:数据为空');
+                    }
+                }).catch((error) => {
+                    this.$messageBox('更新失败: ' + error.message);
+                });
+            }).catch(() => { });
+        },
+        doShow(params) {
+            this.params = params || {};
+            this.loadInitData();
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        filterStartStation(value, row) {
+            return row.startStationCode == value;
+        },
+        filterEndStation(value, row) {
+            return row.endStationCode == value;
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	@import "src/styles/mixin.scss";
+	.planEdit__tool {
+		/deep/{
+			.el-dialog__body{
+				padding-top: 0;
+			}
+			.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
+				margin-bottom: 8px;
+			}
+		}
+	}
+	.input_text_box{
+		/deep/{
+			.el-input__inner{
+				padding: 0;
+				text-align: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue
new file mode 100644
index 000000000..ef0d4bf76
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingStationStopTime.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-table :data="stationIntervalData" border style="width: 100%" height="320">
+        <el-table-column prop="startStationCode" label="车站名称">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ formatName(scope.row.stationCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="startSectionCode" label="区段名称">
+          <template slot-scope="scope">
+            <span style="margin-left: 10px">{{ formatName(scope.row.sectionCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="right" label="所属站台">
+          <template slot-scope="scope">
+            <!-- ?'上行站台':'下行站台' -->
+            <span style="margin-left: 10px">{{ formatSelect(scope.row.sectionCode) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="parkingTime" label="停站时间" width="90">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.parkingTime" class="input_text_box" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+    <div class="button-group" style="text-align: center; margin-top: 10px;">
+      <el-button @click="doClose">关闭</el-button>
+      <el-button @click="handleStationTime">更新</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { formatName } from '@/jmapNew/theme/parser/util';
+import { setStationStopTime, getStationStopTime } from '@/api/runplan';
+
+export default {
+    name: 'ModifyingStationIntervalTime',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            DirectionCodeMap: {},
+            stationIntervalData: [],
+            params: {}
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.modifying.modifyStopTime');
+        }
+    },
+    mounted() {
+        // this.loadInitData();
+    },
+    methods: {
+        formatName(code) {
+            return formatName(code);
+        },
+        formatSelect(code) {
+            const device = this.$store.state.map.map && this.$store.state.map.map.stationStandList.find(ele => ele.standTrackCode == code);
+            console.log(device.right);
+            if (device) {
+                return device.right ? '上行站台' : '下行站台';
+            }
+            return '';
+        },
+        loadInitData() {
+            this.DirectionCodeMap = {};
+            this.$ConstSelect.DirectionCodeList.forEach(elem => {
+                this.DirectionCodeMap[elem.value] = elem.label;
+            });
+
+            this.stationIntervalData = [];
+            if (this.$route.query.lineCode) {
+                getStationStopTime(this.$route.query.mapId).then(resp =>{
+                    const list = resp.data.list;
+                    this.stationIntervalData = list;
+                });
+            }
+        },
+        handleStationTime() {
+            setStationStopTime(this.$route.query.mapId, this.stationIntervalData).then(resp => {
+                this.$message.success(this.$t('planMonitor.modifying.modifySuccess'));
+            }).catch(() => {
+                this.$messageBox(this.$t('planMonitor.modifying.modifyFailed'));
+            });
+        },
+        doShow(params) {
+            this.params = params || {};
+            this.loadInitData();
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	@import "src/styles/mixin.scss";
+	.planEdit__tool {
+		/deep/{
+			.el-dialog__body{
+				padding-top: 0;
+			}
+			.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
+				margin-bottom: 8px;
+			}
+		}
+	}
+	.input_text_box{
+		/deep/{
+			.el-input__inner{
+				padding: 0;
+				text-align: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingTask.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingTask.vue
new file mode 100644
index 000000000..b94bf06cd
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/modifyingTask.vue
@@ -0,0 +1,487 @@
+<template>
+  <div>
+    <el-row>
+      <el-col :span="6">
+        <el-row>
+          <el-col :span="9" class="lineHeight">
+            <span>{{ $t('planMonitor.modifying.serviceNumber') }}</span>
+          </el-col>
+          <el-col :span="15">
+            <el-input v-model="serviceNumber" size="mini" disabled />
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="6" class="lineHeight">
+        <el-row>
+          <el-col :span="10" :offset="1">
+            <span>{{ $t('planMonitor.modifying.defaultRunLevel') }}</span>
+          </el-col>
+          <el-col :span="12">
+            <el-select
+              v-model="defaultSpeedLevel"
+              style="display: inline-black"
+              size="mini"
+              :placeholder="$t('planMonitor.modifying.pleaseSelect')"
+            >
+              <el-option
+                v-for="item in defaultSpeedLevelList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="6">
+        <el-row>
+          <el-col :span="9" class="lineHeight">
+            <span>{{ $t('planMonitor.modifying.tripNumber') }}</span>
+          </el-col>
+          <el-col :span="15">
+            <el-select v-model="tripNumber" size="mini" style="display: inline-black" disabled :placeholder="$t('planMonitor.modifying.pleaseSelect')">
+              <el-option
+                v-for="item in tripNumberList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="6" class="lineHeight">
+        <el-row>
+          <el-col :span="10" :offset="1">
+            <span>{{ $t('planMonitor.modifying.startTime') }}：</span>
+          </el-col>
+          <el-col :span="12">
+            <el-time-picker
+              v-model="editModel.startTime"
+              :placeholder="$t('planMonitor.modifying.selectTime')"
+              value-format="HH:mm:ss"
+              size="mini"
+              :picker-options="{selectableRange:'02:00:00-23:59:59'}"
+              :clearable="false"
+            />
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <el-row style=" margin-bottom: 5px;margin-top: 10px;">
+      {{ '经停转换轨 / 站台轨：' }}
+    </el-row>
+    <el-row>
+      <el-table :data="editModel.arriveConfigList" border :height="230">
+        <el-table-column prop="stationCode" :label="this.$t('planMonitor.station')">
+          <template slot-scope="scope">
+            {{ formatName(scope.row.stationCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="sectionCode" :label="this.$t('planMonitor.section')">
+          <template slot-scope="scope">
+            {{ formatName(scope.row.sectionCode) }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.arriveTime')">
+          <template v-if="scope.$index!=0" slot-scope="scope">
+            {{ scope.row.arriveTime }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.stopTime')">
+          <template v-if="scope.$index!=0&&scope.$index!=editModel.arriveConfigList.length-1" slot-scope="scope">
+            {{ scope.row.stopTime+'s' }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.departureTime')">
+          <template v-if="scope.$index!=editModel.arriveConfigList.length-1" slot-scope="scope">
+            {{ scope.row.departureTime }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="this.$t('planMonitor.runLevel')">
+          <template slot-scope="scope">
+            <span style="font-size:13px;"> {{ scope.row.speedLevel }}</span>
+            <span>{{ '('+scope.row.speedLevelTime+'s)' }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+    <div style="text-align:center;margin-top:15px;">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { updatePlanTrip, getMapStationRunUser, getStationStopTime } from '@/api/runplan';
+import { getRunplanConfig } from '@/api/jmap/mapdraft';
+import { formatTime, formatName } from '@/jmapNew/theme/parser/util';
+
+export default {
+    name: 'ModifyingTask',
+    components: {
+    },
+    data() {
+        return {
+            isPlan: false,
+            loadRunPlanId:'',
+            PlanParser: {},
+            parkSectionCodeList:[],
+            stopStationMap: {},
+            stopTimeMap:{},
+            defaultSpeedLevel: 'l1',
+            tripNumber: '',
+            serviceNumber: '',
+            planId: '',
+            startTbFront:undefined,
+            endTbFront:undefined,
+            editModel: {
+                // routingCode: '',
+                endStationCode: '',
+                startStationCode: '',
+                startTime: '02:00:00',
+                endTime: '',
+                arriveConfigList: [],
+                tripNumber: '',
+                planId: '',
+                serviceNumber: ''
+            },
+            tripNumberList: [{ value: '', label: this.$t('planMonitor.modifying.automatic') }],
+            reentryData: {},
+            defaultSpeedLevelList: [
+                { value: 'l1', label: '等级一' },
+                { value: 'l2', label: '等级二' },
+                { value: 'l3', label: '等级三'},
+                { value: 'l4', label: '等级四' },
+                { value: 'l5', label: '等级五' }
+            ],
+            routingTypeMap: {
+                OUTBOUND: '出库',
+                INBOUND: '入库',
+                LOOP: '环路'
+            }
+        };
+    },
+    watch: {
+        'editModel.startTime': function () {
+            this.computedDetailList();
+        },
+        'defaultSpeedLevel': function () {
+            this.computedDetailList('defaultSpeedLevel');
+        }
+    },
+    methods: {
+        formatTime(time) {
+            return formatTime(time);
+        },
+        formatName(code) {
+            return formatName(code);
+        },
+        computedTimeByString(timeStr) {
+            const bTime = +new Date(`2019-01-01 00:00:00`);
+            const eTime = +new Date(`2019-01-01 ${timeStr}`);
+            return Number(eTime) - Number(bTime);
+        },
+        compuntedRunTime(list, index, runLevel) {
+            let runTime = 0;
+
+            if ((index == 0 && String(this.startTbFront) == false) ||
+				(index == list.length - 1 && String(this.endTbFront) == false)) {
+                return 0;
+            }
+
+            if (index < list.length - 1) {
+                const stopStationObj = this.stopStationMap[[list[index].sectionCode, list[index + 1].sectionCode].toString()];
+                if (stopStationObj) {
+                    if (stopStationObj.runPlanLevelVO) {
+                        runTime = parseInt(stopStationObj.runPlanLevelVO[runLevel]);
+                    } else if (stopStationObj[runLevel]) {
+                        runTime = parseInt(stopStationObj[runLevel]);
+                    } else {
+                        this.$messageBox(this.$t('planMonitor.addTaskHint1') + stopStationObj.startSectionCode + this.$t('planMonitor.addTaskHint2') + stopStationObj.endSectionCode + this.$t('planMonitor.addTaskHint3'));
+                    }
+                }
+            }
+
+            return runTime;
+        },
+        computedDetailList(type = null) {
+            // if (this.editModel.routingCode) {
+            let tempTime = this.computedTimeByString(this.editModel.startTime) / 1000;
+            const list = Object.assign([], this.editModel.arriveConfigList);
+            const runLevel = this.defaultSpeedLevel || 'l1'; // 默认等级三
+
+            list.forEach((elem, index) => {
+                if (type == 'routingCode') {
+                    if (index == 0 || index == list.length - 1) {
+                        elem.stopTime = 0;
+                    } else if (this.stopTimeMap[elem.stationCode]) {
+                        elem.stopTime = this.stopTimeMap[elem.stationCode].parkingTime;
+                    } else {
+                        elem.stopTime = 0;
+                    }
+                }
+
+                tempTime = tempTime || this.computedTimeByString('23:59:59') / 1000 + 1;
+                elem.arriveTime = formatTime(tempTime);
+
+                if (index == list.length - 1 && String(this.endTbFront) == 'true') {
+                    const data = this.reentryData[list[index].stationCode] || {};
+                    elem.departureTime = formatTime(tempTime + elem.stopTime + data.tbFront || 0);
+                } else {
+                    elem.departureTime = formatTime(tempTime + elem.stopTime);
+                }
+
+                const runLevelObj = this.defaultSpeedLevelList.find(speedLevel=>{ return speedLevel.value == runLevel; });
+                const realRunlevel = this.compuntedRunTime(list, index, runLevel);
+
+                elem.speedLevelTime = realRunlevel;
+                elem.speedLevel = runLevelObj.label;
+
+                let fronTime = 0;
+                if (index == 0 && String(this.startTbFront) == 'false') {
+                    const data = this.reentryData[elem.stationCode] || {};
+                    fronTime = data.tbTo || 0;
+                } else if (index == list.length - 2 && String(this.endTbFront) == 'false') {
+                    const data = this.reentryData[list[index + 1].stationCode] || {};
+                    fronTime = data.tbTo || 0;
+                } else if (index == list.length - 1 && String(this.endTbFront) == 'true') {
+                    const data = this.reentryData[list[index].stationCode] || {};
+                    fronTime = data.tbFront || 0;
+                }
+
+                tempTime = tempTime + fronTime + elem.stopTime + elem.speedLevelTime;
+            });
+
+            this.editModel.endTime = formatTime(tempTime - list[list.length - 1].stopTime);
+            // }
+        },
+        loadInitData(params) {
+            const lineCode = this.$route.query.lineCode;
+            const mapId = this.$route.query.mapId;
+            this.isPlan = params.isPlan;
+            this.tripNumber = params.tripNumber;
+            this.serviceNumber = params.serviceNumber;
+            this.planId = this.$route.query.planId;
+            this.loadRunPlanId = params.loadRunPlanId;
+            this.PlanParser = this.$theme.loadPlanParser(lineCode);
+
+            if (mapId) {
+                getRunplanConfig(mapId).then(resp => {
+                    const data = resp.data;
+                    this.reentryData = data.config.reentryData;
+                });
+
+                getMapStationRunUser(mapId).then(resp => {
+                    const list = resp.data.list;
+                    list.forEach(elem => {
+                        this.stopStationMap[[elem.startSectionCode, elem.endSectionCode].toString()] = elem;
+                    });
+                    getStationStopTime(mapId).then(response=>{
+                        const stopTimeList = response.data.list;
+                        stopTimeList.forEach(element=>{
+                            this.stopTimeMap[element.stationCode] = {parkingTime:element.parkingTime};
+                        });
+                        this.initTaskData(params);
+                        // this.dialogShow = true;
+                    });
+                });
+            }
+        },
+        initTaskData(params) {
+            if (params.rowData && params.rowData.arriveConfigList.length > 0) {
+                const paramData = params.rowData;
+                this.initRunlevel(paramData);
+                this.editModel.arriveConfigList = paramData.arriveConfigList;
+                if (paramData.routingCode) {
+                    this.editModel.routingCode = paramData.routingCode;
+                } else {
+                    this.editModel.tripNumber = this.tripNumber;
+                }
+                this.editModel.startStationCode = paramData.startStationCode;
+                this.editModel.endStationCode = paramData.endStationCode;
+                this.editModel.startTime = paramData.startTime;
+                this.editModel.endTime = paramData.endTime;
+                this.editModel.endSectionCode = paramData.endSectionCode;
+                this.editModel.startSectionCode = paramData.startSectionCode;
+                this.editModel.id = paramData.id;
+                this.startTbFront = paramData.startTbFront;
+                this.endTbFront = paramData.endTbFront;
+                this.computedDetailList();
+            } else {
+                const editData = this.$store.state.runPlan.editData[this.serviceNumber];
+                if (editData) {
+                    const trainInfo = editData.trainMap[this.tripNumber];
+                    const lastIndex = trainInfo.stationTimeList.length - 1;
+                    this.editModel = {
+                        tripNumber: this.tripNumber,
+                        startTime: formatTime(trainInfo.startSecondTime + 7200),
+                        endTime: formatTime(trainInfo.endSecondTime + 7200),
+                        arriveConfigList: [],
+                        startStationCode:trainInfo.stationTimeList[0].stationCode,
+                        endStationCode:trainInfo.stationTimeList[lastIndex].stationCode,
+                        startSectionCode:trainInfo.startSectionCode,
+                        endSectionCode:trainInfo.endSectionCode
+                    };
+                    if (trainInfo.startSectionCode != trainInfo.stationTimeList[0].sectionCode) {
+                        this.startTbFront = false;
+                        // this.editModel.startTime = formatTime(trainInfo.startSecondTime + 7200);
+                        const newModel = {
+                            sectionCode:trainInfo.startSectionCode,
+                            stationCode:trainInfo.stationTimeList[0].stationCode,
+                            // // speedLevel:'默认',
+                            departureTime: formatTime(trainInfo.startSecondTime + 7200),
+                            arriveTime: formatTime(trainInfo.startSecondTime + 7200),
+                            stopTime:0
+                        };
+                        this.editModel.arriveConfigList.push(newModel);
+                    }
+
+                    const newstationTimeList = [];
+                    let current = {};
+
+                    trainInfo.stationTimeList.forEach((stationTime, index)=>{
+                        if (index % 2 == 0) {
+                            current = {};
+                            current.stationCode = stationTime.stationCode;
+                            current.sectionCode = stationTime.sectionCode;
+                            current.arriveTime = stationTime.secondTime;
+                        } else {
+                            current.departureTime = stationTime.secondTime;
+                            newstationTimeList.push(current);
+                        }
+                    });
+
+                    newstationTimeList.forEach((newstationTime, index)=>{
+                        if (trainInfo.startSectionCode != trainInfo.stationTimeList[0].sectionCode) {
+                            index += 1;
+                        }
+                        const newModel = {
+                            sectionCode:newstationTime.sectionCode,
+                            stationCode:newstationTime.stationCode,
+                            arriveTime: formatTime(newstationTime.arriveTime + 7200),
+                            departureTime: formatTime(newstationTime.departureTime + 7200),
+                            stopTime:newstationTime.departureTime - newstationTime.arriveTime
+                        };
+                        this.editModel.arriveConfigList.push(newModel);
+                    });
+
+                    if (trainInfo.endSectionCode != trainInfo.stationTimeList[lastIndex].sectionCode) {
+                        this.endTbFront = false;
+                        this.editModel.endTime = formatTime(trainInfo.endSecondTime + 7200);
+                        const newModel = {
+                            sectionCode:trainInfo.endSectionCode,
+                            stationCode:trainInfo.stationTimeList[lastIndex].stationCode,
+                            // // speedLevel:'默认',
+                            departureTime: formatTime(trainInfo.endSecondTime + 7200),
+                            arriveTime: formatTime(trainInfo.endSecondTime + 7200),
+                            stopTime:0
+                        };
+                        this.editModel.arriveConfigList.push(newModel);
+                    } else {
+                        if (trainInfo.reentry) {
+                            this.endTbFront = true;
+                        }
+                    }
+
+                    this.initRunlevel(this.editModel);
+                    // this.dialogShow = true;
+                    this.computedDetailList();
+                }
+            }
+        },
+        initRunlevel(paramData) {
+            const speedLevelData = this.stopStationMap[[paramData.arriveConfigList[0].sectionCode, paramData.arriveConfigList[1].sectionCode].toString()];
+            if (speedLevelData) {
+                switch (paramData.arriveConfigList[0].speedLevelTime) {
+                case speedLevelData.l1: {
+                    this.defaultSpeedLevel = 'l1';
+                    break;
+                }
+                case speedLevelData.l2: {
+                    this.defaultSpeedLevel = 'l2';
+                    break;
+                }
+                case speedLevelData.l3: {
+                    this.defaultSpeedLevel = 'l3';
+                    break;
+                }
+                case speedLevelData.l4: {
+                    this.defaultSpeedLevel = 'l4';
+                    break;
+                }
+                case speedLevelData.l5: {
+                    this.defaultSpeedLevel = 'l5';
+                    break;
+                }
+                default: {
+                    this.defaultSpeedLevel = 'l1';
+                    break;
+                }
+                }
+            }
+        },
+        doShow(params) {
+            this.loadInitData(params);
+        },
+        doClose() {
+            this.$emit('doClose');
+        },
+        buildModel() {
+            return {
+                planId: this.$route.query.planId || this.loadRunPlanId,
+                // routingCode: this.editModel.routingCode,
+                tripNumber: this.tripNumber,
+                startTime:this.editModel.arriveConfigList[0].arriveTime,
+                endTime: this.editModel.arriveConfigList[this.editModel.arriveConfigList.length - 1].departureTime,
+                arriveConfigList: this.editModel.arriveConfigList,
+                SDTNumber: `${this.serviceNumber}${this.tripNumber}`
+            };
+        },
+        handleCommit() {
+            if (this.isPlan) {
+                // 计划修改任务
+                this.$emit('dispatchOperate', { dialogName: 'editPlanningTrain', operate: 'handleConfirmUpdateTask', params: Object.assign({}, this.editModel) });
+            } else {
+                // 直接修改
+                updatePlanTrip(this.buildModel()).then(resp => {
+                    this.$emit('refresh');
+                    this.$message.success(this.$t('planMonitor.modifying.modifyTaskSuccess'));
+                }).catch(() => {
+                    this.$messageBox(this.$t('planMonitor.modifying.modifyTaskFailed'));
+                });
+            }
+            this.doClose();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .lineHeight{
+        height: 28px;
+        line-height: 28px;
+    }
+    /deep/ {
+        .el-row {
+            margin-bottom: 5px !important;
+        }
+    }
+    .add-task{
+      /deep/ {
+        .el-dialog__body{
+          padding: 0 20px;
+        }
+        .el-dialog .el-input {
+            width: 120px !important;
+        }
+        .dialog-footer{
+            display: flex;
+            justify-content: center;
+        }
+      }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/movePlaningTrain.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/movePlaningTrain.vue
new file mode 100644
index 000000000..398b84745
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/movePlaningTrain.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool duplicate-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row type="flex" justify="center">
+      <el-radio-group v-model="model.forward">
+        <el-radio :label="true">{{ $t('planMonitor.forward') }}</el-radio>
+        <el-radio :label="false">{{ $t('planMonitor.backward') }}</el-radio>
+      </el-radio-group>
+    </el-row>
+    <el-row style="margin: 10px 0px">
+      <el-col :span="5" :offset="4">{{ $t('planMonitor.intervals') }}</el-col>
+      <el-col :span="10">
+        <el-input-number v-model="model.intervals" size="mini" :min="30" controls-position="right" />
+        <span>{{ $t('global.second') }}</span>
+      </el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { movePlaningService } from '@/api/runplan';
+
+export default {
+    name: 'MovePlaningTrain',
+    components: {
+    },
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            model: {
+                serviceNumber: '',
+                forward: false,
+                intervals: 0
+            }
+        };
+    },
+    computed: {
+        title() {
+            return '平移列车';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(params) {
+            this.model.serviceNumber = params.serviceNumber;
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+            this.model['planId'] = this.$route.query.planId || this.loadRunPlanId;
+            this.model['serviceNumber'] = this.model.serviceNumber;
+            this.doClose();
+            movePlaningService(this.model).then(resp => {
+                this.$emit('refresh');
+                this.$message.success('平移列车成功！');
+            }).catch((error) => {
+                if (error.code === 500001) {
+                    this.$messageBox('平移列车失败' + this.$t('tip.duplicatePlanFailedTips'));
+                } else {
+                    this.$messageBox('平移列车失败！');
+                }
+
+            });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	@import "src/styles/mixin.scss";
+	.duplicate-train{
+		/deep/ {
+			.el-dialog__body{
+				padding: 0 20px;
+			}
+			.dialog-footer{
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/offLine.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/offLine.vue
new file mode 100644
index 000000000..342394e08
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/offLine.vue
@@ -0,0 +1,92 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool add-planning-train"
+    :title="title"
+    :visible.sync="dialogShow"
+    :width="width + 'px'"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <el-row>
+      <el-col :span="24" :offset="1">
+        <i class="el-icon-warning" />
+        {{ params.message }}
+      </el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+    name: 'OffLine',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            params: {},
+            title:this.$t('planMonitor.updateStation.deletePlanCar')
+        };
+    },
+    computed: {
+        width() {
+            if (this.params.width) {
+                return this.params.width;
+            } else {
+                return 400;
+            }
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(params) {
+            if (params.operate == 'AddPlanningTrain') {
+                this.title = this.$t('planMonitor.addPlanTrain');
+            } else {
+                this.title = this.$t('planMonitor.updateStation.deletePlanCar');
+            }
+            this.params = params || {};
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+            this.$emit('handleConfirm', this.params);
+            this.doClose();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-input {
+            width: 40px;
+        }
+    }
+	.add-planning-train{
+      /deep/ {
+        .el-dialog__body{
+          padding: 10px 20px;
+        }
+        .dialog-footer{
+            display: flex;
+            justify-content: center;
+        }
+      }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/systermOut.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/systermOut.vue
new file mode 100644
index 000000000..e7ce60744
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/systermOut.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool systerm-out"
+    :title="title"
+    :visible.sync="dialogShow"
+    :width="width + 'px'"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-input v-model="context" type="textarea" :rows="10" readonly />
+    <span slot="footer" class="dialog-footer">
+      <el-button size="medium" @click="doClose">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" size="medium" @click="handleCommit">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+    name: 'SystermOut',
+    components: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            params: {
+                width: 400,
+                contextList: []
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.updateStation.systemOutPut');
+        },
+        width() {
+            if (this.params.width) {
+                return this.params.width;
+            } else {
+                return 400;
+            }
+        },
+        context() {
+            return this.params.contextList.join('\n') || '';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        doShow(params) {
+            this.params = params || {};
+            this.dialogShow = true;
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+        },
+        handleCommit() {
+            this.doClose();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+	.systerm-out{
+		/deep/ {
+			.el-dialog__body{
+				padding: 10px 20px;
+			}
+			.dialog-footer{
+				display: flex;
+				justify-content: center;
+			}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/menus/taskDialog.vue b/src/views/newMap/display/terminals/diagramEdit/components/menus/taskDialog.vue
new file mode 100644
index 000000000..bb0f81bc6
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/menus/taskDialog.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool task-dialog"
+    :title="title"
+    :visible.sync="dialogShow"
+    :width="width"
+    :before-close="doClose"
+    :z-index="2000"
+    top="50px"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <add-task v-if="dialogType =='addTask'" ref="addTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
+    <delete-task v-if="dialogType =='deleteTask'" ref="deleteTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
+    <modifying-task v-if="dialogType =='modifyingTask'" ref="modifyingTask" @dispatchOperate="dispatchOperate" @refresh="refresh" @doClose="doClose" />
+
+  </el-dialog>
+
+</template>
+<script>
+import AddTask from './addTask';
+import DeleteTask from './deleteTask';
+import ModifyingTask from './modifyingTask';
+export default {
+    name: 'TaskDialog',
+    components: {
+        AddTask,
+        DeleteTask,
+        ModifyingTask
+    },
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            title:'',
+            dialogType:'',
+            width:'400px'
+        };
+    },
+    methods: {
+        doShow(params) {
+            const dialogMap = {
+                'addTask':{
+                    title:this.$t('planMonitor.addTask'),
+                    width:'880px'
+                },
+                'deleteTask':{
+                    title:this.$t('planMonitor.deleteTask'),
+                    width:'400px'
+                },
+                'modifyingTask':{
+                    title:this.$t('planMonitor.modifying.modifyTask'),
+                    width:'1000px'
+                }
+            };
+            const dialog = dialogMap[params.dialogType];
+            this.title = dialog.title;
+            this.width = dialog.width;
+            this.dialogType = params.dialogType;
+            this.dialogShow = true;
+            params.loadRunPlanId = this.loadRunPlanId;
+            this.$nextTick(()=>{
+                this.$refs[this.dialogType].loadInitData(params);
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.dialogType = '';
+        },
+        dispatchOperate(data) {
+            this.$emit('dispatchOperate', data);
+        },
+        refresh() {
+            this.$emit('refresh');
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/importRouteOperate.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/importRouteOperate.vue
new file mode 100644
index 000000000..8244ca564
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/importRouteOperate.vue
@@ -0,0 +1,267 @@
+<template>
+  <el-dialog v-dialogDrag title="导入公共交路" :visible.sync="show" width="80%" :before-do-close="doClose" append-to-body>
+    <div>
+      <QueryListPage
+        ref="queryListPage"
+        :pager-config="pagerConfig"
+        :query-form="queryForm"
+        :query-list="queryList"
+      />
+    </div>
+    <pre-view-field ref="previewField" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+// import { listPublicRoutingData, pullPublicRoutingData} from '@/api/jmap/mapdraft';
+import { listPublicRoutingData} from '@/api/jmap/mapdraft';
+import PreViewField from './preview';
+
+export default {
+    name: 'ImportRouteDetail',
+    components: {
+        PreViewField
+    },
+    data() {
+        return {
+            show: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                queryObject: {
+                    startStationCode: {
+                        type: 'select',
+                        label: this.$t('map.startStation'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    endStationCode: {
+                        type: 'select',
+                        label: this.$t('map.endStation'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    startSectionCode: {
+                        type: 'select',
+                        label: '起始区段',
+                        config: {
+                            data: []
+                        }
+                    },
+                    endSectionCode: {
+                        type: 'select',
+                        label: '终到区段',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                afterQuery: this.afterQuery,
+                selectCheckShow: true,
+                selectCheckClass:'selectCheckClass',
+                selectCheckSize:'medium',
+                selectCheckText:'导入',
+                selectCheckLoading:false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '交路名称',
+                        prop: 'name',
+                        width:'260'
+                    },
+                    {
+                        title: this.$t('map.startStation'),
+                        prop: 'startStationCode'
+
+                    },
+                    {
+                        title: '起始区段',
+                        prop: 'startSectionCode'
+                    },
+                    {
+                        title: this.$t('map.endStation'),
+                        prop: 'endStationCode'
+                    },
+                    {
+                        title: '终到区段',
+                        prop: 'endSectionCode'
+                    },
+                    {
+                        title: this.$t('map.routingDirection'),
+                        prop: 'right',
+                        type: 'tag',
+                        columnValue: (row) => { if (row.right) { return '右行'; } else { return '左行'; } },
+                        tagType: (row) => { if (row.right) { return 'primary'; } else { return 'success'; } }
+                    },
+                    // {
+                    //     title: this.$t('map.destination'),
+                    //     prop: 'destinationCode'
+                    // },
+                    // {
+                    //     title: this.$t('map.remarks'),
+                    //     prop: 'remarks'
+                    // },
+                    {
+                        type: 'button',
+                        title: this.$t('map.sectionData'),
+                        buttons: [
+                            {
+                                name: this.$t('map.preview'),
+                                handleClick: this.sectionDetail
+                            }
+                        ]
+                    }
+                    // {
+                    //     type: 'button',
+                    //     title: this.$t('map.operation'),
+                    //     width: '300',
+                    //     buttons: [
+                    //         {
+                    //             name: this.$t('map.compile'),
+                    //             handleClick: this.editObj
+                    //         },
+                    //         {
+                    //             name: this.$t('map.deleteObj'),
+                    //             type: 'danger',
+                    //             handleClick: this.deleteObj
+                    //         }
+                    //     ]
+                    // }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'stationList'
+        ])
+    },
+    mounted() {
+        // this.acquireMapList();
+        this.initQueryObject();
+    },
+    methods: {
+        doShow() {
+            this.show = true;
+            this.reloadTable();
+        },
+        initQueryObject() {
+            const stationList = [];
+            if (this.stationList && this.stationList.length) {
+                this.stationList.forEach(elem => {
+                    stationList.push({ label: this.formatName(elem.code), value: elem.code });
+                });
+                this.queryForm.queryObject.startStationCode.config.data = stationList;
+                this.queryForm.queryObject.endStationCode.config.data = stationList;
+            }
+            const sectionList = [];
+            if (this.sectionList && this.sectionList.length) {
+                this.sectionList.forEach(elem => {
+                    if (elem.standTrack || elem.reentryTrack || elem.transferTrack) {
+                        sectionList.push({ label: this.formatName(elem.code), value: elem.code });
+                    }
+                });
+                this.queryForm.queryObject.startSectionCode.config.data = sectionList;
+                this.queryForm.queryObject.endSectionCode.config.data = sectionList;
+            }
+        },
+        doClose() {
+            this.show = false;
+        },
+        formatName(code) {
+            let name = '';
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            if (device) {
+                name = device.name;
+            }
+
+            return name;
+        },
+        queryFunction(params) {
+            if (this.$route.query.mapId) {
+                return listPublicRoutingData(this.$route.query.mapId, params);
+            }
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        elem.startStationCode = that.formatName(elem.startStationCode);
+                        elem.startSectionCode = that.formatName(elem.startSectionCode);
+                        elem.endStationCode = that.formatName(elem.endStationCode);
+                        elem.endSectionCode = that.formatName(elem.endSectionCode);
+                    });
+                }
+            }
+            return data;
+        },
+        sectionDetail(index, row) {
+            const sectionDict = {};
+            const stationDict = {};
+            this.sectionList.forEach(elem => { sectionDict[elem.code] = elem.name; });
+            this.stationList.forEach(elem => { stationDict[elem.code] = elem.name; });
+
+            const fieldList = {
+                id: row.id,
+                mapId: this.$route.params.mapId,
+                title: '区段列表',
+                name: row.name,
+                model: {
+                    field: 'parkSectionCodeList',
+                    items: [
+                        { prop: 'stationCode', label: this.$t('map.stationCodeClomn'), type: 'text' },
+                        {
+                            prop: 'stationCode', label: '车站名称', type: 'select', options: stationDict
+                        },
+                        { prop: 'sectionCode', label: this.$t('map.blockCodingClomn'), type: 'text' },
+                        {
+                            prop: 'sectionCode', label: this.$t('map.sectionName'), type: 'select', options: sectionDict
+                        }
+                    ]
+                }
+            };
+            this.$refs.previewField.doShow(fieldList, row.parkSectionCodeList);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        // selectAllClick(selection) {
+        //     const routeList = [];
+        //     selection.forEach(each=>{
+        //         routeList.push(each.id);
+        //     });
+        //     if (routeList.length > 0) {
+        //         this.queryList.selectCheckLoading = true;
+        //         pullPublicRoutingData(this.$route.query.mapId, routeList ).then(res=>{
+        //             this.queryList.selectCheckLoading = false;
+        //             this.$message.success('导入公共交路成功');
+        //             this.doClose();
+        //         }).catch((error) => {
+        //             this.$messageBox('导入公共交路失败' + ':' + error.message);
+        //             this.queryList.selectCheckLoading = false;
+        //         });
+        //     }
+        // }
+    }
+};
+</script>
+<style lang="scss">
+.selectCheckClass{
+    text-align: center;
+    padding: 14px 0px 20px 0px;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/preview.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/preview.vue
new file mode 100644
index 000000000..ca8a546db
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/preview.vue
@@ -0,0 +1,62 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    :visible.sync="show"
+    width="30%"
+    :before-close="doClose"
+    center
+    append-to-body
+  >
+    <el-table :data="data" border style="width: 100%">
+      <template v-for="(item, index) in form">
+        <el-table-column :key="index" :label="item.label">
+          <template slot-scope="scope">
+            <template v-if="item.type === 'select'">
+              <el-tooltip effect="dark" :content="item.options[scope.row[item.prop]]" placement="top">
+                <span>{{ item.options[scope.row[item.prop]] }}</span>
+              </el-tooltip>
+            </template>
+            <template v-if="item.type === 'text'">
+              <el-tooltip effect="dark" :content="scope.row[item.prop]" placement="top">
+                <span>{{ scope.row[item.prop] }}</span>
+              </el-tooltip>
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'DictionaryDetailEdit',
+    data() {
+        return {
+            show: false,
+            title: '',
+            name: '',
+            form: [],
+            data: []
+        };
+    },
+    methods: {
+        doShow(fieldList, dataList) {
+            if (fieldList.model) {
+                const items = fieldList.model.items;
+                if (items) {
+                    this.form = items;
+                    this.name = fieldList.name;
+                    this.data = dataList;
+                    this.title = fieldList.title;
+                }
+                this.show = true;
+            }
+        },
+        doClose(done) {
+            this.show = false;
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeConfig.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeConfig.vue
new file mode 100644
index 000000000..2e23da749
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeConfig.vue
@@ -0,0 +1,753 @@
+<template>
+  <div class="routeConfig">
+    <!-- <div style="position:relative"> -->
+    <div class="routeConfigTop">
+      <el-button type="text" class="mapEdit_box" @click="previewRouteEvent">{{ $t('map.preview') }}</el-button>
+      <el-button type="text" class="mapEdit_box" @click="createRouteEvent">{{ $t('map.newConstruction') }}</el-button>
+      <!-- <el-button type="text" class="mapEdit_box" @click="importRouteEvent">导入公共交路</el-button> -->
+    </div>
+    <el-form ref="form" :model="addModel" :rules="rules" label-width="120px" size="mini" class="definition">
+      <el-form-item :label="$t('map.routingName')" prop="name">
+        <el-input v-model="addModel.name" />
+      </el-form-item>
+      <el-form-item :label="$t('map.startStationCodeColon')" prop="startStationCode">
+        <el-select v-model="addModel.startStationCode" clearable :filterable="true" disabled @change="changeStartStation">
+          <el-option
+            v-for="item in filterStationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('map.startSectionColon')" prop="startSectionCode">
+        <el-select v-model="addModel.startSectionCode" clearable :filterable="true" :disabled="editShow" @change="changeStartSection">
+          <el-option
+            v-for="item in filterStartSectionList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+        <el-button
+          :disabled="editShow"
+          :type=" field === 'startSectionCode' ? 'danger' : 'primary'"
+          @click="hover('startSectionCode')"
+        >{{ $t('map.activate') }}</el-button>
+      </el-form-item>
+      <el-form-item :label="$t('map.endStationColon')" prop="endStationCode">
+        <el-select v-model="addModel.endStationCode" :filterable="true" disabled @change="changeEndStation">
+          <el-option
+            v-for="item in filterStationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('map.endSectionColon')" prop="endSectionCode">
+        <el-select v-model="addModel.endSectionCode" :filterable="true" clearable :disabled="editShow || !isStartSelected" @change="changeEndSection">
+          <el-option
+            v-for="item in filterEndSectionList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+        <el-button
+          :disabled="editShow || !isStartSelected"
+          :type=" field === 'endSectionCode' ? 'danger' : 'primary'"
+          @click="hover('endSectionCode')"
+        >{{ $t('map.activate') }}</el-button>
+      </el-form-item>
+      <el-form-item :label="$t('map.destinationCode')" prop="destinationCode" :disabled="editShow">
+        <el-input v-model="addModel.destinationCode" />
+      </el-form-item>
+      <el-form-item :label="$t('map.routingDirection')" prop="directionCode">
+        <el-select v-model="addModel.right" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+          <el-option
+            v-for="item in DirectionCodeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('map.remarksColon')" prop="remarks">
+        <el-input v-model="addModel.remarks" type="textarea" :rows="4" :placeholder="$t('map.pleaseSelect')" />
+      </el-form-item>
+      <el-form-item :label="$t('map.trafficSegmentData')" prop="parkSectionCodeList">
+        <el-button type="primary" size="small" :loading="generating" style="margin-bottom:10px" @click.native.prevent="generateParkSection">生成经停区段</el-button>
+        <el-table
+          :data="addModel.parkSectionCodeList"
+          border
+          style="width:97%"
+          height="300"
+          class="el-parkSectionCode-table"
+        >
+          <el-table-column prop="sectionCode" :label="$t('map.stationName')">
+            <template slot-scope="scope">
+              <span>{{ formatName(scope.row.stationCode) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="sectionCode" :label="$t('map.sectionName')">
+            <template slot-scope="scope">
+              <span>{{ formatName(scope.row.sectionCode) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('map.operation')" width="50">
+            <template slot-scope="scope">
+              <el-button
+                v-show="scope.$index!=0&&scope.$index!=addModel.parkSectionCodeList.length-1"
+                type="text"
+                size="small"
+                @click.native.prevent="deleteSection(addModel.parkSectionCodeList, scope.$index)"
+              >
+                {{ $t('map.remove') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:10px;">
+          <span>车站:</span>
+          <el-select v-model="stationCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+            <el-option
+              v-for="item in filterStationList"
+              :key="item.code"
+              :label="`${item.name}(${item.code})`"
+              :value="item.code"
+            />
+          </el-select>
+          <el-button
+            :disabled="!allowSelect"
+            :type="field === 'routingStation' ? 'danger' : 'primary'"
+            @click="hover('routingStation')"
+          >{{ $t('map.activate') }}</el-button>
+        </div>
+        <div style="margin-top:10px;">
+          <span>区段:</span>
+          <el-select v-model="sectionCode" clearable :filterable="true" :placeholder="$t('map.pleaseSelect')">
+            <el-option
+              v-for="item in filterStandSection"
+              :key="item.code"
+              :label="`${item.name}(${item.code})`"
+              :value="item.code"
+            />
+          </el-select>
+          <el-button
+            :type=" field === 'routingSection' ? 'danger' : 'primary'"
+            :disabled="!allowSelect"
+            @click="hover('routingSection')"
+          >{{ $t('map.activate') }}</el-button>
+          <el-button
+            type="primary"
+            :disabled="!allowSelect"
+            @click="pushSection({stationCode: stationCode, sectionCode: sectionCode},'center')"
+          >
+            {{ $t('map.add') }}
+          </el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+    <div class="buttonGroup">
+      <el-button-group style="float:right">
+        <el-button v-if="isSave" type="primary" size="small" :loading="loading" @click="save">{{ $t('map.save') }}
+        </el-button>
+        <el-button v-else type="warning" size="small" :loading="loading" @click="update">{{ $t('map.updata') }}
+        </el-button>
+      </el-button-group>
+    </div>
+    <!-- </div> -->
+    <route-operate ref="routeOperate" @routingSelected="routingSelected" />
+    <!-- <import-route-operate ref="importRouteOperate" /> -->
+
+  </div>
+</template>
+<script>
+import RouteOperate from './routeOperate';
+// import ImportRouteOperate from './importRouteOperate';
+import { setUID } from '@/jmapNew/utils/Uid';
+import { addRoutingData, updateRoutingData, gernateRoutingSectionInRunplan } from '@/api/jmap/mapdraft';
+import { mapGetters } from 'vuex';
+import { formatName } from '@/jmapNew/theme/parser/util';
+import Sortable from 'sortablejs';
+export default {
+    name:'RouteConfig',
+    components: {
+        RouteOperate
+        // ImportRouteOperate
+    },
+    data() {
+        return {
+            field: '',
+            editShow: false,
+            isSave: true,
+            isStartSelected:false,
+            allowSelect:false,
+            loading: false,
+            generating:false,
+            stationCode: '',
+            sectionCode: '',
+            DirectionCodeList: [{label: '右行', value: true}, {label: '左行', value: false}],
+            oldStartSectionCode: '',
+            oldEndSectionCode: '',
+            addModel: {
+                name: '',
+                mapId: '',
+                code: '',
+                // withLoop:false,
+                right: true,
+                destinationCode: '',
+                startStationCode: '',
+                startSectionCode: '',
+                endStationCode: '',
+                endSectionCode: '',
+                remarks: '',
+                userId: '',
+                parkSectionCodeList: []
+            },
+            rules: {
+                name: [
+                    { required: true, message: '请输入交路名称', trigger: 'change' }
+                ],
+                startStationCode: [
+                    { required: true, message: '请选择起始站', trigger: 'change' }
+                ],
+                startSectionCode: [
+                    { required: true, message: '请选择起始区段', trigger: 'change' }
+                ],
+                endStationCode: [
+                    { required: true, message: '请选择终到站', trigger: 'change' }
+                ],
+                endSectionCode: [
+                    { required: true, message: '请选择终到区段', trigger: 'change' }
+                ]
+            },
+            oldsection: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'stationList'
+        ]),
+        filterStartSectionList() {
+            if (this.sectionList) {
+                return this.sectionList.filter(elem => { return elem.reentryTrack || elem.transferTrack; });
+            } else {
+                return [];
+            }
+        },
+        filterEndSectionList() {
+            if (this.sectionList) {
+                return this.sectionList.filter(elem => { return elem.reentryTrack || elem.transferTrack; });
+            } else {
+                return [];
+            }
+        },
+        filterStandSection() {
+            if (this.sectionList) {
+                return this.sectionList.filter(elem => { return elem.standTrack; });
+            } else {
+                return [];
+            }
+        },
+        filterStationList() {
+            if (this.stationList) {
+                return this.stationList.filter(elem => { return true; });
+            } else {
+                return [];
+            }
+        },
+        routeName: {
+            get() {
+                var name = '';
+                if (this.isSave) {
+                    let begStation = ''; let endStation = '';
+                    let begSection = ''; let endSection = '';
+                    if (this.stationList) {
+                        this.stationList.forEach(elem => {
+                            if (elem.code === this.addModel.startStationCode) begStation = elem.name;
+                            if (elem.code === this.addModel.endStationCode) endStation = elem.name;
+                        });
+                    }
+                    if (this.sectionList) {
+                        this.sectionList.forEach(elem => {
+                            if (elem.code === this.addModel.startSectionCode) begSection = '(' + elem.name + ')';
+                            if (elem.code === this.addModel.endSectionCode) endSection = '(' + elem.name + ')';
+                        });
+                    }
+                    name = begStation + begSection + '-' + endStation + endSection;
+                }
+                return name;
+            }
+
+        }
+    },
+    watch: {
+        mapInfo(val) {
+            if (val) {
+                this.addModel.mapId = val.id;
+            }
+        },
+        'addModel.parkSectionCodeList':function(val, old) {
+            if (val.length > 0) {
+                this.changeSectionSelected(val, true);
+            }
+        },
+        routeName(val, old) {
+            if (val) {
+                this.addModel.name = val;
+            }
+        },
+        sectionCode(val) {
+            val && this.changeBelongSection(val);
+        }
+    },
+    mounted() {
+        this.rowDrop();
+    },
+    methods:{
+        previewRouteEvent() {
+            this.$refs.routeOperate.doShow();
+        },
+        // importRouteEvent() {
+        //     this.$refs.importRouteOperate.doShow();
+        // },
+        createRouteEvent() {
+            this.clear();
+        },
+        routingSelected(data) {
+            this.editData(data);
+        },
+        editData(data) {
+            this.isSave = false;
+            this.allowSelect = true;
+            this.isStartSelected = true;
+            this.editShow = true;
+            this.addModel = data;
+        },
+        clear() {
+            if (this.$refs && this.$refs.form) {
+                this.changeSectionSelected(this.addModel.parkSectionCodeList, false);
+                delete this.addModel.id;
+                this.$refs.form.resetFields();
+                this.addModel.mapId = this.$route.query.mapId;
+                this.addModel.parkSectionCodeList = [];
+                this.addModel.code = '';
+                this.stationCode = '';
+                this.sectionCode = '';
+                this.isSave = true;
+                this.allowSelect = false;
+                this.isStartSelected = false;
+                this.editShow = false;
+                this.field = '';
+            }
+        },
+        setSelected(selected) {
+            if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'startStationCode'.toUpperCase()) {
+                this.addModel.startStationCode = selected.code;
+                this.judgeAllowSelected();
+                this.addStartSectionData(true);
+
+            } else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() === 'endStationCode'.toUpperCase()) {
+                this.addModel.endStationCode = selected.code;
+                this.judgeAllowSelected();
+                this.addEndSectionData(true);
+            } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'startSectionCode'.toUpperCase()) {
+                if (selected.code != this.addModel.endSectionCode && (selected.reentryTrack || selected.transferTrack)) {
+                    this.popSection(this.addModel, 'startSectionCode');
+                    if (selected.belongStation) {
+                        this.addModel.startStationCode = selected.belongStation;
+                    }
+                    this.addModel.startSectionCode = selected.code;
+                    this.judgeAllowSelected();
+                    this.addStartSectionData(false);
+                    this.oldStartSectionCode = selected.code;
+                } else {
+                    this.$message.error('请选择正确的起始区段');
+                }
+            } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'endSectionCode'.toUpperCase()) {
+                if (selected.code != this.addModel.startSectionCode && (selected.reentryTrack || selected.transferTrack)) {
+                    this.popSection(this.addModel, 'endSectionCode');
+                    if (this.addModel.startSectionCode == selected.code) {
+                        this.$message.error('起始区段和终到区段不能相同');
+                        return false;
+                    }
+                    if (selected.belongStation) {
+                        this.addModel.endStationCode = selected.belongStation;
+                    }
+                    this.addModel.endSectionCode = selected.code;
+                    this.judgeAllowSelected();
+                    this.addEndSectionData(false);
+                    this.oldEndSectionCode = selected.code;
+                    this.addModel.destinationCode = selected.destinationCode || '';
+                } else {
+                    this.$message.error('请选择正确的终到区段');
+                }
+            } else if (selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() == 'routingSection'.toUpperCase()) {
+                if (selected.standTrack) {
+                    this.sectionCode = selected.code;
+                } else {
+                    this.$message.error('请选择正确的区段');
+                }
+            } else if (selected._type.toUpperCase() === 'Station'.toUpperCase() && this.field.toUpperCase() == 'routingStation'.toUpperCase()) {
+                this.stationCode = selected.code;
+            }
+        },
+        changeBelongSection(code) {
+            const section = this.$store.getters['map/getDeviceByCode'](code);
+            if (section && section.belongStation) {
+                this.stationCode = section.belongStation;
+            }
+        },
+        changeSectionSelected(selectedList, flag) {
+            if (this.oldsection && this.oldsection.length > 0) {
+                this.oldsection.forEach((section)=>{
+                    section.instance.drawBatchSelected(section, '');
+                });
+            }
+
+            this.oldsection = [];
+            if (this.addModel.parkSectionCodeList && this.addModel.parkSectionCodeList.length > 0) {
+                if (flag) {
+                    selectedList.forEach(each=>{
+                        const section = this.$store.getters['map/getDeviceByCode'](each.sectionCode);
+                        const list = section.logicSectionCodeList;
+                        if (list && list.length > 0) {
+                            list.forEach(logicSectionCode=>{
+                                const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                                logicSection.instance.drawBatchSelected(logicSection, 'routingSection');
+                                this.oldsection && this.oldsection.push(logicSection);
+                            });
+                        } else {
+                            section.instance.drawBatchSelected(section, 'routingSection');
+                            this.oldsection && this.oldsection.push(section);
+                        }
+                    });
+                } else {
+                    selectedList.forEach(each=>{
+                        const section = this.$store.getters['map/getDeviceByCode'](each.sectionCode);
+                        const list = section.logicSectionCodeList;
+                        if (list && list.length > 0) {
+                            list.forEach(logicSectionCode=>{
+                                const logicSection = this.$store.getters['map/getDeviceByCode'](logicSectionCode);
+                                logicSection.instance.drawBatchSelected(section, '');
+                            });
+                        } else {
+                            section.instance.drawBatchSelected(section, '');
+                        }
+                    });
+                }
+            }
+        },
+        changeStartStation(code, code2) {
+            this.judgeAllowSelected();
+            this.addStartSectionData(true);
+        },
+        changeStartSection(code) {
+            if (code) {
+                if (this.addModel.endSectionCode != code) {
+                    const section = this.$store.getters['map/getDeviceByCode'](code);
+                    if (section &&
+						section.belongStation) {
+                        this.addModel.startStationCode = section.belongStation;
+                    }
+                    this.popSection({startSectionCode: this.oldStartSectionCode}, 'startSectionCode');
+                    this.judgeAllowSelected();
+                    this.addStartSectionData(false);
+                    this.oldStartSectionCode = code;
+                } else {
+                    this.addModel.startSectionCode = this.oldStartSectionCode;
+                    this.$message.error('请选择正确的起始区段');
+                }
+            } else {
+                this.popSection({startSectionCode: this.oldStartSectionCode}, 'startSectionCode');
+                this.addModel.startStationCode = '';
+                this.addModel.startSectionCode = '';
+                this.oldStartSectionCode = '';
+            }
+        },
+        changeEndStation() {
+            this.judgeAllowSelected();
+            this.addEndSectionData(true);
+        },
+        changeEndSection(code) {
+            if (code) {
+                if (this.addModel.startSectionCode != code) {
+                    const section = this.$store.getters['map/getDeviceByCode'](code);
+                    if (section &&
+						section.belongStation) {
+                        this.addModel.endStationCode = section.belongStation;
+                    }
+                    this.addModel.destinationCode = section.destinationCode || '';
+                    this.popSection({endSectionCode: this.oldEndSectionCode}, 'endSectionCode');
+                    this.judgeAllowSelected();
+                    this.addEndSectionData(false);
+                    this.oldEndSectionCode = code;
+                } else {
+                    this.addModel.endSectionCode = this.oldEndSectionCode;
+                    this.$message.error('请选择正确的终到区段');
+                }
+            } else {
+                this.popSection({endSectionCode: this.oldEndSectionCode}, 'endSectionCode');
+                this.addModel.endStationCode = '';
+                this.addModel.endSectionCode = '';
+                this.oldEndSectionCode = '';
+            }
+        },
+        judgeAllowSelected() {
+            if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '' && this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') {
+                this.allowSelect = true;
+            } else {
+                this.allowSelect = false;
+            }
+        },
+        addStartSectionData(isStation) {
+            if (this.addModel.startStationCode != '' && this.addModel.startSectionCode != '') {
+                this.isStartSelected = true;
+                this.pushSection({stationCode: this.addModel.startStationCode, sectionCode: this.addModel.startSectionCode}, 'top', isStation);
+            }
+        },
+        addEndSectionData(isStation) {
+            if (this.addModel.endStationCode != '' && this.addModel.endSectionCode != '') {
+                this.pushSection({stationCode: this.addModel.endStationCode, sectionCode: this.addModel.endSectionCode}, 'bottom', isStation);
+            }
+        },
+        buildModel(code) {
+            const model = Object.assign({}, this.addModel);
+            model['mapId'] = this.$route.query.mapId;
+            model['userId'] = this.$store.state.user.id;
+            if (code) { model['code'] = code; }
+            return model;
+        },
+        update() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = this.buildModel();
+                    // delete data.withLoop;
+                    updateRoutingData(data).then(resp => {
+                        this.$message.success(this.$t('tip.pathUpdataSuccessful'));
+                        this.loading = false;
+                        this.clear();
+                    }).catch((error) => {
+                        this.$messageBox(this.$t('tip.pathUpdataFailed') + ':' + error.message);
+                        this.loading = false;
+                    });
+
+                }
+            });
+        },
+        save() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    addRoutingData(this.buildModel(setUID('Routing'))).then(resp => {
+                        this.$message.success(this.$t('tip.pathCreationSuccessful'));
+                        this.loading = false;
+                        this.clear();
+                    }).catch((error) => {
+                        this.$messageBox(this.$t('tip.createRoutingFailed') + ':' + error.message);
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        formatName(code) {
+            return formatName(code);
+        },
+        deleteSection(list, index) {
+            const data = list.splice(index, 1);
+            if (data.length > 0) {
+                const section = this.$store.getters['map/getDeviceByCode'](data[0].sectionCode);
+                section.instance.drawBatchSelected(section, '');
+            }
+        },
+        hover(field) {
+            this.field = field === this.field ? '' : field;
+        },
+        // 行拖拽
+        rowDrop() {
+            const that = this;
+            const tbody = document.querySelector('.el-parkSectionCode-table tbody', {filter:'.ignoreDrag'});
+            if (tbody) {
+                Sortable.create(tbody, {
+                    onEnd({ newIndex, oldIndex }) {
+                        const length = that.addModel.parkSectionCodeList.length - 1;
+                        if (newIndex != 0 && oldIndex != 0 && newIndex != length && oldIndex != length) {
+                            that.addModel.parkSectionCodeList.splice(newIndex, 0, that.addModel.parkSectionCodeList.splice(oldIndex, 1)[0]);
+                            const newArray = that.addModel.parkSectionCodeList.slice(0);
+                            that.addModel.parkSectionCodeList = [];
+                            that.$nextTick(function () {
+                                that.addModel.parkSectionCodeList = newArray;
+                            });
+                        } else {
+                            const newArray = that.addModel.parkSectionCodeList.slice(0);
+                            that.addModel.parkSectionCodeList = [];
+                            that.$nextTick(function () {
+                                that.addModel.parkSectionCodeList = newArray;
+                            });
+                        }
+                    }
+                });
+            }
+        },
+        pushSection(data, type, isStation) {
+            const list = this.addModel.parkSectionCodeList;
+            if (data && data.stationCode && data.sectionCode) {
+                const index = list.findIndex(elem => { return elem.sectionCode == data.sectionCode; });
+                switch (type) {
+                case 'center': {
+                    if (index < 0) {
+                        list.splice(list.length - 1, 0, data);
+                    } else {
+                        this.$messageBox('该区段已经在交路区段中存在');
+                    }
+                    break;
+                }
+                case 'top': {
+                    if (isStation) {
+                  	if (list.find(el => { el.sectionCode == this.addModel.startSectionCode; })) {
+                            list.splice(0, 1, data);
+                        } else {
+                    		list.unshift(data);
+                        }
+                    } else {
+                        if (index < 0) {
+                            if (list.find(el => { el.sectionCode == this.addModel.startSectionCode; })) {
+                                list.splice(0, 1, data);
+                            } else {
+                                list.unshift(data);
+                            }
+                        } else {
+                            if (index == list.length - 1 && list.length >= 2) {
+                                this.addModel.startSectionCode = list[0].sectionCode;
+                                this.addModel.startStationCode = list[0].stationCode;
+                                this.$messageBox('起始区段和终到区段不能相同');
+                            } else if (index != list.length - 1 && index != 0) {
+                                this.$messageBox('该区段已经在交路区段中存在');
+                            }
+                        }
+                    }
+                    break;
+                }
+                case 'bottom': {
+                    if (isStation) {
+                        if (list.find(el => { el.sectionCode == this.addModel.endSectionCode; })) {
+                            list.splice(list.length - 1, 1, data);
+                        } else {
+                            list.push(data);
+                        }
+                    } else {
+                        if (index < 0) {
+                            if (list.find(el => { el.sectionCode == this.addModel.endSectionCode; })) {
+                                list.splice(list.length - 1, 1, data);
+                            } else {
+                                list.push(data);
+                            }
+                        } else {
+                            if (index == 0 && list.length >= 2) {
+                                this.addModel.endSectionCode = list[list.length - 1].sectionCode;
+                                this.addModel.endStationCode = list[list.length - 1].stationCode;
+                                this.$messageBox('起始区段和终到区段不能相同');
+                            } else if (index != list.length - 1 && index != 0) {
+                                this.$messageBox('该区段已经在交路区段中存在');
+                            }
+                        }
+                    }
+                    break;
+                }
+                default: {
+                    if (index < 0) {
+                        list.splice(list.length - 1, 0, data);
+                    } else {
+                        this.$messageBox(this.$t('tip.routeSameID'));
+                    }
+                    break;
+                }
+                }
+                this.sectionCode = '';
+                this.stationCode = '';
+            }
+        },
+        popSection(data, type) {
+            const list = this.addModel.parkSectionCodeList;
+            const index = list.findIndex(el => { return el.sectionCode == data[type]; });
+            if (index >= 0) {
+                this.deleteSection(list, index);
+            }
+        },
+        generateParkSection() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.generating = true;
+                    gernateRoutingSectionInRunplan(this.buildModel(setUID('Routing'))).then(resp => {
+                        this.generating = false;
+                        if (resp.data.parkSectionCodeList && resp.data.parkSectionCodeList.length > 2) {
+                            this.addModel.parkSectionCodeList = resp.data.parkSectionCodeList;
+                        }
+                    }).catch((error) => {
+                        this.$messageBox('生成交路区段数据失败: ' + error.message);
+                        this.generating = false;
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.mapEdit_box{
+	float: right;
+	padding: 3px 0;
+	margin-right: 5px;
+}
+.routeConfig{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+.routeConfigTop{
+    padding: 7px 20px 7px 0px;
+    background: #fff;
+    width: 100%;
+    z-index: 2;
+    height: 35px;
+    font-size: 16px;
+    -webkit-box-shadow: 0px 1px 3px #ccc;
+    box-shadow: 0px 1px 3px #ccc;
+}
+.routeConfigTop button{
+    display:inline-block;
+}
+.definition{
+    padding: 15px 30px 15px 0px;
+    height: 100%;
+    overflow: auto;
+    flex:1;
+    &::-webkit-scrollbar {
+        width: 4px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        background: #c3c3c3;
+    }
+
+    &::-webkit-scrollbar-track {
+        border-radius: 0;
+        background: #f0f0f0;
+
+    }
+}
+.buttonGroup{
+    width: 100%;
+    height: 40px;
+    background: #fff;
+    box-shadow: 0px -2px 5px #ccc;
+    padding-right: 26px;
+    padding-top: 4px;
+    z-index:2;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue
new file mode 100644
index 000000000..f250fd50b
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeMap.vue
@@ -0,0 +1,209 @@
+<template>
+  <el-dialog :title="title" :visible.sync="dialogShow" custom-class="content-route" width="100%" :fullscreen="true" top="0px" :before-close="close" :z-index="2000" :append-to-body="true">
+    <div class="content-box">
+      <div v-if="type=='generateRouting'">
+        <gernarate-plan ref="gernaratePlanTrain" :load-run-plan-id="loadRunPlanId" @close="closeDialog" @mapLoading="mapLoading" />
+      </div>
+      <jlmap-visual ref="jlmapVisual" v-loading="loadingMap" @onMenu="onContextmenu" @onSelect="clickEvent" />
+      <!-- :style="{height: $store.state.app.height-54+'px' }" -->
+      <div v-if="type=='routeMap'" class="routeMap">
+        <route-config ref="routeConfig" />
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import JlmapVisual from '@/views/newMap/jlmapNew/index';
+import { loadMapDataById } from '@/utils/loaddata';
+import { EventBus } from '@/scripts/event-bus';
+import RouteConfig from './routeConfig';
+import GernaratePlan from '../menus/gernaratePlanTrain';
+import { TrainingMode } from '@/scripts/ConstDic';
+
+export default {
+    name: 'RouteMap',
+    components: {
+        JlmapVisual,
+        RouteConfig,
+        GernaratePlan
+    },
+    props:{
+        loadRunPlanId: {
+            type: String,
+            default: function() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            type:'',
+            title:'',
+            dialogShow: false,
+            oldDevice: null,
+            oldsection:[],
+            isFirst:true,
+            loadingMap:false
+        };
+    },
+    watch: {
+        '$store.state.app.width': function(val) {
+            this.setWindowSize();
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setWindowSize();
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        async doShow(type) {
+            this.type = type;
+            if (this.type == 'routeMap') {
+                this.title = '交路配置';
+            } else if (this.type == 'generateRouting') {
+                this.title = '生成计划';
+            }
+            this.dialogShow = true;
+            await this.setWindowSize();
+            if (this.isFirst) {
+                this.loadInitPage();
+            }
+            this.isFirst = false;
+            if (this.type == 'generateRouting') { this.$refs.gernaratePlanTrain.doShow(); }
+        },
+        // 获取设备数据
+        getDeviceByEm(em) {
+            var	device = this.$store.getters['map/getDeviceByCode'](em.deviceCode) || null;
+            if (device) {
+                device._viewVal = em.val;
+            }
+            return device;
+        },
+        // 高亮设备
+        deviceHighLight(device, flag) {
+            if (device && device.instance && typeof device.instance.drawSelected === 'function' ) {
+                if (device._type === 'Section' && device.type === '04') {
+                    device.relevanceSectionList.forEach(item => {
+                        const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
+                        sectionModel && sectionModel.instance.drawSelected(flag);
+                    });
+                } else if (device._type === 'Section' && device.type === '01' && device.logicSectionCodeList && device.logicSectionCodeList.length) {
+                    device.logicSectionCodeList.forEach(item => {
+                        const sectionModel = this.$store.getters['map/getDeviceByCode'](item);
+                        sectionModel && sectionModel.instance.drawSelected(flag);
+                    });
+                } else {
+                    device.instance.drawSelected(flag);
+                }
+            }
+        },
+        clickEvent(em) {
+            const device = this.getDeviceByEm(em);
+            this.deviceHighLight(this.oldDevice, false);
+            this.deviceHighLight(device, true);
+            this.oldDevice = device;
+            this.setSelected(device);
+        },
+        setWindowSize() {
+            this.$nextTick(() => {
+                let width;
+                if (this.type == 'generateRouting') {
+                    width = this.$store.state.app.width - 500;
+                } else {
+                    width = this.$store.state.app.width * 0.7;
+
+                }
+                const height = this.$store.state.app.height - 49;
+                this.$store.dispatch('config/resize', { width, height });
+            });
+        },
+        loadInitPage() {
+            this.$store.dispatch('training/changeMode', { mode: TrainingMode.NORMAL });
+            loadMapDataById(this.$route.query.mapId, 'preview');
+        },
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
+
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        setSelected(selected) {
+            if (selected) {
+                if (this.type == 'routeMap') { this.$refs.routeConfig.setSelected(selected); }
+            }
+        },
+        // batchSectionListFocus(flag) {
+        //     this.changeSectionSelected(this.addModel.parkSectionCodeList, flag);
+        // },
+        onContextmenu() {
+
+        },
+        close() {
+            this.dialogShow = false;
+            if (this.type == 'routeMap') { this.$refs.routeConfig.createRouteEvent(); }
+            if (this.type == 'generateRouting') { this.$refs.gernaratePlanTrain.doClose(); }
+        },
+        closeDialog() {
+            this.dialogShow = false;
+        },
+        mapLoading(status) {
+            this.loadingMap = status;
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ {
+	.is-fullscreen {
+		overflow: hidden !important;
+	}
+}
+.routeMap{
+    height:100%;
+    // overflow:auto;
+    width: 30%;
+    position: relative;
+    &::-webkit-scrollbar {
+        width: 4px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        background: #c3c3c3;
+    }
+
+    &::-webkit-scrollbar-track {
+        border-radius: 0;
+        background: #f0f0f0;
+
+    }
+}
+.el-dialog.is-fullscreen.content-route .el-dialog__header{
+    padding-top: 15px !important;
+    .el-dialog__headerbtn{
+        top:15px;
+    }
+}
+</style>
+<style lang="scss">
+.content-route .el-dialog__body {
+    padding: 0 !important;
+    overflow: hidden !important;
+    height:100%
+}
+.content-route .content-box{
+    display:flex;
+    height:100%;
+}
+.el-dialog.is-fullscreen.content-route{
+    display: flex;
+    flex-direction: column;
+}
+</style>
+
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeOperate.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeOperate.vue
new file mode 100644
index 000000000..e32c5d653
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/routeOperate.vue
@@ -0,0 +1,284 @@
+<template>
+  <el-dialog v-dialogDrag title="交路列表" :visible.sync="show" width="85%" :before-do-close="doClose" append-to-body>
+    <div>
+      <QueryListPage
+        ref="queryListPage"
+        :pager-config="pagerConfig"
+        :query-form="queryForm"
+        :query-list="queryList"
+      />
+    </div>
+    <pre-view-field ref="previewField" />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { listRoutingData, deleteRoutingData, getRoutingData } from '@/api/jmap/mapdraft';
+import PreViewField from './preview';
+
+export default {
+    name: 'RouteDetail',
+    components: {
+        PreViewField
+    },
+    data() {
+        return {
+            show: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                queryObject: {
+                    startStationCode: {
+                        type: 'select',
+                        label: this.$t('map.startStation'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    endStationCode: {
+                        type: 'select',
+                        label: this.$t('map.endStation'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    startSectionCode: {
+                        type: 'select',
+                        label: '起始区段',
+                        config: {
+                            data: []
+                        }
+                    },
+                    endSectionCode: {
+                        type: 'select',
+                        label: '终到区段',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                afterQuery: this.afterQuery,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '交路名称',
+                        prop: 'name',
+                        width:'260'
+                    },
+                    {
+                        title: this.$t('map.startStation'),
+                        prop: 'startStationCode'
+
+                    },
+                    {
+                        title: '起始区段',
+                        prop: 'startSectionCode'
+                    },
+                    {
+                        title: this.$t('map.endStation'),
+                        prop: 'endStationCode'
+                    },
+                    {
+                        title: '终到区段',
+                        prop: 'endSectionCode'
+                    },
+                    {
+                        title: this.$t('map.routingDirection'),
+                        prop: 'right',
+                        type: 'tag',
+                        columnValue: (row) => { if (row.right) { return '右行'; } else { return '左行'; } },
+                        tagType: (row) => { if (row.right) { return 'primary'; } else { return 'success'; } }
+                    },
+                    {
+                        title: this.$t('map.destination'),
+                        prop: 'destinationCode'
+                    },
+					{
+						title: '类别',
+						prop: 'userId',
+						type: 'tag',
+						columnValue: (row) => { return row.hasOwnProperty('userId') ? '自定义': '系统默认交路'; },
+						tagType: (row) => { return "primary"; }
+					},
+                    {
+                        title: this.$t('map.remarks'),
+                        prop: 'remarks'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('map.sectionData'),
+                        buttons: [
+                            {
+                                name: this.$t('map.preview'),
+                                handleClick: this.sectionDetail
+                            }
+                        ]
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('map.operation'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: this.$t('map.compile'),
+                                handleClick: this.editObj,
+								 showControl: (row) => { return row.hasOwnProperty('userId') && row.userId == this.$store.state.user.id},
+                            },
+                            {
+                                name: this.$t('map.deleteObj'),
+                                type: 'danger',
+                                handleClick: this.deleteObj,
+								 showControl: (row) => { return row.hasOwnProperty('userId')&& row.userId == this.$store.state.user.id},
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'stationList'
+        ])
+    },
+    mounted() {
+        this.initQueryObject();
+    },
+    methods: {
+        doShow() {
+            this.show = true;
+            this.reloadTable();
+        },
+        initQueryObject() {
+            const stationList = [];
+            if (this.stationList && this.stationList.length) {
+                this.stationList.forEach(elem => {
+                    stationList.push({ label: this.formatName(elem.code), value: elem.code });
+                });
+                this.queryForm.queryObject.startStationCode.config.data = stationList;
+                this.queryForm.queryObject.endStationCode.config.data = stationList;
+            }
+            const sectionList = [];
+            if (this.sectionList && this.sectionList.length) {
+                this.sectionList.forEach(elem => {
+                    if (elem.standTrack || elem.reentryTrack || elem.transferTrack) {
+                        sectionList.push({ label: this.formatName(elem.code), value: elem.code });
+                    }
+                });
+                this.queryForm.queryObject.startSectionCode.config.data = sectionList;
+                this.queryForm.queryObject.endSectionCode.config.data = sectionList;
+            }
+        },
+        doClose() {
+            this.show = false;
+        },
+        formatName(code) {
+            let name = '';
+            const device = this.$store.getters['map/getDeviceByCode'](code);
+            if (device) {
+                name = device.name;
+            }
+
+            return name;
+        },
+        queryFunction(params) {
+            if (this.$route.query.mapId) {
+                return listRoutingData(this.$route.query.mapId, params);
+            }
+        },
+        afterQuery(data) {
+            if (data && data.list) {
+                const that = this;
+                const list = data.list;
+                if (list) {
+                    list.map(elem => {
+                        elem.startStationCode = that.formatName(elem.startStationCode);
+                        elem.startSectionCode = that.formatName(elem.startSectionCode);
+                        elem.endStationCode = that.formatName(elem.endStationCode);
+                        elem.endSectionCode = that.formatName(elem.endSectionCode);
+                    });
+                }
+            }
+            return data;
+        },
+        editObj(index, row) {
+            getRoutingData(row.id).then(response => {
+                const data = Object.assign({ code: response.data.id }, response.data);
+                this.$emit('routingSelected', data);
+                this.doClose();
+            });
+        },
+        deleteObj(index, row) {
+            if (this.$route.query.mapId && row) {
+                this.$confirm('是否确认删除交路', this.$t('global.tips'), {
+                    confirmButtonText: this.$t('global.confirm'),
+                    cancelButtonText: this.$t('global.cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    // 删除
+                    deleteRoutingData(row.id).then(response => {
+                        this.$message.success(this.$t('map.successfullyDelete'));
+                        this.reloadTable();
+                    }).catch(() => {
+                        this.$messageBox(this.$t('map.failDelete'));
+                    });
+                }).catch();
+            }
+        },
+        // generateData(index, row) {
+        //     if (this.$route.query.mapId && row) {
+        //         // 根据地图交路区段生成站间运行等级
+        //         generateStationRunData(row.id).then(response => {
+        //             this.$message.success(this.$t('map.generateStationRunDataSuccess'));
+        //             //  站间运行数据生成成功
+        //             this.reloadTable();
+        //         }).catch((error) => {
+        //             // 站间运行数据生成失败
+        //             this.$messageBox(this.$t('map.generateStationRunDataFailed') + ': ' + error.message);
+        //         });
+        //     }
+        // },
+        sectionDetail(index, row) {
+            const sectionDict = {};
+            const stationDict = {};
+            this.sectionList.forEach(elem => { sectionDict[elem.code] = elem.name; });
+            this.stationList.forEach(elem => { stationDict[elem.code] = elem.name; });
+
+            const fieldList = {
+                id: row.id,
+                mapId: this.$route.params.mapId,
+                title: '区段列表',
+                name: row.name,
+                model: {
+                    field: 'parkSectionCodeList',
+                    items: [
+                        { prop: 'stationCode', label: this.$t('map.stationCodeClomn'), type: 'text' },
+                        {
+                            prop: 'stationCode', label: '车站名称', type: 'select', options: stationDict
+                        },
+                        { prop: 'sectionCode', label: this.$t('map.blockCodingClomn'), type: 'text' },
+                        {
+                            prop: 'sectionCode', label: this.$t('map.sectionName'), type: 'select', options: sectionDict
+                        }
+                    ]
+                }
+            };
+            this.$refs.previewField.doShow(fieldList, row.parkSectionCodeList);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/runplanConfig.vue b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/runplanConfig.vue
new file mode 100644
index 000000000..b0c6cb974
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/routingoperate/runplanConfig.vue
@@ -0,0 +1,214 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogShow"
+    custom-class="content-route"
+    width="750px"
+    top="10vh"
+    title="折返配置  (单位：秒)"
+    :before-close="close"
+    :z-index="2000"
+    :append-to-body="true"
+  >
+    <div class="runPlanConfig">
+      <!-- <div class="reentryConfig" /> -->
+      <div class="reentryConfigTable">
+        <el-table
+          :data="reentryDataList"
+          border
+          style="width:100%"
+          height="430"
+          class="el-parkSectionCode-table"
+        >
+          <el-table-column prop="stationCode" :label="$t('map.stationName')">
+            <template slot-scope="scope">
+              <span>{{ scope.row.stationName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="站前折返">
+            <template slot-scope="scope">
+              <!-- v-if="scope.row.reentryData.tbFrom" -->
+              <el-input-number
+                v-model="scope.row.reentryData.tbFront"
+                :style="{width: '80px'}"
+                :min="1"
+                size="mini"
+                :controls="false"
+                :precision="0"
+                :step="1"
+              />
+            <!-- <el-button v-else type="primary" size="small" @click="add(scope.row)">添加</el-button> -->
+            </template>
+          </el-table-column>
+          <el-table-column label="站后折返">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.reentryData.tbBack"
+                :style="{width: '80px'}"
+                :min="1"
+                size="mini"
+                :precision="0"
+                :controls="false"
+                :step="1"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="从股道到折返">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.reentryData.tbFrom"
+                :style="{width: '80px'}"
+                :min="1"
+                size="mini"
+                :controls="false"
+                :precision="0"
+                :step="1"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="从折返到股道">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.reentryData.tbTo"
+                :style="{width: '80px'}"
+                :min="1"
+                size="mini"
+                :controls="false"
+                :precision="0"
+                :step="1"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: center; margin-top: 10px;">
+          <el-button type="primary" :loading="loading" @click="save">{{ $t('map.save') }}
+          </el-button>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { addRunplanConfig, getRunplanConfig } from '@/api/jmap/mapdraft';
+export default {
+    name:'RunPlanConfig',
+    data() {
+        return {
+            dialogShow: false,
+            reentryDataList:[],
+            stationList:{},
+            sectionCode:'',
+            field:'',
+            loading:false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList'
+        ])
+    },
+    watch:{
+        '$store.state.map.mapDataLoadedCount':function(val) {
+            if (this.sectionList) {
+                const reentrySections = this.sectionList.filter(elem => { return elem.reentryTrack; });
+                const stationList = {};
+                reentrySections.forEach(each=>{
+                    if (each.belongStation) {
+                        const station = this.$store.getters['map/getDeviceByCode'](each.belongStation);
+                        if (!stationList[each.belongStation]) {
+                            stationList[each.belongStation] = {code:each.belongStation, stationName:station.name,
+                                reentryData:{tbFront:undefined, tbBack:undefined, tbFrom:undefined, tbTo:undefined}};
+                        }
+                    }
+                });
+                this.reentryDataList = Object.values(stationList);
+                this.stationList = stationList;
+            }
+        }
+    },
+    mounted() {
+    },
+    methods:{
+        doShow() {
+            this.dialogShow = true;
+            this.loading = false;
+            const self = this;
+            getRunplanConfig(this.$route.query.mapId).then(resp => {
+                if (resp.data && resp.data.config && resp.data.config.reentryData) {
+                    const reentryData = resp.data.config.reentryData;
+                    const keys = Object.keys(reentryData);
+                    keys.forEach(each=>{
+                        self.stationList[each].reentryData = reentryData[each];
+                    });
+                    const newData = Object.values(this.stationList);
+                    self.reentryDataList = [...newData || []];
+                }
+            });
+        },
+        close() {
+            this.dialogShow = false;
+        },
+        save() {
+            const tbBackList = [];
+            const reentryData = {};
+            this.reentryDataList.forEach(each=>{
+                if (each.reentryData.tbFront || (each.reentryData.tbBack && each.reentryData.tbFrom && each.reentryData.tbTo)) {
+                    const temp = Object.assign({}, each.reentryData);
+                    if (!(each.reentryData.tbFront && (each.reentryData.tbBack && each.reentryData.tbFrom && each.reentryData.tbTo))) {
+                        if (each.reentryData.tbFront) {
+                            temp.tbBack = null;
+                            temp.tbFrom = null;
+                            temp.tbTo = null;
+                        } else {
+                            temp.tbFront = null;
+                        }
+                    }
+                    reentryData[each.code] = temp;
+                }
+                if (!(each.reentryData.tbBack && each.reentryData.tbFrom && each.reentryData.tbTo)) {
+                    if (each.reentryData.tbBack || each.reentryData.tbFrom || each.reentryData.tbTo) {
+                        tbBackList.push(each.stationName);
+                    }
+                }
+            });
+            if (tbBackList.length > 0) {
+                this.$messageBox('请设置【' + tbBackList.toString() + '】站后折返信息');
+                return;
+            } else if (Object.keys(reentryData).length == 0) {
+                // JSON.stringify(reentryData) == '{}'
+                this.$messageBox('请填写折返配置信息');
+                return;
+            }
+            addRunplanConfig(this.$route.query.mapId, {'reentryData':reentryData}).then(resp => {
+                this.$message.success('折返配置成功');
+                this.loading = false;
+            }).catch((error) => {
+                this.$messageBox('折返配置失败' + ':' + error.message);
+                this.loading = false;
+            });
+        }
+    }
+};
+</script>
+<style lang="scss">
+.reentryConfigTable{
+margin-top: 10px;
+}
+.runPlanConfig{padding:0px 20px 20px 20px}
+.reentryConfigTable .el-table--scrollable-y .el-table__body-wrapper{
+    &::-webkit-scrollbar {
+        width: 4px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        background: #c3c3c3;
+    }
+
+    &::-webkit-scrollbar-track {
+        border-radius: 0;
+        background: #f0f0f0;
+
+    }
+}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue b/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue
new file mode 100644
index 000000000..d7e8a4b47
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/components/schedule.vue
@@ -0,0 +1,848 @@
+<template>
+  <div id="PlanSchedule" v-loading="runplanLoading">
+    <div class="left">
+      <div :id="runPlanId" />
+    </div>
+    <div v-show="showTrain" class="position">
+      <data-table
+        ref="serviceTable"
+        class="data_table_box"
+        :config="serviceNumberConfig"
+      />
+      <!-- @touch="scheduleTouch" -->
+      <data-table
+        ref="tripTable"
+        style="margin-top: 3px;"
+        class="data_table_box"
+        :config="tripNumberConfig"
+      />
+      <!-- @touch="trainNumTouch" -->
+    </div>
+    <modify-service ref="modifyService" :load-run-plan-id="loadRunPlanId" />
+  </div>
+</template>
+
+<script>
+import ModifyService from '../components/menus/modifyService';
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+import { getStationList, queryRunPlan } from '@/api/runplan';
+// import {getRpDetailByUserMapId, getUserMapDetailByMapId} from '@/api/designPlatform';
+import { getPublishMapInfo } from '@/api/jmap/map';
+// import {getMapDetail} from '@/api/jmap/mapdraft';
+import DataTable from '../components/menus/components/dataTable';
+import echarts from 'echarts';
+
+export default {
+    name: 'PlanSchedule',
+    components: {
+        DataTable,
+        ModifyService
+    },
+    props: {
+        planParser: {
+            type: Object,
+            required: true
+        },
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        },
+        loadRunPlanName: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            top: 0,
+            height: 0,
+            mapName: '',
+            runPlanId: 'plan-tool',
+            myChart: null,
+            showTrain: false,
+            runplanLoading:false,
+            serviceNumberConfig: {
+                data: [],
+                title: this.$t('planMonitor.serviceNumber'),
+                showHeader: false,
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                handleModify:this.serviceNumberModify,
+                handleTips:'单击数字选择表号，双击数字修改表号,<br/>有车次信息变动 车次号会重新自动排列',
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: this.$t('planMonitor.serviceNumber')
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                title: this.$t('planMonitor.tripNumber'),
+                showHeader: false,
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                handleModify:this.tripNumberModify,
+                handleTips:'单击数字选择车次号，双击数字修改车次号,<br/>有车次信息变动 车次号会重新自动排列',
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: this.$t('planMonitor.tripNumber')
+                    }
+                ]
+            },
+            // realData: {},
+            // kmRangeMap: {},
+            option: {
+                title: { // 标题
+                    text: '',
+                    left: 'center', // 居中对齐
+                    top: '10px'
+                },
+                grid: { // 整个坐标系位置
+                    top: '50px',
+                    left: '120px',
+                    right: '80px',
+                    bottom: '60px',
+                    containLabel: true,
+                    backgroundColor: 'floralwhite'
+                },
+                toolbox: { // 工具栏
+                    // top: '10px',
+                    // right: '120px',
+                    // feature: {
+                    //     dataZoom: {
+                    //         yAxisIndex: 'none'
+                    //     },
+                    //     restore: {},
+                    //     saveAsImage: {}
+                    // }
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        // trigger: 'item',
+                        type: 'cross',
+                        snap: true,
+                        axis: 'x'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1,
+                    position: function (pt) {
+                        const data = pt[0] + 10;
+                        return [data, '20%'];
+                    }
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        boundaryGap: false,
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 1
+                                // color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: {
+                    type: 'value',
+                    splitLine: {
+                        show: false
+                    },
+                    axisTick: {
+                        show: false
+                    },
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 1
+                            // color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        interval: 'auto',
+                        formatter: this.yAxisLableFormat
+                    },
+                    axisPointer: {
+                        xAxisIndex: 'all',
+                        label: {
+                            formatter: this.yAxisPointFormat,
+                            backgroundColor: 'rgb(0,100,0,0.5)',
+                            color: 'white'
+                            // margin: -60
+                        }
+                    },
+                    min: 0,
+                    max: 0
+                },
+                series: [],
+                dataZoom: [ // 滑动滚轮
+                    {
+                        type: 'inside'
+                    },
+                    {
+                        fiterMode: 'filter',
+                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+                        handleSize: '80%',
+                        handleStyle: {
+                            color: '#fff',
+                            shadowBlur: 3,
+                            shadowColor: 'rgba(0, 0, 0, 0.6)',
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 2
+                        },
+                        bottom: '20px'
+                    }
+                ]
+            },
+            // absoluteTime: 2 * 3600,
+            // indexKmRangeMap: {},
+            stationsObj: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        planId() {
+            return this.$route.query.planId || this.loadRunPlanId;
+        },
+        maxWidth() {
+            return this.$store.state.app.width;
+        },
+        maxHeight() {
+            return this.$store.state.app.height;
+        }
+    },
+    watch: {
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.runPlan.refreshCount': function() {
+            // || this.loadRunPlanId
+            if (this.planId) {
+                this.loadChartPage();
+            }
+        },
+        // $route() {
+        //     this.$nextTick(() => {
+        //         this.loadChartPage();
+        //     });
+        // },
+        planId() {
+            if (this.planId) {
+                this.loadChartPage();
+            } else {
+                this.clearCanvas();
+            }
+        },
+        'maxWidth':function () {
+            this.setPosition();
+        },
+        'maxHeight':function () {
+            this.setPosition();
+        }
+    },
+    mounted() {
+        this.setPosition();
+        if (this.planId) {
+            this.loadChartPage();
+        }
+        // this.loadChartPage();
+    },
+    beforeDestroy() {
+        this.destroy();
+    },
+    methods: {
+        displayTrain() {
+            this.showTrain = !this.showTrain;
+        },
+        serviceNumberModify(row) {
+            if (row) {
+                this.$refs.modifyService.doShow({serviceNumber:row.serviceNumber});
+            }
+        },
+        tripNumberModify(row) {
+            if (row) {
+                this.$refs.modifyService.doShow({serviceNumber:this.$store.state.runPlan.selected.serviceNumber, tripNumber:row.tripNumber});
+            }
+        },
+        serviceNumberChange(row) {
+            let serviceNumber = null;
+            let serviceObj = {};
+            if (row) {
+                serviceNumber = row.serviceNumber;
+                serviceObj = this.$store.state.runPlan.editData[row.serviceNumber] || {};
+
+                const op = this.myChart.getOption();
+                // console.log(op.series);
+                // const array1 = []; op.series[1].data.forEach(each=>{ array1.push({dataTime:each[0], temperature:each[1], serviceNumber:each[3]}); });
+                // const array1 = []; op.series[5].data.forEach(each=>{ array1.push({dataTime:each[0], kiloMemter:each[1], serviceNumber:each[3], tripNumber:'05'}); });
+                // debugger;
+                op.series.forEach((item, index) => {
+                    item.lineStyle.color = '#000';
+                    item.lineStyle.width = 0.5;
+                    switch (item.name) {
+                    case serviceNumber: {
+                        item.lineStyle.color = 'red';
+                        item.lineStyle.width = 1;
+                        break;
+                    }
+                    case 'trainLabel': {
+                        op.series.pop();
+                        break;
+                    }
+                    }
+                });
+                this.myChart.setOption(op, true);
+            }
+            if (this.loadRunPlanId) {
+                this.$store.dispatch('runPlan/setDraftSelected', { serviceNumber: serviceNumber, tripNumber: null });
+            } else {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: null });
+            }
+
+            this.analyticalTripNumber(serviceObj.trainMap || {});
+        },
+        tripNumberChange(row) {
+            let serviceNumber;
+            if (this.loadRunPlanId) {
+                serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            } else {
+                serviceNumber = this.$store.state.runPlan.selected.serviceNumber;
+            }
+            let tripNumber = null;
+            if (row) {
+                const data = [];
+                tripNumber = row.tripNumber;
+                const op = this.myChart.getOption();
+                op.series.forEach((item, index) => {
+                    switch (item.name) {
+                    case serviceNumber: {
+                        // const param = '\\[\\d*,\\d*,"Station_\\d*_[.\\d]*","' + tripNumber + '"\\]';
+                        // const temp = JSON.stringify(item.data).match(new RegExp(param, 'g'));
+                        // data = JSON.parse('[' + temp.toString() + ']');
+                        item.data.forEach(nor => {
+                            if (nor[3] == tripNumber) {
+                                data.push(nor);
+                            }
+                        });
+                        // item.lineStyle.color = '#000';
+                        item.lineStyle.width = 0.5;
+                        break;
+                    }
+                    case 'trainLabel': {
+                        op.series.pop();
+                        this.myChart && this.myChart.setOption(op, true);
+                        break;
+                    }
+                    }
+                });
+                op.series.push({
+                    name: 'trainLabel',
+                    lineStyle: {
+                        color: 'green',
+                        width:2
+                    },
+                    type: 'line',
+                    data: data
+                });
+                setTimeout(() => {
+                    this.myChart && this.myChart.setOption(op, true);
+                }, 50);
+
+            }
+            if (this.loadRunPlanId) {
+                this.$store.dispatch('runPlan/setDraftSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber });
+            } else {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber });
+            }
+
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            // this.tripNumberConfig.data = Object.keys(data || {})
+            //     .sort((a, b) => { return data[a].tripNumber - data[b].tripNumber; })
+            //     .map(tripNumber => { return { tripNumber }; });
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                let top = 3;
+                let height = this.maxHeight;
+
+                const titleBar = document.getElementById('PlanTitleBar');
+                const menuBar = document.getElementById('PlanMenuBar');
+                const menuTool = document.getElementById('PlanMenuTool');
+                const statusBar = document.getElementById('PlanStatusBar');
+
+                if (titleBar) {
+                    top += (titleBar.offsetHeight || 0);
+                }
+
+                if (menuBar) {
+                    top += (menuBar.offsetHeight || 0);
+                }
+
+                if (menuTool) {
+                    top += (menuTool.offsetHeight || 0);
+                }
+
+                if (statusBar) {
+                    height -= (statusBar.offsetHeight || 0);
+                }
+
+                height = height - top;
+                this.$store.dispatch('runPlan/resize', { width:this.maxWidth, height });
+                if (this.top != top) {
+                    this.top = top;
+                }
+
+                if (this.height != height) {
+                    this.height = height - 20 * 2;
+                }
+            });
+        },
+        async loadChartPage() {
+            try {
+                // if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+                //     getUserMapDetailByMapId(this.$route.query.mapId).then(resp => {
+                //         this.mapName = `${resp.data.name} (${this.$route.query.planName || this.loadRunPlanName || ''})`;
+                //     });
+                // } else {
+                getPublishMapInfo(this.$route.query.mapId).then(resp => {
+                    if (this.loadRunPlanId) {
+                        this.mapName = this.$route.query.planName || this.loadRunPlanName || '';
+                    } else {
+                        this.mapName = `${resp.data.name} (${this.$route.query.planName || this.loadRunPlanName || ''})`;
+                    }
+                });
+                // }
+
+                this.$store.dispatch('runPlan/clear').then(() => {
+                    if (this.$route.query.mapId) {
+                        // if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+                        //     this.runplanLoading = true;
+                        //     getMapDetail(this.$route.query.mapId).then(response => {
+                        //         const res = response.data;
+                        //         const stationList = res.stationList.sort((a, b)=>{ return a.kmRange - b.kmRange; });
+                        //         this.$store.dispatch('runPlan/setStations', stationList).then(() => {
+                        //             this.loadInitData();
+                        //             if (this.planId || this.loadRunPlanId) {
+                        //                 getRpDetailByUserMapId(this.planId || this.loadRunPlanId).then(rest => {
+                        //                     this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
+                        //                         this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+                        //                         this.loadChartData();
+                        //                         this.runplanLoading = false;
+                        //                     });
+                        //                 }).catch(() => {
+                        //                     this.runplanLoading = false;
+                        //                     this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+                        //                 });
+                        //             }
+                        //         });
+                        //         // });
+                        //     });
+                        // } else {
+                        this.runplanLoading = true;
+                        getStationList(this.$route.query.mapId).then(resp => {
+                            this.$store.dispatch('runPlan/setStations', resp.data).then(() => {
+                                this.loadInitData();
+                                // if (this.planId || this.loadRunPlanId) {
+                                queryRunPlan(this.planId || this.loadRunPlanId).then(rest => {
+                                    this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
+                                        this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+                                        this.loadChartData();
+                                        this.runplanLoading = false;
+                                    });
+                                }).catch(() => {
+                                    this.runplanLoading = false;
+                                    this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+                                });
+                                // } else {
+                                //     this.clearCanvas();
+                                // }
+                            });
+                        }).catch(() => {
+                            this.$messageBox(this.$t('tip.requestingStationDataFailed'));
+                            this.$store.dispatch('runPlan/setStations', []);
+                        });
+                    }
+                    // }
+                });
+            } catch (error) {
+                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
+                console.log(error);
+            }
+        },
+        async loadChartData() {
+            try {
+                // let option={};
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.stationsObj = {};
+                stations.forEach(item => {
+                    this.stationsObj[Math.floor(item.kmRange)] = item;
+                });
+
+                this.viewDisabled = true;
+
+                this.option.series = [];
+                const kmRangeMap = this.planParser.convertStationsToMap(stations);
+                if (this.$route.query.lineCode === '07') {
+                    this.pushModels(this.option.series, [this.planParser.initializeAxisX(stations)]);
+                } else {
+                    this.pushModels(this.option.series, [this.planParser.initializeAxisY(stations)]);
+                }
+                this.pushModels(this.option.series, this.planParser.convertDataToModels(planData, stations, kmRangeMap, { width: 0.5, color: '#000' }));
+                await this.loadInitChart();
+
+                this.viewDisabled = false;
+            } catch (error) {
+                this.viewDisabled = false;
+                this.$messageBox(this.$t('error.loadingOperationGraphFailed') + this.$t('global.colon') + error.message);
+                console.log(error);
+            }
+        },
+        async loadInitData() {
+            const hebXAxis = {
+                type: 'value',
+                splitLine: {
+                    show: false
+                },
+                axisTick: {
+                    show: false
+                },
+                axisLine: {
+                    onZero: false,
+                    lineStyle: {
+                        width: 1,
+                        color: '#d14a61'
+                    }
+                },
+                axisLabel: {
+                    interval: 'auto',
+                    formatter: this.yAxisLableFormat
+                },
+                axisPointer: {
+                    xAxisIndex: 'all',
+                    label: {
+                        formatter: this.yAxisPointFormat,
+                        backgroundColor: 'rgb(0,100,0,0.5)',
+                        color: 'white'
+                    }
+                },
+                min: 0,
+                max: 0
+            };
+            const hebYAxis = [
+                {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: [],
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 1,
+                            color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        formatter: this.xAxisLableFormat,
+                        textStyle: {
+                            color: '#333'
+                        }
+                    },
+                    axisPointer: {
+                        snap: true,
+                        label: {
+                            formatter: this.xAxisPointFormat,
+                            backgroundColor: 'rgb(255,0,0,0.5)',
+                            color: 'white'
+                        }
+                    }
+                }
+            ];
+            const hebDataZoom = [
+                {
+                    type: 'inside',
+                    yAxisIndex: 0
+                },
+                {
+                    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%',
+                    yAxisIndex: 0,
+                    handleStyle: {
+                        color: '#fff',
+                        shadowBlur: 3,
+                        shadowColor: 'rgba(0, 0, 0, 0.6)',
+                        shadowOffsetX: 2,
+                        shadowOffsetY: 2
+                    },
+                    left: '20px'
+                }
+            ];
+            if (this.$route.query.lineCode === '07') {
+                this.option.xAxis = hebXAxis;
+                this.option.yAxis = hebYAxis;
+                this.option.dataZoom = hebDataZoom;
+                this.option.tooltip.axisPointer.axis = 'y';
+            }
+            await this.xAxisInit();
+            await this.yAxisInit();
+            // await this.loadInitChart();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+            return series;
+        },
+        popModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    const index = series.indexOf(elem);
+                    if (index >= 0) {
+                        series.split(index, 1);
+                    }
+                });
+            }
+            return series;
+        },
+        loadInitChart() {
+            return new Promise((resolve, reject) => {
+                try {
+                    if (this.myChart && this.myChart.isDisposed) {
+                        this.myChart.clear();
+                    }
+                    if (this.$route.query.planName || this.$route.query.prdType === '05') {
+                        this.option.title.text = this.mapName;
+                    } else {
+                        this.option.title.text = this.loadRunPlanName;
+                    }
+                    this.myChart = echarts.init(document.getElementById(this.runPlanId));
+                    this.myChart.setOption(this.option);
+                    this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        refreshRunPlanName(name) {
+            getPublishMapInfo(this.$route.query.mapId).then(resp => {
+                if (this.loadRunPlanId) {
+                    this.mapName = name;
+                } else {
+                    this.mapName = `${resp.data.name} (${name})`;
+                }
+
+                this.myChart.setOption({
+                    title: {
+                        text: this.mapName,
+                        left: 'center', // 居中对齐
+                        top: '10px'
+                    }
+                });
+            });
+        },
+        clearCanvas() {
+            this.myChart.dispose();
+            this.myChart = null;
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.planParser.computedFormatAxisY(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            if (value % 60 === 0) {
+                return timeFormat(value);
+            }
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit() {
+            const list = [];
+            for (var time = 0 + this.planParser.getTranslation(); time < 3600 * 24 + this.planParser.getTranslation(); time++) {
+                list.push(time);
+            }
+
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
+
+            if (this.$route.query.lineCode === '07') {
+                this.option.yAxis[0].data = list;
+            } else {
+                this.option.xAxis[0].data = list;
+            }
+            if (!this.option.dataZoom[0].startValue) {
+                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
+            }
+
+            if (!this.option.dataZoom[0].endValue) {
+                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit() {
+            // if (Object.keys(this.planParser).length) {
+            //     this.pushModels(this.option.series, [this.planParser.initializeAxisY(this.stations)]);
+            //     this.option.yAxis.min = this.planParser.computedAxisYMinValue(this.stations);
+            //     this.option.yAxis.max = this.planParser.computedAxisYMaxValue(this.stations);
+            // }
+            if (Object.keys(this.planParser).length && this.$route.query.lineCode !== '07') {
+                this.pushModels(this.option.series, [this.planParser.initializeAxisY(this.stations)]);
+                this.option.yAxis.min = this.planParser.computedAxisYMinValue(this.stations);
+                this.option.yAxis.max = this.planParser.computedAxisYMaxValue(this.stations);
+            } else if (Object.keys(this.planParser).length && this.$route.query.lineCode === '07') {
+                this.pushModels(this.option.series, [this.planParser.initializeAxisX(this.stations)]);
+                this.option.xAxis.min = this.planParser.computedAxisXMinValue(this.stations);
+                this.option.xAxis.max = this.planParser.computedAxisXMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            let data = '';
+            const arr = [];
+            param.forEach(item => {
+                const station = this.stationsObj[Math.floor((item.data[1] - this.planParser.getEdge()) / this.planParser.getMultiple())] || { name: '', kmRange: '' };
+                if (!arr.includes(`${item.data[0]}${item.data[1]}`)) {
+                    arr.push(`${item.data[0]}${item.data[1]}`);
+                    if (this.$route.query.lineCode == '06' || this.$route.query.lineCode == '08') {
+                        const list = [
+                            `${this.$t('planMonitor.stationName')}${station.name}<br>`,
+                            `${this.$t('planMonitor.stationKilometerMark')}${station.kmRange} m <br>`,
+                            `${this.$t('planMonitor.arriveTime')}${timeFormat(item.data[0] + this.planParser.getTranslation())}<br>`,
+                            `${this.$t('planMonitor.serverTrainNum')}: ${item.seriesName}${item.data[3]}`,
+                            `<hr size=1 style="margin: 3px 0">`
+                        ];
+                        data += list.join('');
+                    } else if (this.$route.query.lineCode == '07') {
+                        const list = [
+                            `${this.$t('planMonitor.stationName')}${station.name}<br>`,
+                            `${this.$t('planMonitor.stationKilometerMark')}${station.kmRange} m <br>`,
+                            `${this.$t('planMonitor.arriveTime')}${timeFormat(item.data[1] + this.planParser.getTranslation())}<br>`,
+                            `${this.$t('planMonitor.serverTrainNum')}: ${item.seriesName}${item.data[3]}(${item.data[3][0] == '2' ? '上行' : '下行'})`,
+                            `<hr size=1 style="margin: 3px 0">`
+                        ];
+                        data += list.join('');
+                    } else {
+                        const list = [
+                            `${this.$t('planMonitor.stationName')}${station.name}<br>`,
+                            `${this.$t('planMonitor.stationKilometerMark')}${station.kmRange} m <br>`,
+                            `${this.$t('planMonitor.arriveTime')}${timeFormat(item.data[0] + this.planParser.getTranslation())}<br>`,
+                            `${this.$t('planMonitor.serverTrainNum')}: ${item.seriesName}${item.data[3]}(${item.data[3][0] == '2' ? '上行' : '下行'})`,
+                            `<hr size=1 style="margin: 3px 0">`
+                        ];
+                        data += list.join('');
+                    }
+                }
+            });
+            return data;
+        },
+        // mouseClick(params) {
+        // 	const model = {
+        // 		serviceNumber: params.seriesName
+        // 	};
+
+        // 	const op = this.myChart.getOption();
+        // 	op.series.forEach(item => {
+        // 		item.lineStyle.color = '#000';
+        // 		if (item.name == params.seriesName) {
+        // 			item.lineStyle.color = 'red';
+        // 		}
+        // 		if (item.name == 'trainLabel') {
+        // 			item.data = [];
+        // 		}
+        // 	});
+        // 	this.myChart.setOption(op);
+        // 	this.$store.dispatch('runPlan/setSelected', model);
+        // },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        }
+        // scheduleTouch() {
+
+        // },
+        // trainNumTouch() {
+
+        // }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    #PlanSchedule {
+        z-index: 0;
+        width: 100%;
+        height: 100%;
+        position: relative;
+		overflow: hidden;
+
+        .left {
+            height: 100%;
+			width: 100%;
+            float: left;
+        }
+
+        .position {
+            position: absolute;
+			top: 0px;
+			right: 50px;
+			width: 220px;
+			height: 100%;
+        }
+        .data_table_box{
+            height: 50%;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/index.vue b/src/views/newMap/display/terminals/diagramEdit/index.vue
new file mode 100644
index 000000000..bbf374dc7
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/index.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="plan-tool" style="width: 100%; height: 100%;padding-top: 45px;">
+    <menu-bar
+      ref="menuBar"
+      :load-run-plan-id="loadRunPlanId"
+      :load-run-plan-name="loadRunPlanName"
+      :run-plan-list="runPlanList"
+      @doClose="doClose"
+      @dispatchDialog="dispatchDialog"
+      @loadingRunPlan="loadingRunPlan"
+      @modifyRunPlanName="modifyRunPlanName"
+      @refresh="refreshRunPlanList"
+      @refreshData="refresh"
+    />
+    <!-- :plan-parser="PlanParser" -->
+    <div class="scheduleIn">
+      <schedule
+        ref="schedule"
+        v-loading="runplanLoading"
+        :plan-parser="PlanParser"
+        :load-run-plan-id="loadRunPlanId"
+        :load-run-plan-name="loadRunPlanName"
+      />
+      <status-bar ref="statusBar" :load-run-plan-id="loadRunPlanId" @dispatchDialog="dispatchDialog" @showTrain="showTrain" @refresh="refresh" />
+    </div>
+    <parameter ref="parameter" />
+    <off-line ref="offLine" @handleConfirm="handleConfirm" @dispatchDialog="dispatchDialog" />
+    <add-planning-train ref="addPlanningTrain" :load-run-plan-id="loadRunPlanId" @dispatchDialog="dispatchDialog" />
+    <edit-planning-train
+      ref="editPlanningTrain"
+      :load-run-plan-id="loadRunPlanId"
+      @dispatchDialog="dispatchDialog"
+      @dispatchOperate="dispatchOperate"
+      @refresh="refresh"
+    />
+    <duplicate-train ref="duplicateTrain" :load-run-plan-id="loadRunPlanId" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
+    <move-planing-train ref="movePlaningTrain" :load-run-plan-id="loadRunPlanId" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
+
+    <systerm-out ref="systermOut" />
+
+    <task-dialog ref="showDialog" :load-run-plan-id="loadRunPlanId" @dispatchOperate="dispatchOperate" @refresh="refresh" />
+
+    <modifying-station-interval-time ref="modifyingStationIntervalTime" />
+    <modifying-station-stop-time ref="modifyingStationStopTime" />
+    <edit-plan-name ref="editPlan" @renewal="refreshRunPlanName" />
+
+    <create-empty-plan ref="createEmptyPlan" @refresh="refreshRunPlanList" />
+  </div>
+</template>
+
+<script>
+import MenuBar from './menuBar';
+import StatusBar from './statusBar';
+import Schedule from './components/schedule';
+import Parameter from './menus/parameter/index';
+import OffLine from './components/menus/offLine';
+import AddPlanningTrain from './components/menus/addPlanningTrain';
+import EditPlanningTrain from './components/menus/editPlanningTrain';
+import EditPlanName from './components/menus/editPlanName';
+import DuplicateTrain from './components/menus/duplicateTrain';
+import SystermOut from './components/menus/systermOut';
+import TaskDialog from './components/menus/taskDialog';
+import MovePlaningTrain from './components/menus/movePlaningTrain';
+import ModifyingStationIntervalTime from './components/menus/modifyingStationIntervalTime';
+import ModifyingStationStopTime from './components/menus/modifyingStationStopTime';
+import CreateEmptyPlan from './menus/createEmptyPlan';
+import { deletePlanService } from '@/api/runplan';
+// import { loadMapDataById } from '@/utils/loaddata';
+import { getRpListByMapId } from '@/api/runplan';
+import { generateRunPlanInfoSync } from '@/api/jmap/mapdraft.js';
+
+export default {
+    name: 'Menus',
+    components: {
+        MenuBar,
+        StatusBar,
+        Schedule,
+        Parameter,
+        OffLine,
+        AddPlanningTrain,
+        EditPlanningTrain,
+        DuplicateTrain,
+        SystermOut,
+        TaskDialog,
+        // AddSmoothRunTime,
+        // EditSmoothRunTime,
+        ModifyingStationIntervalTime,
+        ModifyingStationStopTime,
+        EditPlanName,
+        MovePlaningTrain,
+        CreateEmptyPlan
+    },
+    data() {
+        return {
+            PlanParser: {},
+            runPlanList: [],
+            loadRunPlanId: '',
+            loadRunPlanName: '',
+            runplanLoading:false
+        };
+    },
+    computed: {
+        lineCode() {
+            return this.$route.query.lineCode || '02';
+        }
+    },
+    watch: {
+        '$store.state.map.mapDataLoadedCount': function (val) {
+            this.runplanLoading = false;
+        }
+    },
+    created() {
+        this.PlanParser = this.$theme.loadPlanParser(this.lineCode);
+    },
+    async mounted() {
+        if (this.$route.query.mapId) {
+            this.refreshRunPlanList(true);
+            generateRunPlanInfoSync(this.$route.query.mapId);
+        }
+    },
+    beforeDestroy() {
+    },
+    methods: {
+        dispatchDialog(dialogObj) {
+            this.$nextTick(() => {
+                if (dialogObj.name == 'gernaratePlanTrain') {
+                    this.$refs['menuBar'].handleGernaratePlanningTrain();
+                } else {
+                    if (this.$refs[dialogObj.name]) {
+                        this.$refs[dialogObj.name].doShow(dialogObj.params);
+                    }
+                }
+            });
+        },
+        dispatchOperate(operateObj) {
+            this.$nextTick(() => {
+                if (this.$refs[operateObj.dialogName]) {
+                    this.$refs[operateObj.dialogName][operateObj.operate](operateObj.params);
+                }
+            });
+        },
+        handleConfirm(params) {
+            if (params.operate == 'AddPlanningTrain') {
+                // 添加计划
+                this.$refs.addPlanningTrain.handleConfirm();
+            } else if (params.operate == 'DeletePlanningTrain') {
+                // 删除计划
+                const model = {
+                    planId: this.loadRunPlanId,
+                    serviceNumber: params.serviceNumber
+                };
+                deletePlanService(model).then(resp => {
+                    this.$message.success(this.$t('tip.deletePlanSuccessfully'));
+                    // this.$store.dispatch('runPlan/setSelected', {});
+                    this.$store.dispatch('runPlan/setDraftSelected', {});
+                    this.$store.dispatch('runPlan/refresh');
+                    // this.$refs.openRunPlan.loadRunPlanData(Object.assign({refresh: true}, this.$route.query));
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.deletePlanFailed'));
+                });
+            }
+        },
+        showTrain() {
+            if (this.$refs.schedule) {
+                this.$refs.schedule.displayTrain();
+            }
+        },
+        refresh() {
+            this.$store.dispatch('runPlan/refresh');
+        },
+        refreshRunPlanList(planId) {
+            getRpListByMapId(this.$route.query.mapId).then(resp => {
+                this.runPlanList = resp.data || [];
+                if (planId && this.runPlanList.length) {
+                    this.runPlanList.forEach(item => {
+                        if (item.id === planId) {
+                            this.loadRunPlanId = item.id;
+                            this.loadRunPlanName = item.name;
+                        }
+                    });
+                } else {
+                    this.loadRunPlanId = '';
+                    this.loadRunPlanName = '';
+                }
+            }).catch(() => {
+                this.$message.error('获取草稿运行图列表失败');
+            });
+        },
+        doClose() {
+            this.$emit('doClose');
+        },
+        loadingRunPlan(param) {
+            this.loadRunPlanId = param.planId;
+            this.loadRunPlanName = param.planName;
+        },
+        modifyRunPlanName() {
+            if (this.loadRunPlanId && this.loadRunPlanName) {
+                this.$refs.editPlan.doShow({id: this.loadRunPlanId, name: this.loadRunPlanName});
+            } else {
+                this.$message.info(this.$t('planMonitor.openRunPlan.pleaseSelectRunplan'));
+            }
+        },
+        refreshRunPlanName(name) {
+            this.$refs.schedule.refreshRunPlanName(name);
+            this.refreshRunPlanList(this.loadRunPlanId);
+            this.$router.replace({ path: this.$route.path, query: { ...this.$route.query, planName: name }});
+        }
+    }
+};
+</script>
+
+<style>
+    .plan-tool {
+        position: absolute;
+    }
+
+    .plan-tool .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .plan-tool .pop-menu span {
+        color: #000;
+    }
+
+    .scheduleIn{
+        width:100%;
+        height: 100%;
+        position: relative;
+    }
+
+    .plan-tool .system-close {
+        cursor: pointer;
+        height: 25px;
+        width: 25px;
+        background: -webkit-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: -o-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: -moz-linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid white;
+        border-radius: 4px;
+    }
+
+    .plan-tool .system-close::before {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        font-size: x-large;
+    }
+
+    .planEdit__tool {
+        overflow: hidden !important;
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menuBar.vue b/src/views/newMap/display/terminals/diagramEdit/menuBar.vue
new file mode 100644
index 000000000..dcec12677
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menuBar.vue
@@ -0,0 +1,908 @@
+<template>
+  <div id="PlanMenuBar">
+    <div class="nav" style="height:45px;">
+      <template v-for="(item,i) in menus">
+        <template v-if="noShowingChildren(item.children)">
+          <li v-if="isNotUser" :key="i" class="nav-li" @click="hookClick(item)">
+            <span class="nav-li-text">{{ item.title }}</span>
+          </li>
+        </template>
+        <template v-else>
+          <li v-if="isNotUser" :key="i" class="nav-li" :class="{'menu_active' :i==classA}" @click.stop="popupMenuA(item, i)">
+            <span class="nav-li-text">{{ item.title }}</span>
+            <ul class="nav-ul" :class="{'active' :i==classA}">
+              <template v-for="(child,j) in item.children">
+                <template
+                  v-if="child.children&&child.children.length>0&&hasShowingChildren(child.children)"
+                >
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
+                    <div class="menu-li-block" :disabled="child.disabled">
+                      <span class="menu-li-text">
+                        <el-button type="text" class="button" :disabled="child.disabled">
+                          <input
+                            :ref="child.label"
+                            type="file"
+                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                            @change="openLoadFile(child)"
+                          >
+                          <span> {{ child.title }}</span>
+                        </el-button>
+                      </span>
+                    </div>
+                  </li>
+                  <li v-else :key="j" class="menu-li" @click.stop="popupMenuB(child, j)">
+                    <div class="menu-li-block" :disabled="child.disabled">
+                      <span class="menu-li-text">
+                        <span class="label">{{ child.title }}</span>
+                        <i v-if="j!==classB" class="el-icon-arrow-right" style="float: right;height: 30px;line-height: 30px;" />
+                        <i v-if="j===classB" class="el-icon-arrow-left" style="float: right;height: 30px;line-height: 30px;" />
+                      </span>
+                    </div>
+                    <ul class="menu-ul" :class="{'children-active' :j==classB}">
+                      <template v-for="(grandchild,k) in child.children">
+                        <li v-if="grandchild.type === 'separator'" :key="k" class="menu-separator">
+                          <span class="separator">&ensp;</span>
+                        </li>
+                        <li v-else-if="grandchild.type === 'file'" :key="k" class="menu-li">
+                          <div class="menu-li-block" :disabled="grandchild.disabled">
+                            <span class="menu-li-text">
+                              <el-button
+                                type="text"
+                                class="button"
+                                :disabled="grandchild.disabled"
+                              >
+                                <input
+                                  :ref="grandchild.label"
+                                  type="file"
+                                  accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                                  @change="openLoadFile(grandchild)"
+                                >
+                                <span> {{ grandchild.title }}</span>
+                              </el-button>
+                            </span>
+                          </div>
+                        </li>
+                        <li v-else :key="k" class="menu-li" @click.stop="hookClick(grandchild)">
+                          <div class="menu-li-block" :disabled="grandchild.disabled">
+                            <span class="menu-li-text">
+                              <span class="label">{{ grandchild.title }}</span>
+                            </span>
+                          </div>
+                        </li>
+                      </template>
+                    </ul>
+                  </li>
+                </template>
+                <template v-else>
+                  <li v-if="child.type === 'separator'" :key="j" class="menu-separator">
+                    <span class="separator">&ensp;</span>
+                  </li>
+                  <li v-else-if="child.type === 'file'" :key="j" class="menu-li">
+                    <div class="menu-li-block" :disabled="child.disabled">
+                      <span class="menu-li-text">
+                        <el-button type="text" class="button" :disabled="child.disabled">
+                          <input
+                            :ref="child.title"
+                            type="file"
+                            accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                            @change="openLoadFile(child)"
+                          >
+                          <span> {{ child.title }}</span>
+                        </el-button>
+                      </span>
+                    </div>
+                  </li>
+                  <li v-else :key="j" class="menu-li" @click.stop="hookClick(child)">
+                    <div class="menu-li-block" :disabled="child.disabled">
+                      <span class="menu-li-text">
+                        <span class="label">{{ child.title }}</span>
+                      </span>
+                    </div>
+                  </li>
+                </template>
+              </template>
+            </ul>
+          </li>
+        </template>
+      </template>
+      <!-- <div class="nav-li" style="position: absolute; right: 10px;" @click="back">
+        <span class="nav-li-text">{{ dispaly||closeWindow?'关闭':$t('global.back') }}</span>
+      </div> -->
+    </div>
+    <el-dialog
+      title="运行图发布"
+      :visible.sync="publishVisible"
+      width="30%"
+      center
+      :modal="false"
+      :before-close="handleClose"
+    >
+      <el-input v-model="publishName"><template slot="prepend">运行图名称:</template></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="publishVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmPublish">确 定</el-button>
+      </span>
+    </el-dialog>
+    <route-map ref="routeMap" :load-run-plan-id="loadRunPlanId" />
+    <runplan-config ref="runplanConfig" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import routeMap from './components/routingoperate/routeMap';
+import RunplanConfig from './components/routingoperate/runplanConfig';
+import { planEffectiveCheck, clearPlaningData } from '@/api/runplan';
+import { EventBus } from '@/scripts/event-bus';
+import { publishRunPlanAllUser } from '@/api/designPlatform';
+import { deleteRunPlan } from '@/api/runplan';
+
+export default {
+    name: 'PlanMenuBar',
+    components: { routeMap, RunplanConfig },
+    props: {
+        planConvert: {
+            type: Object,
+            default: function() {
+                return { };
+            }
+        },
+        runPlanList: {
+            type: Array,
+            default: function() {
+                return [];
+            }
+        },
+        loadRunPlanId: {
+            type: String,
+            default: function() {
+                return '';
+            }
+        },
+        loadRunPlanName: {
+            type: String,
+            default: function() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            isNotUser: true,
+            classA: -1,
+            classB: -1,
+            tempClassA: -1,
+            tempClassB: -1,
+            menus: [],
+            loading: null,
+            publishName: '',
+            publishVisible: false,
+            menuBase: [
+                {
+                    title: this.$t('planMonitor.file'),
+                    children: [
+                        {
+                            title: '创建',
+                            click: this.newRunPlan
+                        },
+                        {
+                            title: '打开',
+                            children: []
+                        },
+                        {
+                            title: '删除',
+                            click: this.deleteRunPlanOperate
+                        },
+                        {
+                            title: '重命名',
+                            click: this.modifyRunPlanName
+                        },
+                        {
+                            title: '发布',
+                            click: this.publishRunPlan
+                        }
+                        // {
+                        //     title: '创建运行图',
+                        //     click: this.newRunPlan
+                        // }
+                    ]
+                },
+                {
+                    title: this.$t('planMonitor.tool'),
+                    children: [
+                        {
+                            title: '生成计划',
+                            click: this.handleGernaratePlanningTrain
+                        }
+                    ]
+                },
+                {
+                    title: '编辑',
+                    children: [
+                        {
+                            title: this.$t('planMonitor.addPlan'),
+                            click: this.handleAddPlanningTrain
+                        },
+                        {
+                            title: this.$t('planMonitor.deletePlan'),
+                            click: this.handleDeletePlanningTrain
+                        },
+                        {
+                            title: '平移计划',
+                            click: this.handleMovePlanningTrain
+                        },
+                        {
+                            title: this.$t('planMonitor.duplicatePlan'),
+                            click: this.handleDuplicateTrain
+                        },
+                        {
+                            type: 'separator'
+                        },
+                        {
+                            title: this.$t('planMonitor.addTask'),
+                            click: this.handleAddTask
+                        },
+                        {
+                            title: this.$t('planMonitor.deleteTask'),
+                            click: this.handleDeleteTask
+                        },
+                        {
+                            title: this.$t('planMonitor.modifyTask'),
+                            click: this.handleModifyingTask
+                        },
+                        {
+                            title: '清除数据',
+                            click: this.handleClearData
+                        }
+                    ]
+                },
+                {
+                    title: '配置',
+                    children: [
+                        {
+                            title: '交路设置',
+                            click: this.handleRoutingSettings
+                        },
+                        {
+                            title: '运行等级设置',
+                            click: this.handleRoutingLevel
+                        },
+                        {
+                            title: '停站时间设置',
+                            click: this.handleDwellTime
+                        },
+                        {
+                            title: '折返时间设置',
+                            click: this.handleRunplanParams
+                        }
+                    ]
+                },
+                {
+                    title: '测试',
+                    children: [
+                        {
+                            title: this.$t('planMonitor.validityCheck'),
+                            click: this.handlePlanEffectiveCheck
+                        }
+                        // {
+                        //     title: this.$t('planMonitor.testRunningDiagram'),
+                        //     click: this.handleTestRunPlan
+                        // }
+                    ]
+                }
+                // {
+                //     title: this.$t('planMonitor.modify'),
+                //     children: [
+                //         // {
+                //         //     title: '计划参数',
+                //         //     click: this.handleParameter,
+                //         // },
+                //         // {
+                //         //     title: '打印参数',
+                //         //     click: this.undeveloped,
+                //         // },
+                //         // {
+                //         //     type: 'separator'
+                //         // },
+                //         // {
+                //         //     type: 'separator'
+                //         // },
+                //         // {
+                //         //     title: '修改交路',
+                //         //     click: this.handleModifyingRouting,
+                //         // },
+                //         // {
+                //         //     title: '修改开始时间',
+                //         //     click: this.handleModifyingStartTime,
+                //         // },
+                //         // {
+                //         //     title: '快速增加任务',
+                //         //     click: this.undeveloped,
+                //         // }
+                //     ]
+                // }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('training', [
+            'mode'
+        ]),
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        dispaly() {
+            return this.$route.path.includes('display');
+        },
+        closeWindow() {
+            return this.$route.path.includes('newTool');
+        }
+    },
+    watch: {
+        tempClassA() {
+            this.classA = this.$store.state.menuOperation.break ? -1 : this.tempClassA;
+        },
+        tempClassB() {
+            this.classB = this.$store.state.menuOperation.break ? -1 : this.tempClassB;
+        },
+        '$store.state.menuOperation.break': function (val) {
+            if (val) {
+                this.classA = this.classB = -1;
+            } else {
+                this.classA = this.tempClassA;
+                this.classB = this.tempClassB;
+            }
+        },
+        '$route.query.planId': function () {
+            this.menus = this.menuConvert(this.menuBase);
+        },
+        runPlanList() {
+            this.initMenu();
+        }
+    },
+    created() {
+        if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+            this.isNotUser = false;
+        } else {
+            this.isNotUser = true;
+        }
+    },
+    mounted() {
+        this.initMenu();
+    },
+    methods: {
+        back() {
+            if (this.dispaly) {
+                this.$emit('doClose');
+            } else if (this.closeWindow) {
+                window.close();
+            } else {
+                this.$router.go(-1);
+            }
+        },
+        menuConvert(menuBase) {
+            const menus = [];
+            menuBase.forEach(elem => {
+                const item = {};
+                Object.keys(elem).forEach(key => {
+                    if (key == 'disabledCallback') {
+                        item['disabled'] = elem.disabledCallback();
+                    } else if (key != 'children') {
+                        item[key] = elem[key];
+                    } else {
+                        item.children = this.menuConvert(elem.children || []);
+                    }
+                });
+                menus.push(item);
+            });
+
+            return menus;
+        },
+        initMenu() {
+            const menuLoading = [];
+            this.runPlanList.forEach(item => {
+                menuLoading.push({title: item.name, planId:item.id, planName: item.name, click: this.loadingRunPlan});
+            });
+            this.menuBase.forEach(item => {
+                if (item.title === this.$t('planMonitor.file')) {
+                    item.children.forEach(elem => {
+                        if (elem.title === '打开') {
+                            elem.children = menuLoading;
+                        }
+                    });
+                }
+            });
+            this.menus = this.menuConvert(this.menuBase);
+            this.clickEvent();
+            this.closeMenu();
+        },
+        clickEvent() {
+            const self = this;
+            window.onclick = function (e) {
+                self.closeMenu(false);
+            };
+        },
+        noShowingChildren(children) {
+            if (!children || children.length <= 0) {
+                return true;
+            }
+            return false;
+        },
+        hasShowingChildren(children) {
+            if (children && children.length > 0) {
+                return true;
+            }
+            return false;
+        },
+        closeMenu() {
+            this.classA = this.tempClassA = -1;
+            this.classB = this.tempClassB = -1;
+        },
+        hookClick(item, event) {
+            this.closeMenu();
+            if (!item.disabled) {
+                setTimeout(() => {
+                    if (item && typeof item.click == 'function') {
+                        item.click(item);
+                    }
+                }, 500);
+            }
+        },
+        popupMenuA(item, index) {
+            this.clickEvent();
+            this.tempClassA = index;
+            this.tempClassB = -1;
+        },
+        popupMenuB(item, index) {
+            this.tempClassB = index;
+        },
+        openLoadFile(item) {
+            const obj = this.$refs[item.title][0];
+            if (obj.files) {
+                const file = obj.files[0];
+                item.click(file);
+                obj.value = '';
+            }
+        },
+        doClose() {
+            this.$nextTick(() => {
+                EventBus.$emit('closeMenu');
+            });
+        },
+        // 刷新
+        refresh() {
+            this.closeMenu(true);
+            EventBus.$emit('refresh');
+        },
+        undeveloped() {
+            this.doClose();
+            this.$alert( this.$t('planMonitor.implemented'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('global.confirm'),
+                callback: action => {
+                }
+            });
+        },
+        loadingScreen() {
+            this.loading = this.$loading({
+                lock: true,
+                text: this.$t('tip.underImport'),
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+        },
+        newRunPlan() {
+            this.$emit('dispatchDialog', { name: 'createEmptyPlan', params: {}});
+        },
+        // 自动生成
+        handleAutoGenerate() {
+            this.$emit('dispatchDialog', { name: 'editSmoothRunTime', params: {} });
+        },
+        // 交路设置
+        handleRoutingSettings() {
+            if (this.loadRunPlanId) {
+                this.$refs.routeMap.doShow('routeMap');
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 运行图配置文件
+        handleRunplanParams() {
+            if (this.loadRunPlanId) {
+                this.$refs.runplanConfig.doShow();
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 停站时间
+        handleDwellTime() {
+            if (this.loadRunPlanId) {
+                this.$emit('dispatchDialog', { name: 'modifyingStationStopTime', params: {} });
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 运行等级
+        handleRoutingLevel() {
+            if (this.loadRunPlanId) {
+                this.$emit('dispatchDialog', { name: 'modifyingStationIntervalTime', params: {} });
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 生成计划
+        handleGernaratePlanningTrain() {
+            if (this.loadRunPlanId) {
+                this.$refs.routeMap.doShow('generateRouting');
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 校验运行图
+        handlePlanEffectiveCheck() {
+            if (this.loadRunPlanId) {
+                planEffectiveCheck(this.loadRunPlanId).then(resp => {
+                    this.$emit('dispatchDialog', {
+                        name: 'systermOut',
+                        params: {
+                            width: 600,
+                            contextList: resp.data.length > 0 ? resp.data : ['检查成功']
+                        }
+                    });
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.runGraphVerificationFailed'));
+                });
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 计划参数
+        handleParameter() {
+            this.$emit('dispatchDialog', { name: 'parameter', params: {} });
+        },
+        // 添加计划
+        handleAddPlanningTrain() {
+            const planId = this.loadRunPlanId;
+            if (planId) {
+                this.$emit('dispatchDialog', { name: 'addPlanningTrain', params: {} });
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 清除数据
+        handleClearData() {
+            this.$confirm('本操作将清除本运行图数据！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                center: true
+            }).then(() => {
+                clearPlaningData(this.loadRunPlanId).then(resp => {
+                    console.log('清除数据成功！');
+                    this.$emit('refreshData', this.loadRunPlanId);
+                }).catch(() => {
+                    this.$message.error('清除数据失败！');
+                });
+            }).catch(() => {
+                console.error('清除数据失败!');
+            });
+        },
+        // 删除计划
+        handleDeletePlanningTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', {
+                    name: 'offLine', params: {
+                        type: 'warning',
+                        width: 260,
+                        message: this.$t('tip.deleteTrainHint') + serviceNumber + '?',
+                        operate: 'DeletePlanningTrain',
+                        serviceNumber: serviceNumber,
+                        refresh: true
+                    }
+                });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        // 修改计划
+        handleEditPlanningTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', { name: 'editPlanningTrain', params: { serviceNumber } });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        // 移动计划
+        handleMovePlanningTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', { name: 'movePlaningTrain', params: { serviceNumber } });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        // 复制计划
+        handleDuplicateTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', { name: 'duplicateTrain', params: { serviceNumber } });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        // 添加任务
+        handleAddTask() {
+            const params = this.$store.state.runPlan.draftSelected;
+            if (params.serviceNumber && params.tripNumber) {
+                // this.$emit('dispatchDialog', { name: 'addTask', params });
+                params.dialogType = 'addTask';
+                this.$emit('dispatchDialog', { name: 'showDialog', params });
+            } else {
+                this.$messageBox(this.$t('tip.selectATrain'));
+            }
+        },
+        // 删除任务
+        handleDeleteTask() {
+            const params = this.$store.state.runPlan.draftSelected;
+            if (params.serviceNumber && params.tripNumber) {
+                // this.$emit('dispatchDialog', { name: 'deleteTask', params });
+                params.dialogType = 'deleteTask';
+                this.$emit('dispatchDialog', { name: 'showDialog', params });
+            } else {
+                this.$messageBox(this.$t('tip.selectATrain'));
+            }
+        },
+        // 修改任务
+        handleModifyingTask() {
+            const params = this.$store.state.runPlan.draftSelected;
+            if (params.serviceNumber && params.tripNumber) {
+                // this.$emit('dispatchDialog', { name: 'modifyingTask', params });
+                params.dialogType = 'modifyingTask';
+                this.$emit('dispatchDialog', { name: 'showDialog', params });
+            } else {
+                this.$messageBox(this.$t('tip.selectATrain'));
+            }
+        },
+        modifyRunPlanName() {
+            this.$emit('modifyRunPlanName');
+        },
+        // 修改交路
+        handleModifyingRouting() {
+            const params = this.$store.state.runPlan.draftSelected;
+            this.$emit('dispatchDialog', { name: 'modifyingRouting', params });
+        },
+        // 修改开始时间
+        handleModifyingStartTime() {
+            const params = this.$store.state.runPlan.draftSelected;
+            this.$emit('dispatchDialog', { name: 'modifyingBeginTime', params });
+        },
+        loadingRunPlan(param) {
+            this.$emit('loadingRunPlan', param);
+        },
+        deleteRunPlanOperate() {
+            // 删除运行图
+            if (this.loadRunPlanId) {
+                this.$confirm(this.$t('planMonitor.openRunPlan.confirmDeleteRunPlan'), this.$t('tip.hint'), {
+                    confirmButtonText: this.$t('tip.confirm'),
+                    cancelButtonText: this.$t('tip.cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    deleteRunPlan(this.loadRunPlanId).then(Response => {
+                        this.$message.success(this.$t('planMonitor.openRunPlan.deleteSuccess'));
+                        this.$emit('refresh');
+                    }).catch(() => {
+                        this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
+                    });
+                }).catch(() => { });
+            } else {
+                this.$message.error('请先打开运行图！');
+            }
+        },
+        publishRunPlan() {
+            if (this.loadRunPlanId) {
+                this.publishVisible = true;
+                this.publishName = this.loadRunPlanName;
+            } else {
+                this.$message.error('请先打开运行图！');
+            }
+        },
+        handleClose() {
+            this.publishVisible = false;
+        },
+        confirmPublish() {
+            publishRunPlanAllUser(this.loadRunPlanId, this.publishName || this.loadRunPlanName).then(resp => {
+                this.$message.success(this.$t('tip.publishRunPlanSuccess'));
+                this.publishVisible = false;
+            }).catch(() => {
+                this.$messageBox(this.$t('tip.publishRunPlanFail'));
+                this.publishVisible = false;
+            });
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $top: 0px;
+    $width: 30px;
+    $height: 40px;
+    $menuPadding: 15px;
+    $menuItemHeight: 30px;
+    $menuItemWidth: 160px;
+    $menuItemPadding: 5px;
+
+    #PlanMenuBar {
+        width: 100%;
+        line-height: $height;
+        position: absolute;
+        z-index: 2;
+        left:0;
+        top:0;
+    }
+
+    .nav {
+        display: block;
+        cursor: pointer;
+        list-style: none;
+        // border: 1px solid #B6BCCC !important;
+		background-color: #293c55;
+		box-sizing: border-box;
+		padding-left: 20px;
+    }
+
+    .nav-li {
+        position: relative;
+        display: inline-block;
+		padding: 0 $menuPadding;
+		color: rgba(255,255,255,0.45);
+		border-top: 4px solid #293c55;
+    }
+
+    .nav-li.menu_active {
+		border-top: 4px solid #a9334c;
+		background-color: #0e151f;
+		transition: 0.5s all;
+    }
+
+	.nav-li:hover {
+		border-top: 4px solid #a9334c;
+		background-color: #0e151f;
+		transition: 0.5s all;
+    }
+
+	.nav-li:hover .nav-li-text{
+		color: #fff;
+	}
+
+	.nav-li.menu_active .nav-li-text {
+		color: #fff;
+    }
+
+    .nav-li-text {
+        font-size: 13px;
+        text-align: center;
+        text-decoration: none;
+    }
+
+    .nav-ul {
+        display: none;
+        position: absolute;
+        list-style: none;
+        border: 1px solid gray;
+        width: $menuItemWidth;
+        padding: 0px;
+        margin: 0px;
+    }
+
+    .menu-ul {
+        display: none;
+        list-style: none;
+        background: #F0F0F0;
+        line-height: $menuItemHeight;
+        width: $menuItemWidth;
+        bottom: $menuItemHeight;
+    }
+
+    .active {
+        position: absolute;
+		left: 0;
+        display: block !important;
+    }
+
+    .children-active {
+		position: relative;
+		left: 160px;
+		display: block !important;
+        padding-left: 0px;
+	}
+
+    .menu-ul-text {
+        font-size: 14px;
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+        border-left: 1px solid #000;
+        border-right: 1px solid #000;
+    }
+
+    .menu-separator {
+        text-align: left;
+        background: #F0F0F0;
+        height: 2px;
+        line-height: 2px;
+    }
+
+    .menu-separator .status {
+        display: inline-block;
+        border-right: 1px inset #CACACA;
+        width: $width;
+        height: 100%;
+        background: #EFECDE;
+    }
+
+    .menu-separator .separator {
+        display: inline-block;
+        background: #293c55;
+        // margin-left: 5px;
+        height: 2px;
+        width: 100%;
+    }
+
+    .menu-li {
+        text-align: left;
+        background: #162436;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-block {
+        letter-spacing: 0;
+        height: $menuItemHeight;
+        line-height: $menuItemHeight;
+    }
+
+    .menu-li-text {
+        font-size: 14px;
+    }
+
+    .menu-li-text .label {
+        display: inline-block;
+        margin-left: 5px;
+		padding-left: 12px;
+    }
+
+    .menu-li-text .button {
+        position: relative;
+        overflow: hidden;
+        line-height: 0px;
+        width: 100%;
+        top: 0;
+        color:rgba(255,255,255,0.45);
+        cursor: pointer;
+		padding-left: 16px;
+		text-align: left;
+
+        input {
+            opacity: 0;
+            cursor: pointer;
+            position: absolute;
+            top: 0px;
+            width: $menuItemWidth - $width - 10px;
+        }
+    }
+
+    .menu-li-block:hover {
+        background: #C9DEF7;
+		color: #000;
+        box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+    }
+
+	.menu-li-text .button:hover{
+		color: #000;
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/createEmptyPlan.vue b/src/views/newMap/display/terminals/diagramEdit/menus/createEmptyPlan.vue
new file mode 100644
index 000000000..014ea95e7
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/createEmptyPlan.vue
@@ -0,0 +1,291 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool create-empty-plan"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="30%"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div>
+      <el-tabs v-model="activeTab" type="card">
+        <el-tab-pane :label="this.$t('planMonitor.normalNew')" name="first">
+          <el-row>
+            <el-form ref="form" :model="newModel" label-width="140px" size="mini" :rules="rules" @submit.native.prevent>
+              <el-form-item :label="this.$t('planMonitor.runGraphName')+this.$t('global.colon')" prop="name">
+                <el-input v-model.trim="newModel.name" autofocus />
+              </el-form-item>
+            </el-form>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane :label="this.$t('planMonitor.createFromTheReleaseRunGraph')" name="second">
+          <el-row>
+            <el-form ref="pullForm" :model="pullModel" label-width="140px" size="mini" :rules="pullRules" @submit.native.prevent>
+              <el-form-item :label="this.$t('planMonitor.releaseRunGraph')" prop="templateId">
+                <el-select v-model="pullModel.templateId" :placeholder="$t('map.pleaseSelect')">
+                  <el-option
+                    v-for="item in publishMapList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="this.$t('planMonitor.runGraphName')+this.$t('global.colon')" prop="name">
+                <el-input v-model.trim="pullModel.name" autofocus />
+              </el-form-item>
+            </el-form>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="导入运行图" name="three">
+          <el-row>
+            <el-button type="text" class="uploadDemo">
+              <input
+                ref="files"
+                type="file"
+                class="file_box"
+                accept=".json, application/json, .csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+                @change="importf"
+              >
+              <i class="el-icon-plus" />
+            </el-button>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" :loading="loading" @click="handleCommit">{{ $t('map.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('map.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { createEmptyPlan, queryRunPlanList, postCreatePlan, importRunPlan } from '@/api/runplan';
+import XLSX from 'xlsx';
+
+export default {
+    name: 'CreateEmptyPlan',
+    components: {
+    },
+    props: {
+        planConvert: {
+            type: Object,
+            default: function() {
+                return { };
+            }
+        }
+    },
+    data() {
+        return {
+            activeTab: 'second',
+            dialogShow: false,
+            loading: false,
+            loadingDig: null,
+            publishMapList: [],
+            newModel: {
+                name: '',
+                mapId: this.$route.params.mapId || this.$route.query.mapId
+            },
+            pullModel: {
+                templateId: '',
+                name: '',
+                mapId: this.$route.params.mapId || this.$route.query.mapId
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.newRunGraph');
+        },
+        rules() {
+            return {
+                name: [
+                    { required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
+                ]
+            };
+        },
+        pullRules() {
+            return {
+                templateId: [
+                    { required: true, message: this.$t('rules.chooseToPublishTheRunGraph'), trigger: 'change' }
+                ],
+                name: [
+                    { required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
+                ]
+            };
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        async initLoad() {
+            const res = await queryRunPlanList(this.$route.params.mapId || this.$route.query.mapId);
+            if (res.code == 200 && res.data.length) {
+                this.publishMapList = res.data;
+            }
+        },
+        doShow() {
+            this.newModel.mapId = this.$route.params.mapId || this.$route.query.mapId;
+            this.pullModel.mapId = this.$route.params.mapId || this.$route.query.mapId;
+            this.dialogShow = true;
+            this.initLoad();
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.newModel.name = '';
+            this.pullModel.templateId = '';
+            this.pullModel.name = '';
+            if (this.$refs.form) {
+                this.$refs.form.resetFields();
+            }
+            if (this.$refs.pullForm) {
+                this.$refs.pullForm.resetFields();
+            }
+        },
+        handleCommit() {
+            if (this.activeTab === 'first') {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.loading = true;
+                        createEmptyPlan(this.newModel).then(resp => {
+                            this.$emit('refresh', resp.data);
+                            this.$message.success(this.$t('tip.createAnEmptyRunGraphSuccessfully'));
+                            this.doClose();
+                        }).catch((error) => {
+                            this.$messageBox(this.$t('error.createOperationGraphFailed') + this.$t('global.colon') + error.message);
+                            this.doClose();
+                        });
+                    }
+                });
+            } else {
+                this.$refs['pullForm'].validate((valid) => {
+                    if (valid) {
+                        this.loading = true;
+                        postCreatePlan(this.pullModel).then(resp => {
+                            this.$message.success(this.$t('tip.createARunGraphSuccessfully'));
+                            this.$emit('refresh', resp.data);
+                            this.doClose();
+                        }).catch((error) => {
+                            this.$messageBox(this.$t('error.createOperationGraphFailed') + this.$t('global.colon') + error.message);
+                            this.doClose();
+                        });
+                    }
+                });
+            }
+        },
+        importf(item) {
+            const obj = this.$refs.files;
+            if (obj.files) {
+                const file = obj.files[0];
+                this.handleImportRunPlan(file);
+                obj.value = '';
+            }
+        },
+        loadingScreen() {
+            this.loadingDig = this.$loading({
+                lock: true,
+                text: this.$t('tip.underImport'),
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+        },
+        // 导入运行图
+        handleImportRunPlan(file) {
+            if (file) {
+                this.loadingScreen();
+                setTimeout(() => {
+                    const that = this;
+                    const reader = new FileReader();
+                    if (reader) {
+                        reader.onload = function (e) {
+                            let wb;
+                            const data = e.target.result;
+                            if (that.rABS) {
+                                wb = XLSX.read(btoa(that.fixdata(data)), { // 手动转化
+                                    type: 'base64'
+                                });
+                            } else {
+                                wb = XLSX.read(data, {
+                                    type: 'binary'
+                                });
+                            }
+                            if (wb) {
+                                try {
+                                    let jsonData = [];
+                                    for (const index in wb.Sheets) {
+                                        jsonData = that.planConvert.importData(wb.Sheets[index], jsonData);
+                                    }
+
+                                    // if (that.$route.query.lineCode == '02' && !jsonData[0].downTrack && !jsonData[0].upTrack) {
+                                    //     that.loadingDig.close();
+                                    //     that.$message.warning(`运行图暂无默认上行折返轨或默认下行折返轨，请输入`);
+                                    // } else {
+                                    importRunPlan({ mapId: that.$route.params.mapId || that.$route.query.mapId || '02', runPlanList: jsonData }).then(response => {
+                                        that.loadingDig.close();
+                                        if (response && response.code == 200) {
+                                            that.$message.success(that.$t('tip.importOperationGraphSuccessfully'));
+                                            that.$emit('refresh');
+                                            // this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
+                                        }
+                                    }).catch(error => {
+                                        that.loadingDig.close();
+                                        that.$message.warning(`${that.$t('tip.importRunGraphFailed')} ${error.message}`);
+                                    });
+                                    // }
+                                } catch (error) {
+                                    that.loadingDig.close();
+                                    that.$message.warning(`${that.$t('tip.parseRunGraphFailed')} ${error.message}`);
+                                }
+                            }
+                        };
+                        if (that.rABS) {
+                            reader.readAsArrayBuffer(file);
+                        } else {
+                            reader.readAsBinaryString(file);
+                        }
+                    }
+                }, 200);
+            }
+            this.doClose();
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-input {
+            width: 160px;
+        }
+
+        .el-input-number {
+            width: 120px;
+        }
+    }
+
+	.uploadDemo{
+		width: 100%;
+		height: 130px;
+		border: 1px dashed #409EFF;
+		position: relative;
+
+		.file_box{
+			position: absolute;
+			opacity: 0;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			cursor: pointer;
+		}
+		.el-icon-plus{
+			font-size: 40px;
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseLoop.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseLoop.vue
new file mode 100644
index 000000000..a6e24857f
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseLoop.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="planEdit__tool base-loop">
+    <el-row style="margin: 10px">
+      <el-col :span="18">
+        <el-table :data="loopData" border style="width: 100%" height="160">
+          <el-table-column prop="loopName" :label="this.$t('planMonitor.loopName')" />
+          <el-table-column prop="beginStationCode" :label="this.$t('planMonitor.startingStation')" />
+          <el-table-column prop="endStationCode" :label="this.$t('planMonitor.terminal')" />
+        </el-table>
+      </el-col>
+    </el-row>
+    <el-row style="margin: 10px">
+      <el-col :span="6">
+        <el-row type="flex" justify="begin" class="button-group">
+          <el-button @click="handleAdd">{{$t('global.add')}}</el-button>
+        </el-row>
+      </el-col>
+      <el-col :span="6">
+        <el-row type="flex" justify="center" class="button-group">
+          <el-button @click="handleDelete">{{$t('global.delete')}}</el-button>
+        </el-row>
+      </el-col>
+      <el-col :span="6">
+        <el-row type="flex" justify="end" class="button-group">
+          <el-button @click="handleModifying">{{$t('global.modify')}}</el-button>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+	name: 'BaseLoop',
+	components: {
+	},
+	data() {
+		return {
+			loopData: []
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		handleAdd() {
+		},
+		handleDelete() {
+		},
+		handleModifying() {
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-button {
+            width: 120px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseParameter.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseParameter.vue
new file mode 100644
index 000000000..42f501f84
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseParameter.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-form
+    ref="form"
+    class="planEdit__tool base-parameter"
+    :model="model"
+    label-width="160px"
+    size="mini"
+    :rules="rules"
+  >
+    <el-form-item :label="this.$t('planMonitor.planName')+this.$t('global.colon')" prop="planName" style="margin-right: 160px">
+      <el-input v-model="model.planName" />
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.fuzhouIconDescription')+this.$t('global.colon')" prop="auxIconDesc" style="margin-right:160px">
+      <el-input v-model="model.auxIconDesc" />
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.upBeginTripNumber')+this.$t('global.colon')" prop="upBeginTripNumber">
+      <el-input-number v-model="model.upBeginTripNumber" controls-position="right" />
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.downBeginTrain')+this.$t('global.colon')" prop="upBeginTrain">
+      <el-input-number v-model="model.upBeginTrain" controls-position="right" />
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.minimumTrainInterval')+this.$t('global.colon')" prop="minInterval">
+      <el-input-number v-model="model.minInterval" controls-position="right" />
+      <span>{{ $t('global.second') }}</span>
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.maximumTrainInterval')+this.$t('global.colon')" prop="maxInterval">
+      <el-input-number v-model="model.maxInterval" controls-position="right" />
+      <span>{{ $t('global.second') }}</span>
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.trainGeneratesInitialLabel')+this.$t('global.colon')" prop="beginServiceNumber">
+      <el-input-number v-model="model.beginServiceNumber" controls-position="right" />
+    </el-form-item>
+    <el-form-item :label="this.$t('planMonitor.minimumTurnbackTime')+this.$t('global.colon')" prop="minReentryTime">
+      <el-input-number v-model="model.minReentryTime" controls-position="right" />
+      <span>{{ $t('global.second') }}</span>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+    name: 'BaseParameter',
+    components: {
+    },
+    data() {
+        return {
+            model: {
+                planName: '',
+                auxIconDesc: '',
+                upBeginTripNumber: 0,
+                upBeginTrain: 0,
+                minInterval: 0,
+                maxInterval: 0,
+                beginServiceNumber: 0,
+                minReentryTime: 0
+            }
+        };
+    },
+    computed: {
+        rules() {
+            return {};
+        }
+    },
+    mounted() {
+    },
+    methods: {
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-form-item {
+            margin-bottom: 10px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseParkingDepot.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseParkingDepot.vue
new file mode 100644
index 000000000..84063b61d
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseParkingDepot.vue
@@ -0,0 +1,42 @@
+<template>
+  <el-row class="planEdit__tool base-parking-depot">
+    <el-col :span="10" :offset="1">
+      <el-table :data="depotData" border style="width: 100%" height="300">
+        <el-table-column prop="depotCode" :label="this.$t('planMonitor.trainDepot')" />
+        <el-table-column width="40" />
+      </el-table>
+    </el-col>
+    <el-col :span="10" :offset="1">
+      <el-button style="margin-top: 20px" @click="handleModifyingDepotProperty">{{$t('global.modify')}}</el-button>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+export default {
+	name: 'BaseParkingDepot',
+	components: {
+	},
+	data() {
+		return {
+			depotData: []
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		handleModifyingDepotProperty() {
+			this.$emit('dispatchDialog', { name: 'modifyingDepotProperty', params: {} });
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-button {
+            width: 120px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseRouting.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseRouting.vue
new file mode 100644
index 000000000..bfcf501a8
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseRouting.vue
@@ -0,0 +1,49 @@
+<template>
+  <div class="planEdit__tool base-routing">
+    <el-row style="margin: 10px">
+      <el-table :data="routeData" border style="width: 100%" height="250">
+        <el-table-column prop="beginStationCode" :label="this.$t('planMonitor.startingStation')" />
+        <el-table-column prop="beginStationStandCode" :label="this.$t('planMonitor.startingPlatform')" />
+        <el-table-column prop="endStationCode" :label="this.$t('planMonitor.terminal')" />
+        <el-table-column prop="endStationStandCode" :label="this.$t('planMonitor.endingPlatform')" />
+      </el-table>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleAdd">{{$t('global.add')}}</el-button>
+      <el-button @click="handleDelete">{{$t('global.delete')}}</el-button>
+      <el-button @click="handleModifying">{{$t('global.modify')}}</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+	name: 'BaseRouting',
+	components: {
+	},
+	data() {
+		return {
+			routeData: []
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		handleAdd() {
+		},
+		handleDelete() {
+		},
+		handleModifying() {
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-button {
+            width: 120px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseStation.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseStation.vue
new file mode 100644
index 000000000..644630d75
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/baseStation.vue
@@ -0,0 +1,42 @@
+<template>
+  <el-row class="planEdit__tool base-station">
+    <el-col :span="10" :offset="1">
+      <el-table :data="stationData" border style="width: 100%" height="300">
+        <el-table-column prop="stationCode" :label="this.$t('planMonitor.station')" />
+        <el-table-column width="40" />
+      </el-table>
+    </el-col>
+    <el-col :span="10" :offset="1">
+      <el-button style="margin-top: 20px" @click="handleModifyingStationProperty">{{ $t('planMonitor.modifyAttribute') }}</el-button>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+export default {
+    name: 'BaseStation',
+    components: {
+    },
+    data() {
+        return {
+            stationData: []
+        };
+    },
+    mounted() {
+    },
+    methods: {
+        handleModifyingStationProperty() {
+            this.$emit('dispatchDialog', { name: 'modifyingStationProperty', params: {} });
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    /deep/ {
+        .el-button {
+            width: 120px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/index.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/index.vue
new file mode 100644
index 000000000..5061771ff
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/index.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool parameter"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="580px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-tabs v-model="active" type="card" style="height: 410px">
+      <el-tab-pane :label="this.$t('planMonitor.generalParameters')" name="first">
+        <base-parameter ref="baseParameter" />
+      </el-tab-pane>
+      <el-tab-pane :label="this.$t('planMonitor.editingStation')" name="second">
+        <base-station ref="baseStation" @dispatchDialog="dispatchDialog" />
+      </el-tab-pane>
+      <el-tab-pane :label="this.$t('planMonitor.editDepot')" name="third">
+        <base-parking-depot ref="baseParkingLotOrDepot" @dispatchDialog="dispatchDialog" />
+      </el-tab-pane>
+      <el-tab-pane :label="this.$t('planMonitor.editCrossRailway')" name="fourth">
+        <base-routing ref="baseRouting" @dispatchDialog="dispatchDialog" />
+      </el-tab-pane>
+      <el-tab-pane :label="this.$t('planMonitor.editLoopRailway')" name="six">
+        <base-loop ref="baseLoop" @dispatchDialog="dispatchDialog" />
+      </el-tab-pane>
+    </el-tabs>
+    <el-row type="flex" justify="end" class="button-group">
+      <el-button @click="handleCommit">{{$t('global.confirm')}}</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+      <el-button @click="apply">{{$t('global.application')}}</el-button>
+    </el-row>
+    <modifying-station-property ref="modifyingStationProperty" @dispatchDialog="dispatchDialog" />
+    <modifying-station-stand-property ref="modifyingStationStandProperty" />
+    <modifying-depot-property ref="modifyingDepotProperty" />
+  </el-dialog>
+</template>
+
+<script>
+import BaseParameter from './baseParameter';
+import BaseStation from './baseStation';
+import BaseParkingDepot from './baseParkingDepot';
+import BaseRouting from './baseRouting';
+import BaseLoop from './baseLoop';
+import ModifyingStationProperty from './modifyingStationProperty';
+import ModifyingStationStandProperty from './modifyingStationStandProperty';
+import ModifyingDepotProperty from './modifyingDepotProperty';
+
+export default {
+	name: 'Parameter',
+	components: {
+		BaseParameter,
+		BaseStation,
+		BaseParkingDepot,
+		BaseRouting,
+		BaseLoop,
+		ModifyingStationProperty,
+		ModifyingStationStandProperty,
+		ModifyingDepotProperty
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			active: 'first'
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('planMonitor.parameter');
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		dispatchDialog(dialogObj) {
+			this.$nextTick(() => {
+				if (this.$refs[dialogObj.name]) {
+					this.$refs[dialogObj.name].doShow(dialogObj.params);
+				}
+			});
+		},
+		handleCommit() {
+		},
+		apply() {
+
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingDepotProperty.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingDepotProperty.vue
new file mode 100644
index 000000000..42f93ddb6
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingDepotProperty.vue
@@ -0,0 +1,82 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool modifying-depot-property"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="460px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row style="margin: 10px">
+      <el-form ref="form" :model="model" label-width="150px" size="mini" :rules="rules">
+        <el-form-item :label="this.$t('planMonitor.numberOfTrainsAvailable')+this.$t('global.colon')" prop="availableTrainNumber">
+          <el-input-number v-model="model.availableTrainNumber" controls-position="right" />
+        </el-form-item>
+        <el-form-item :label="this.$t('planMonitor.continuousMinimumInterval')+this.$t('global.colon')" prop="departMinInterval">
+          <el-input-number v-model="model.departMinInterval" controls-position="right" />
+          <span>{{$t('global.second')}}</span>
+        </el-form-item>
+        <el-form-item :label="this.$t('planMonitor.continuousReturnMaximumInterval')+this.$t('global.colon')" prop="returnMinInterval">
+          <el-input-number v-model="model.returnMinInterval" controls-position="right" />
+          <span>{{$t('global.second')}}</span>
+        </el-form-item>
+        <el-form-item :label="this.$t('planMonitor.afterTheTrainHasBackInterval')+this.$t('global.colon')" prop="hasTrainBackInterval">
+          <el-input-number v-model="model.hasTrainBackInterval" controls-position="right" />
+          <span>{{$t('planMonitor.secondsCanBeRunnedByTrain')}}</span>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">{{$t('global.confirm')}}</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'ModifyingDepotProperty',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			model: {
+				availableTrainNumber: 0,
+				departMinInterval: 0,
+				returnMinInterval: 0,
+				hasTrainBackInterval: 0
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('planMonitor.editDepot');
+		},
+		rules() {
+			return {};
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingStationProperty.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingStationProperty.vue
new file mode 100644
index 000000000..a777ec92d
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingStationProperty.vue
@@ -0,0 +1,127 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool modifying-station-property"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="520px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="7" :offset="1">
+        <el-row><span>{{$t('planMonitor.defaultStopTime')}}</span></el-row>
+        <el-row>
+          <el-select v-model="model.defaultStopTime" size="mini" :placeholder="this.$t('global.choose')">
+            <el-option
+              v-for="item in defaultStopTimeList"
+              :key="item.value"
+              :label="item.label"
+              :value="model.value"
+            />
+          </el-select>
+        </el-row>
+        <el-row><span>{{$t('planMonitor.defaultRunLevel')}}</span></el-row>
+        <el-row>
+          <el-select v-model="model.defaultLevel" size="mini" :placeholder="this.$t('global.choose')">
+            <el-option
+              v-for="item in defaultLevelList"
+              :key="item.value"
+              :label="item.label"
+              :value="model.value"
+            />
+          </el-select>
+        </el-row>
+      </el-col>
+      <el-col :span="15">
+        <div class="view-box">
+          <span style="position: relative; left: 10px; top: -8px">{{$t('planMonitor.station')}}</span>
+          <el-row style="margin: 10px; margin-top: 0px">
+            <el-table :data="stationStandData" border height="160">
+              <el-table-column prop="stationStandCode" :label="this.$t('planMonitor.platform')" width="60" />
+              <el-table-column prop="stopTime" :label="this.$t('planMonitor.stopTime')" />
+              <el-table-column prop="level" :label="this.$t('planMonitor.runLevel')" />
+            </el-table>
+            <el-button
+              style="width: 120px; margin-top: 10px; float: right"
+              @click="handleModifyingStationStandProperty"
+            >{{$t('planMonitor.modifyPlatformProperties')}}
+            </el-button>
+          </el-row>
+        </div>
+      </el-col>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">{{$t('global.confirm')}}</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'ModifyingStationProperty',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			defaultStopTimeList: [],
+			defaultLevelList: [],
+			stationStandData: [],
+			model: {
+				defaultStopTime: '',
+				defaultLevel: ''
+
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('planMonitor.modifyPlatformProperties');
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleModifyingStationStandProperty() {
+			this.$emit('dispatchDialog', { name: 'modifyingStationStandProperty', params: {} });
+		},
+		handleCommit() {
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+
+    .view-box {
+        border: 1px solid #BFBBAC;
+    }
+
+    /deep/ {
+        .el-button {
+            margin-left: 40px !important;
+            margin-right: 40px !important;
+        }
+
+        .el-row {
+            margin-bottom: 10px !important;
+        }
+
+        .el-select {
+            width: 120px !important;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingStationStandProperty.vue b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingStationStandProperty.vue
new file mode 100644
index 000000000..752a6aab6
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/menus/parameter/modifyingStationStandProperty.vue
@@ -0,0 +1,88 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="planEdit__tool modifying-station-stand-property"
+    :title="title"
+    :visible.sync="dialogShow"
+    width="360px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row style="margin: 10px">
+      <el-form ref="form" :model="model" label-width="100px" size="mini" :rules="rules">
+        <el-form-item :label="this.$t('planMonitor.defaultStopTime')" prop="defaultStopTime">
+          <el-select v-model="model.defaultStopTime" size="mini" :placeholder="this.$t('global.choose')">
+            <el-option
+              v-for="item in defaultStopTimeList"
+              :key="item.value"
+              :label="item.label"
+              :value="model.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="this.$t('planMonitor.defaultRunLevel')" prop="defaultLevel">
+          <el-select v-model="model.defaultLevel" size="mini" :placeholder="this.$t('global.choose')">
+            <el-option
+              v-for="item in defaultLevelList"
+              :key="item.value"
+              :label="item.label"
+              :value="model.value"
+            />
+          </el-select>
+
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row type="flex" justify="center" class="button-group">
+      <el-button @click="handleCommit">{{$t('global.confirm')}}</el-button>
+      <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+	name: 'ModifyingStationStandProperty',
+	components: {
+	},
+	data() {
+		return {
+			dialogShow: false,
+			loading: false,
+			defaultStopTimeList: [],
+			defaultLevelList: [],
+			model: {
+				defaultStopTime: '',
+				defaultLevel: ''
+			}
+		};
+	},
+	computed: {
+		title() {
+			return this.$t('planMonitor.modifyPlatformProperties');
+		},
+		rules() {
+			return {};
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		doShow() {
+			this.dialogShow = true;
+		},
+		doClose() {
+			this.loading = false;
+			this.dialogShow = false;
+		},
+		handleCommit() {
+		}
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    @import "src/styles/mixin.scss";
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/statusBar.vue b/src/views/newMap/display/terminals/diagramEdit/statusBar.vue
new file mode 100644
index 000000000..dbd6ddfe0
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/statusBar.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="PlanStatusBar">
+    <ul class="ul-box">
+      <!-- v-if="isNotUser" -->
+      <div class="li_plan" @click="showTrain">{{ $t('planMonitor.serviceAndTripNumber') }}</div>
+      <div class="li_plan" @click="handleGernaratePlanningTrain">{{ $t('planMonitor.gerneratePlan') }}</div>
+      <div class="li_plan" @click="handleAddPlanningTrain">{{ $t('planMonitor.addPlan') }}</div>
+      <div class="li_plan" @click="handleDeletePlanningTrain">{{ $t('planMonitor.deletePlan') }}</div>
+      <div class="li_plan" @click="handleMovePlanningTrain">移动计划</div>
+      <div class="li_plan" @click="handleDuplicateTrain">{{ $t('planMonitor.duplicatePlan') }}</div>
+      <div class="li_plan" @click="handleAddTask">{{ $t('planMonitor.addTask') }}</div>
+      <div class="li_plan" @click="handleDeleteTask">{{ $t('planMonitor.deleteTask') }}</div>
+      <div class="li_plan" @click="handleModifyingTask">{{ $t('planMonitor.modifyTask') }}</div>
+      <div class="li_plan" @click="handleClearData">清除数据</div>
+    </ul>
+    <ul class="ul-box tool">
+      <div class="li_plan" @click="handlePlanEffectiveCheck">{{ $t('planMonitor.validityCheck') }}</div>
+      <!-- <div class="li_plan" @click="handleTestRunPlan">{{ $t('planMonitor.testRunning') }}</div> -->
+    </ul>
+  </div>
+</template>
+
+<script>
+import { planEffectiveCheck, runPlanNotify, clearPlaningData } from '@/api/runplan';
+import { launchFullscreen } from '@/utils/screen';
+import { UrlConfig } from '@/scripts/ConstDic';
+
+export default {
+    name: 'PlanStatusBar',
+    props: {
+        loadRunPlanId: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            // isNotUser: true
+        };
+    },
+    watch: {
+
+    },
+    created() {
+        // if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+        //     this.isNotUser = false;
+        // } else {
+        //     this.isNotUser = true;
+        // }
+    },
+    methods: {
+        showTrain() {
+            this.$emit('showTrain');
+        },
+        // 添加计划
+        handleAddPlanningTrain() {
+            const planId = this.loadRunPlanId;
+            if (planId) {
+                this.$emit('dispatchDialog', { name: 'addPlanningTrain', params: {} });
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        handleGernaratePlanningTrain() {
+            const planId = this.loadRunPlanId;
+            if (planId) {
+                this.$emit('dispatchDialog', { name: 'gernaratePlanTrain', params: {} });
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        },
+        // 删除计划
+        handleDeletePlanningTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', {
+                    name: 'offLine', params: {
+                        type: 'warning',
+                        width: 260,
+                        message: this.$t('tip.deleteTrainHint') + serviceNumber + '?',
+                        operate: 'DeletePlanningTrain',
+                        serviceNumber: serviceNumber,
+                        refresh: true
+                    }
+                });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        handleMovePlanningTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', { name: 'movePlaningTrain', params: { serviceNumber } });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        // 复制计划
+        handleDuplicateTrain() {
+            const serviceNumber = this.$store.state.runPlan.draftSelected.serviceNumber;
+            if (serviceNumber) {
+                this.$emit('dispatchDialog', { name: 'duplicateTrain', params: { serviceNumber } });
+            } else {
+                this.$messageBox(this.$t('tip.selectAPlan'));
+            }
+        },
+        // 添加任务
+        handleAddTask() {
+            const params = this.$store.state.runPlan.draftSelected;
+            if (params.serviceNumber && params.tripNumber) {
+                // this.$emit('dispatchDialog', { name: 'addTask', params });
+                params.dialogType = 'addTask';
+                this.$emit('dispatchDialog', { name: 'showDialog', params });
+            } else {
+                this.$messageBox(this.$t('tip.selectATrain'));
+            }
+        },
+        // 删除任务
+        handleDeleteTask() {
+            const params = this.$store.state.runPlan.draftSelected;
+            if (params.serviceNumber && params.tripNumber) {
+                // this.$emit('dispatchDialog', { name: 'deleteTask', params });
+                params.dialogType = 'deleteTask';
+                this.$emit('dispatchDialog', { name: 'showDialog', params });
+            } else {
+                this.$messageBox(this.$t('tip.selectATrain'));
+            }
+        },
+        // 修改任务
+        handleModifyingTask() {
+            const params = this.$store.state.runPlan.draftSelected;
+            if (params.serviceNumber && params.tripNumber) {
+                // this.$emit('dispatchDialog', { name: 'modifyingTask', params });
+                params.dialogType = 'modifyingTask';
+                this.$emit('dispatchDialog', { name: 'showDialog', params });
+            } else {
+                this.$messageBox(this.$t('tip.selectATrain'));
+            }
+        },
+        // 清除数据
+        handleClearData() {
+            this.$confirm('本操作将清除本运行图数据！', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                center: true
+            }).then(() => {
+                clearPlaningData(this.loadRunPlanId).then(resp => {
+                    console.log('清除数据成功！');
+                    this.$emit('refresh');
+                }).catch(() => {
+                    this.$message.error('清除数据失败！');
+                });
+            }).catch(() => {
+                console.error('清除数据失败!');
+            });
+        },
+        // 校验运行图
+        handlePlanEffectiveCheck() {
+            const planId = this.loadRunPlanId;
+            if (planId) {
+                if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+                    this.$messageBox(' 功能待完善');
+                } else {
+                    planEffectiveCheck(planId).then(resp => {
+                        this.$emit('dispatchDialog', {
+                            name: 'systermOut',
+                            params: {
+                                width: 600,
+                                contextList: resp.data.length > 0 ? resp.data : ['检查成功']
+                            }
+                        });
+                    }).catch(error => {
+                        this.$messageBox(error.message + ' ' + this.$t('tip.runGraphVerificationFailed'));
+                    });
+                }
+
+            } else {
+                this.$messageBox(this.$t('tip.selectARunGraphFirst'));
+            }
+        }
+        // // 测试运行图
+        // async handleTestRunPlan() {
+        //     const data = { planId: this.$route.query.planId };
+        //     if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+        //         this.$messageBox(' 功能待完善');
+        //     } else {
+        //         runPlanNotify(data).then(resp => {
+        //             if (resp.data) {
+        //                 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.design.testRunPlan, query: query });
+        //                 launchFullscreen();
+        //             } else {
+        //                 this.$messageBox(this.$t('error.checkTheValidityFirst'));
+        //             }
+        //         }).catch(error => {
+        //             this.$messageBox(this.$t('tip.createSimulationFaild') + this.$t('global.colon') + error.message);
+        //         });
+        //     }
+        // }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+
+    .PlanStatusBar {
+        z-index: 5;
+        position: absolute;
+        width: 50px;
+		height: 100%;
+		top: 0px;
+		right: 0px;
+		background: #293c55;
+		padding-top: 10px;
+        overflow: hidden;
+		&:hover {
+			z-index: 5000;
+		}
+    }
+	.ul-box{
+		width: 100%;
+		padding: 0;
+		.li_plan{
+			width: 100%;
+			height: 50px;
+			font-size: 14px;
+			color: rgba(255, 255, 255, 0.45);
+			text-align: center;
+			padding: 5px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 4px;
+			cursor: pointer;
+
+			&:hover{
+				background: #0e151f;
+				color: #fff;
+			}
+		}
+	}
+
+	.tool{
+		position: absolute;
+		bottom: 50px;
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramEdit/titleBar.vue b/src/views/newMap/display/terminals/diagramEdit/titleBar.vue
new file mode 100644
index 000000000..c69a4b30d
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramEdit/titleBar.vue
@@ -0,0 +1,73 @@
+<template>
+  <div id="PlanTitleBar">
+    <img class="logo" :src="logoImg">
+    <span> {{ mapName }} &ensp;</span>
+    <span v-if="runPlanName">({{ runPlanName }})</span>
+<!--    <span class="system-close el-icon-close" @click="back" />-->
+  </div>
+</template>
+
+<script>
+import logo_ from '@/assets/logo_.png';
+import { getPublishMapInfo } from '@/api/jmap/map';
+
+export default {
+    name: 'PlanTitleBar',
+    data() {
+        return {
+            mapName: '',
+            logoImg: logo_
+        };
+    },
+    computed: {
+        runPlanName() {
+            return this.$route.query.planName || '';
+        }
+    },
+    mounted() {
+        getPublishMapInfo(this.$route.query.mapId).then(resp => {
+            this.mapName = resp.data.name;
+        });
+    },
+    methods: {
+        // back() {
+        //     this.$router.push({ path: `${UrlConfig.plan.detail}/${this.$route.query.mapId}` });
+        // }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+    @import "src/styles/mixin.scss";
+    $width: 25px;
+    $height: 25px;
+
+    #PlanTitleBar {
+        z-index: 10;
+        display: flex;
+        position: absolute;
+        width: 100%;
+        height: $height;
+        line-height: $height;
+        background: -webkit-linear-gradient(#0055E8, #0099F8);
+        background: -o-linear-gradient(#0055E8, #0099F8);
+        background: -moz-linear-gradient(#0055E8, #0099F8);
+        background: linear-gradient(#0055E8, #0099F8);
+        color: white;
+        font-weight: bold;
+        font-size: 16px;
+
+        .logo {
+            display: inline-block;
+            width: $width;
+            height: $height;
+            padding-right: 5px;
+        }
+
+        .system-close {
+            width: 25px;
+            height: 25px;
+            position: absolute;
+            right: 1px;
+        }
+    }
+</style>
diff --git a/src/views/newMap/display/terminals/diagramLoad.vue b/src/views/newMap/display/terminals/diagramLoad.vue
new file mode 100644
index 000000000..5d6e5a538
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramLoad.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="run-plan-dialog" :style="{width: width + 'px',height:height + 'px'}">
+    <plan-schedule ref="planSchedule" :group="group" />
+  </div>
+</template>
+
+<script>
+import PlanSchedule from '@/views/planSchedule/index';
+import { getSimulationInfoNew } from '@/api/simulation';
+import { loadRunPlanData } from '@/utils/loaddata';
+// 运行图加载
+export default {
+    name: 'DiagramLoad',
+    components: {
+        PlanSchedule
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            menus: null
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('display.runPlan.runDiagramPlanTool');
+        },
+        width() {
+            return this.$store.state.app.width > 1920 ? 1920 : this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height > 1080 ? 1080 : this.$store.state.app.height;
+        },
+        simType() {
+            return this.$route.query.simType;
+        }
+    },
+    watch: {
+        '$store.state.socket.runPlanReloadCount': function () {
+            if (this.simType === 'METRO') {
+                getSimulationInfoNew(this.group).then(res => {
+                    this.$store.dispatch('runPlan/setRunPlanInfo', res.data.runPlan);
+                    loadRunPlanData(this.group);
+                });
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$refs.planSchedule.setPosition();
+            this.$refs.planSchedule.loadChartPage();
+        });
+    },
+    methods: {
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+@import "src/styles/mixin";
+
+.run-plan-dialog {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	position: absolute;
+	z-index: 38;
+	top: 0;
+	right: 0;
+	background: white;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/diagramPreview.vue b/src/views/newMap/display/terminals/diagramPreview.vue
new file mode 100644
index 000000000..abf3e88db
--- /dev/null
+++ b/src/views/newMap/display/terminals/diagramPreview.vue
@@ -0,0 +1,602 @@
+<template>
+  <div id="PlanSchedule" :style="{height: height+'px'}">
+    <div class="left">
+      <div :id="runPlanId" />
+    </div>
+    <div class="right">
+      <data-table
+        ref="serviceTable1"
+        :height="height/2 - 20"
+        :config="serviceNumberConfig"
+        @touch="scheduleTouch"
+      />
+      <data-table
+        ref="tripTable1"
+        :height="height/2 - 20"
+        :config="tripNumberConfig"
+        @touch="trainNumTouch"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+import DataTable from '@/views/planSchedule/menusPlan/components/dataTable';
+import echarts from 'echarts';
+import {toTimeStamp, formatDuring} from '@/utils/date';
+import { deepAssign } from '@/utils/index';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+let myChart = null;
+export default {
+    name: 'DiagramPreview',
+    components: {
+        DataTable
+    },
+    data() {
+        return {
+            height: 0,
+            inter:null,
+            runPlanId: 'run-plan-view',
+            PlanParser: {},
+            serviceNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: '表号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: '车次号'
+                    },
+                    {
+                        width: 40
+                    }
+                ]
+            },
+            realData: {},
+            kmRangeMap: {},
+            absoluteTime: 2 * 3600,
+            indexKmRangeMap: {},
+            seriesMap: {},
+            staticSeries: [],
+            runSeries: [],
+            selectSeries: [],
+            runPlanData: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        maxWidth() {
+            return this.$store.state.app.width > 1920 ? 1920 : this.$store.state.app.width;
+        },
+        maxHeight() {
+            return this.$store.state.app.height > 1080 ? 1080 : this.$store.state.app.height;
+        }
+    },
+    watch: {
+        maxWidth() {
+            this.setPosition();
+        },
+        maxHeight() {
+            this.setPosition();
+        },
+        '$store.state.runPlan.planLoadedCount': async function () {
+            try {
+                await this.loadChartPage();
+                this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+                await this.loadInitData();
+            } catch (e) {
+                console.error(e);
+            } finally {
+                this.loading = false;
+            }
+        },
+        '$store.state.socket.simulationReset': function (val) {
+            this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+            this.loadInitData();
+        },
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.socket.trainStationList': function (val) {
+            if (val.length) {
+                this.updateRunPlanData(val);
+            }
+        }
+    },
+    async mounted() {
+        this.staticSeries = []; this.selectSeries = []; this.runSeries = []; this.runPlanData = {};
+        this.PlanParser = this.$theme.loadPlanParser(this.$route.query.lineCode);
+        await this.setPosition();
+        await this.loadChartPage();
+        await this.loadInitData();
+    },
+    beforeDestroy() {
+        this.$store.dispatch('runPlan/setSelected', null);
+        clearSubscribe(getTopic('LPF', this.group));
+        this.destroy();
+    },
+    methods: {
+        serviceNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: row.serviceNumber, tripNumber: null });
+                this.renderTripNumber({ serviceNumber: row.serviceNumber, tripNumber: null });
+                const serviceObj = this.$store.state.runPlan.editData[row.serviceNumber];
+                if (serviceObj) {
+                    this.analyticalTripNumber(serviceObj.trainMap);
+                }
+            }
+        },
+        tripNumberChange(row) {
+            if (row) {
+                this.$store.dispatch('runPlan/setSelected', { serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+                this.renderTripNumber({ serviceNumber: this.$store.state.runPlan.selected.serviceNumber, tripNumber: row.tripNumber });
+            }
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].tripNumber - data[b].tripNumber; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                const width = this.maxWidth * 0.85;
+                const height = this.maxHeight;
+                this.$store.dispatch('runPlan/resize', { width, height });
+
+                if (this.height != height) {
+                    this.height = height;
+                }
+            });
+        },
+        updateRunPlanData(data) {
+            const stations = this.$store.state.runPlan.stations;
+            data.forEach(item => {
+                item.secondTime = item.second;
+            });
+            this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
+            this.runSeries = this.PlanParser.updateDataToModels(data, stations, this.kmRangeMap,
+                this.runPlanData, this.runSeries, { color: '#FF00DE', width: 2 }
+            );
+            const series = [...this.staticSeries, ...this.runSeries, ... this.selectSeries];
+            myChart && myChart.setOption({series: series});
+        },
+        async loadChartPage() {
+            try {
+                this.seriesMap = {};
+                this.staticSeries = [];
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
+                this.kmRangeMap = this.PlanParser.convertStationsToMap(stations);
+                if (this.$route.query.lineCode === '07') {
+                    this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisX(stations)]);
+                } else {
+                    this.pushModels(this.staticSeries, [this.PlanParser.initializeAxisY(stations)]);
+                }
+                this.staticSeries = this.pushModels(this.staticSeries, this.PlanParser.convertDataToModels(planData, stations, this.kmRangeMap, { color: '#000', width: 0.5 }));
+                this.staticSeries.forEach(item => {
+                    this.seriesMap[item.name] = item;
+                });
+                await this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+            } catch (error) {
+                console.log(error);
+                this.$messageBox(`加载运行图数据失败`);
+            }
+        },
+
+        async loadInitData() {
+            myChart && myChart.showLoading();
+            const option = {
+                tooltip: {
+                    axisPointer: {
+                        trigger: 'item',
+                        type: 'cross'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1
+                },
+                grid: {
+                    right: '40px',
+                    left: '120px',
+                    height: '85%'
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        yAxisIndex: 0,
+                        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'
+                            }
+                        }
+                    }
+                ],
+                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: [
+
+                ]
+            };
+            const hebXAxis = {
+                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
+            };
+            const hebYAxis = [
+                {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: [],
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 2,
+                            color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        formatter: this.xAxisLableFormat,
+                        textStyle: {
+                            color: '#333'
+                        }
+                    },
+                    axisPointer: {
+                        snap: true,
+                        label: {
+                            formatter: this.xAxisPointFormat,
+                            backgroundColor: 'rgb(255,0,0,0.5)',
+                            color: 'white'
+                        }
+                    }
+                }
+            ];
+            const hebDataZoom = [
+                {
+                    type: 'inside',
+                    yAxisIndex: 0
+                },
+                {
+                    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%',
+                    yAxisIndex: 0,
+                    handleStyle: {
+                        color: '#fff',
+                        shadowBlur: 3,
+                        shadowColor: 'rgba(0, 0, 0, 0.6)',
+                        shadowOffsetX: 2,
+                        shadowOffsetY: 2
+                    },
+                    left: '20px'
+                }
+            ];
+            if (this.$route.query.lineCode === '07') {
+                option.xAxis = hebXAxis;
+                option.yAxis = hebYAxis;
+                option.dataZoom = hebDataZoom;
+            }
+            await this.xAxisInit(option);
+            await this.yAxisInit(option);
+            await this.loadInitChart(option);
+            myChart && myChart.hideLoading();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+            return series;
+        },
+        loadInitChart(option) {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.destroy();
+                    let startValue = 3600 + this.PlanParser.getTranslation();
+                    const offsetTime = 3600;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.socket.simulationTimeSync));
+                    startValue = initTime - this.PlanParser.getTranslation();
+                    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];
+                    myChart = echarts.init(document.getElementById(this.runPlanId));
+                    if (myChart) {
+                        myChart.setOption(option);
+                        this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+                        myChart.on('click', this.mouseClick);
+                    }
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.PlanParser.computedFormatAxisY(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            return timeFormat(value);
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit(option) {
+            const list = [];
+            for (var time = 0 + this.PlanParser.getTranslation(); time < 3600 * 24 + this.PlanParser.getTranslation(); time++) {
+                list.push(time);
+            }
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
+
+            if (this.$route.query.lineCode === '07') {
+                option.yAxis[0].data = list;
+            } else {
+                option.xAxis[0].data = list;
+            }
+            if (!option.dataZoom[0].startValue) {
+                option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue - offsetTime;
+            }
+
+            if (!option.dataZoom[0].endValue) {
+                option.dataZoom[0].endValue = option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit(option) {
+            if (Object.keys(this.PlanParser).length && this.$route.query.lineCode !== '07') {
+                option.yAxis.min = this.PlanParser.computedAxisYMinValue(this.stations);
+                option.yAxis.max = this.PlanParser.computedAxisYMaxValue(this.stations);
+            } else if (Object.keys(this.PlanParser).length && this.$route.query.lineCode === '07') {
+                option.xAxis.min = this.PlanParser.computedAxisXMinValue(this.stations);
+                option.xAxis.max = this.PlanParser.computedAxisXMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            const station = (this.$store.getters['map/getDeviceByCode'](param.data[2])) || { name: '', kmRange: '' };
+            if (this.$route.query.lineCode !== '07') {
+                if (station.name) {
+                    return [
+                        `Point Data <hr size=1 style=" margin: 3px 0">`,
+                        `车站名称: ${station.name}<br>`,
+                        `车站公里标: ${station.kmRange} km <br>`,
+                        `到站时间: ${timeFormat(param.data[0] + this.PlanParser.getTranslation())} (${param.data[0]})<br>`
+                    ].join('');
+                } else {
+                    return '';
+                }
+            } else {
+
+                return [
+                    `Point Data <hr size=1 style=" margin: 3px 0">`,
+                    `车站名称: ${station.name}<br>`,
+                    `车站公里标: ${station.kmRange} km <br>`,
+                    `到站时间: ${timeFormat(param.data[1] + this.PlanParser.getTranslation())} (${param.data[1]})<br>`
+                ].join('');
+            }
+
+        },
+        renderTripNumber(params) {
+            const tripNumber = params.tripNumber; // 车次号
+            const serviceNumber = params.serviceNumber; // 服务号
+            let data, markPoint;
+            if (tripNumber && this.seriesMap[serviceNumber]) {
+                const temp = this.seriesMap[serviceNumber].data.filter(elem => elem[3] == tripNumber);
+                if (temp.length) {
+                    data = temp;
+                    this.seriesMap[serviceNumber].markPoint.data.forEach(each=> {
+                        if (each.name == temp[0][4]) {
+                            markPoint = deepAssign({}, {data:[each]});
+                            markPoint.symbol = 'roundRect';
+                            markPoint.symbolSize = 1;
+                            markPoint.data[0].label.color = '#f00';
+                        }
+                    });
+                }
+            } else if (this.seriesMap[serviceNumber]) {
+                markPoint = deepAssign({}, this.seriesMap[serviceNumber].markPoint);
+                markPoint.data.forEach((each, index) => {
+                    if (each.symbol == 'circle') {
+                        markPoint.data.splice(index, 1);
+                    } else {
+                        each.label.color = '#f00';
+                    }
+                });
+                data = this.seriesMap[serviceNumber].data;
+            }
+            this.selectSeries = [{
+                name: 'trainLabel',
+                lineStyle: {
+                    color: '#f00',
+                    width: 2,
+                    type: 'solid'
+                },
+                z: 10,
+                type: 'line',
+                markPoint:markPoint,
+                animation: false,
+                data: data
+            }];
+            const series = [...this.staticSeries, ...this.runSeries, ...this.selectSeries];
+            myChart && myChart.setOption({series: series});
+        },
+        mouseClick(params) {
+            const model = {
+                serviceNumber: params.seriesName
+            };
+            this.$store.dispatch('runPlan/setSelected', model);
+        },
+        reSize(opt) {
+            if (myChart) {
+                myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (myChart && myChart.isDisposed) {
+                myChart.dispose();
+                myChart = null;
+            }
+        },
+        scheduleTouch() {
+
+        },
+        trainNumTouch() {
+
+        }
+    }
+};
+</script>
+<style scoped rel="stylesheet/scss" lang="scss">
+@import "src/styles/mixin";
+
+#PlanSchedule {
+	z-index: 5;
+	position: absolute;
+	width: 100%;
+
+	.left {
+		height: 100%;
+		width: 85%;
+		float: left;
+	}
+
+	.right {
+		height: 100%;
+		width: 15%;
+		float: right;
+	}
+}
+
+/deep/ {
+	.el-dialog {
+		height: 100%;
+		max-height: 1080px;
+	}
+	.el-dialog__body {
+		padding: 0px !important;
+		background-color: floralwhite !important;
+	}
+	.el-dialog__headerbtn .el-dialog__close {
+		font-size: 18px;
+		border: 1px solid #909399;
+		border-radius: 5px;
+	}
+}
+</style>
diff --git a/src/views/newMap/display/terminals/dispatchCmd.vue b/src/views/newMap/display/terminals/dispatchCmd.vue
new file mode 100644
index 000000000..f370b7b22
--- /dev/null
+++ b/src/views/newMap/display/terminals/dispatchCmd.vue
@@ -0,0 +1,1517 @@
+<template>
+  <div class="main">
+    <el-row style="height: 100%;" class="dispatcher-cmd">
+      <el-col :span="5" style="height: 100%;">
+        <div class="left">
+          <el-tabs v-model="activeTab" type="border-card" @tab-click="tabClick">
+            <el-tab-pane label="操作" name="operate">
+              <div class="operate-box">
+                <div class="create-cmd">
+                  <!-- <span>数据库正常</span> -->
+                  <div>
+                    <el-select v-model="numTime" placeholder="请选择" style="width: 66px;">
+                      <el-option label="24" value="24" />
+                      <el-option label="12" value="12" />
+                    </el-select>
+                    <span>小时</span>
+                  </div>
+                  <span style="width: 85px; font-weight: bold; text-align: end;">{{ getSimulationTime }}</span>
+                </div>
+                <div class="create-cmd">
+                  <!-- <span>通信正常</span> -->
+                  <el-button :id="getDomObj('refreshSearch').domId" type="primary" @click="refreshSearch">刷新</el-button>
+                  <el-button :id="getDomObj('createCmd').domId" type="primary" style="width: 100px" @click="createCmd">新建调度命令</el-button>
+                </div>
+                <div class="box-title">
+                  <div class="contant-null" />
+                  <div class="contant-text">缓存命令</div>
+                  <div class="contant-icon" @click="activeChange('active1')">
+                    <i v-if="active1" class="el-icon-arrow-down" />
+                    <i v-else class="el-icon-arrow-up" />
+                  </div>
+                </div>
+                <div v-show="active1" class="left-table1">
+                  <el-table ref="table1" :data="filterDisCmdData('Cache')" border style="width: 100%" :height="operateTableHeight" highlight-current-row @current-change="handleCurrentChange($event, 'table1')">
+                    <el-table-column prop="cmdCode" label="命令号" width="80" />
+                    <el-table-column prop="transitId" label="识别号" width="80" />
+                    <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
+                    <el-table-column label="接收单位" show-overflow-tooltip width="160">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ JoinDeviceNameStr(scope.row.rcvCompanies) || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="sender" label="发令人" />
+                    <el-table-column label="发令单位">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name: '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="命令类型" width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ typeObj[scope.row.type] || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="content" label="命令正文" show-overflow-tooltip />
+                  </el-table>
+                </div>
+                <div class="box-title">
+                  <div class="contant-null" />
+                  <div class="contant-text">接受命令</div>
+                  <div class="contant-icon" @click="activeChange('active2')">
+                    <i v-if="active2" class="el-icon-arrow-down" />
+                    <i v-else class="el-icon-arrow-up" />
+                  </div>
+                </div>
+                <div v-show="active2" class="left-table1">
+                  <el-table ref="table2" :data="filterDisCmdData('Receive')" border style="width: 100%" :height="operateTableHeight" highlight-current-row @current-change="handleCurrentChange($event, 'table2')">
+                    <el-table-column prop="cmdCode" label="命令号" width="80" />
+                    <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
+                    <el-table-column label="接收单位" show-overflow-tooltip width="160">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ JoinDeviceNameStr(scope.row.rcvCompanies) || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="sendTime" label="发令时间" />
+                    <el-table-column prop="sender" label="发令人" />
+                    <el-table-column label="发令单位">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name: '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="命令类型" width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ typeObj[scope.row.type] || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="content" label="命令正文" show-overflow-tooltip />
+                  </el-table>
+                </div>
+                <div class="box-title">
+                  <div class="contant-null" />
+                  <div class="contant-text">发送命令</div>
+                  <div class="contant-icon" @click="activeChange('active3')">
+                    <i v-if="active3" class="el-icon-arrow-down" />
+                    <i v-else class="el-icon-arrow-up" />
+                  </div>
+                </div>
+                <div v-show="active3" class="left-table1">
+                  <el-table ref="table3" :data="filterDisCmdData('Sent')" border style="width: 100%" :height="operateTableHeight" highlight-current-row @current-change="handleCurrentChange($event, 'table3')">
+                    <el-table-column prop="cmdCode" label="命令号" width="80" />
+                    <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
+                    <el-table-column label="接收单位" show-overflow-tooltip width="160">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ JoinDeviceNameStr(scope.row.rcvCompanies) || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="sendTime" label="发令时间" width="160" />
+                    <el-table-column prop="sender" label="发令人" />
+                    <el-table-column label="发令单位">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name: '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="命令类型" width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ typeObj[scope.row.type] || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="content" label="命令正文" show-overflow-tooltip />
+                  </el-table>
+                </div>
+                <div class="box-title">
+                  <div class="contant-null" />
+                  <div class="contant-text">签收完成</div>
+                  <div class="contant-icon" @click="activeChange('active4')">
+                    <i v-if="active4" class="el-icon-arrow-down" />
+                    <i v-else class="el-icon-arrow-up" />
+                  </div>
+                </div>
+                <div v-show="active4" class="left-table1">
+                  <el-table ref="table4" :data="filterDisCmdData('Signed')" border style="width: 100%" :height="operateTableHeight" highlight-current-row @current-change="handleCurrentChange($event, 'table4')">
+                    <el-table-column prop="cmdCode" label="命令号" width="80" />
+                    <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
+                    <el-table-column label="接收单位" show-overflow-tooltip width="160">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ JoinDeviceNameStr(scope.row.rcvCompanies) || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="sendTime" label="发令时间" width="160" />
+                    <el-table-column prop="sender" label="发令人" />
+                    <el-table-column label="发令单位">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name: '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="命令类型" width="100">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ typeObj[scope.row.type] || '' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="content" label="命令正文" show-overflow-tooltip />
+                  </el-table>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="查询" name="search">
+              <div class="search-box">
+                <div class="box-title">
+                  <div class="contant-null" />
+                  <div class="contant-text">查询条件</div>
+                  <div class="contant-icon" @click="activeChange('active5')">
+                    <i v-if="active1" class="el-icon-arrow-down" />
+                    <i v-else class="el-icon-arrow-up" />
+                  </div>
+                </div>
+                <div v-show="active5" class="search-condition">
+                  <div class="condition-top">
+                    <el-radio v-model="searchObj.timeType" label="1">时间范围</el-radio>
+                    <el-radio v-model="searchObj.timeType" label="2">精确匹配发令时间</el-radio>
+                  </div>
+                  <div class="condition-border" style="padding: 5px 10px">
+                    <div v-if="searchObj.timeType==1">
+                      <div class="condition-row">
+                        <span style="margin-right: 5px">从</span>
+                        <el-date-picker v-model="searchObj.startTime" style="flex: 1" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss" />
+                      </div>
+                      <div class="condition-row">
+                        <span style="margin-right: 5px">至</span>
+                        <el-date-picker v-model="searchObj.endTime" style="flex: 1" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss" />
+                      </div>
+                    </div>
+                    <div v-else class="condition-row">
+                      <span style="margin-right: 5px">发令时间</span>
+                      <el-date-picker v-model="searchObj.sendTime" style="flex: 1" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm:ss" />
+                    </div>
+                  </div>
+                  <div class="condition-row">
+                    <el-checkbox v-model="searchObj.hasNumber">命令号</el-checkbox>
+                    <el-input v-model="searchObj.cmdCode" />
+                  </div>
+                  <div class="condition-border">
+                    <div class="condition-row">
+                      <el-checkbox v-model="searchObj.hasCompanyOfSender">发令单位</el-checkbox>
+                      <el-input v-model="searchObj.sendCompany.name" />
+                    </div>
+                    <div class="condition-row">
+                      <el-checkbox v-model="searchObj.hasCompanyOfReceiver">受令单位</el-checkbox>
+                      <el-input v-model="searchObj.companyOfReceiver" />
+                    </div>
+                    <div>
+                      <el-checkbox v-model="searchObj.hasTitleKey">命令标题或者内容 关键字</el-checkbox>
+                      <el-input v-model="searchObj.titleKey" />
+                    </div>
+                    <div>
+                      <el-select v-model="searchObj.allSigned" placeholder="请选择">
+                        <el-option
+                          v-for="item in searchSignedOption"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                        />
+                      </el-select>
+                    </div>
+                  </div>
+                  <div class="condition-btn">
+                    <el-button :id="getDomObj('search').domId" type="primary" @click="search">查询</el-button>
+                    <el-button type="primary" style="width: 100px" @click="clearCondition">清除</el-button>
+                  </div>
+                </div>
+                <el-table ref="table5" class="search-table" :data="searchTable" border style="width: 100%" :height="searchTableHeight" highlight-current-row @current-change="handleCurrentChange($event, 'table5')">
+                  <el-table-column prop="cmdCode" label="命令号" width="80" />
+                  <el-table-column prop="transitId" label="识别号" width="80" />
+                  <el-table-column prop="title" label="命令标题" show-overflow-tooltip />
+                  <el-table-column label="接收单位" show-overflow-tooltip width="160">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ JoinDeviceNameStr(scope.row.rcvCompanies) || '' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="sendTime" label="发令时间" width="160" />
+                  <el-table-column prop="sender" label="发令人" />
+                  <el-table-column label="发令单位">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name: '' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="命令类型" width="100">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ typeObj[scope.row.type] || '' }}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="content" label="命令正文" show-overflow-tooltip />
+                </el-table>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+      </el-col>
+      <el-col :span="15">
+        <div class="middle">
+          <el-tabs v-model="cmdTab" type="border-card" class="middle-padding">
+            <el-tab-pane label="调度命令" name="cmd">
+              <el-form ref="form" :model="command" :rules="rules" label-width="95px">
+                <el-form-item label="命令标题" prop="title">
+                  <el-input v-model="command.title" />
+                </el-form-item>
+                <el-col :span="8">
+                  <el-form-item label="命令号" prop="cmdCode">
+                    <el-input v-model="command.cmdCode" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="中转识别号">
+                    <el-input v-model="command.transitId" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="当前状态">
+                    <el-input v-model="currentStatus" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="发令时间">
+                    <el-date-picker v-model="command.sendTime" type="datetime" placeholder="选择日期时间" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="发令人">
+                    <el-select v-model="command.sender" placeholder="请选择" style="width: 100%;" @change="senderChange">
+                      <el-option
+                        v-for="item in memberDataList"
+                        :key="item.id"
+                        :label="item.labelName"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="发令单位">
+                    <el-input v-model="command.sendCompany.name" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="授权时间">
+                    <el-date-picker v-model="command.authTime" type="datetime" placeholder="选择日期时间" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="值班主任">
+                    <el-select v-model="command.chiefOnDuty" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in memberDataList"
+                        :key="item.id"
+                        :label="item.labelName"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="授权状态">
+                    <el-input v-model="command.authState" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="定稿时间">
+                    <el-date-picker v-model="command.finishedTime" type="datetime" placeholder="选择日期时间" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="审核人">
+                    <el-select v-model="command.reviewer" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in memberDataList"
+                        :key="item.id"
+                        :label="item.labelName"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div style="height: 40px; line-height: 40px; margin-left: 20px;">
+                    <el-checkbox v-model="command.chiefOnDutyAuth">需值班主任授权</el-checkbox>
+                  </div>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="日计划号">
+                    <el-input v-model="command.dailyPlanNum" />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="拟令人">
+                    <el-select v-model="command.designer" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in memberDataList"
+                        :key="item.id"
+                        :label="item.labelName"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="命令分类">
+                    <el-select v-model="command.type" placeholder="请选择" style="width: 100%;">
+                      <el-option
+                        v-for="item in typeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-form>
+            </el-tab-pane>
+          </el-tabs>
+          <el-tabs v-model="textTab" type="border-card">
+            <el-tab-pane :label="getContentLable" name="text">
+              <div class="cmd-box">
+                <div>
+                  <el-input v-model="command.content" type="textarea" :rows="6" placeholder="请输入内容" maxlength="200" />
+                </div>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+          <div>
+            <div class="table-title">
+              <span>受令列表</span>
+              <!-- <el-checkbox v-model="tableChecked">全选</el-checkbox> -->
+            </div>
+            <div class="table">
+              <el-table ref="table" :data="getTableData" border style="width: 100%" :header-cell-class-name="cellClass" :height="tableHeight" highlight-current-row @select="selectionChange" @select-all="selectionChange" @row-click="tableRowChange">
+                <el-table-column type="selection" :selectable="selectableFn" width="50" />
+                <el-table-column prop="name" label="受令单位" width="160" />
+                <el-table-column prop="copyers" label="抄送" width="120" show-overflow-tooltip />
+                <el-table-column label="签收状态">
+                  <template slot-scope="scope">
+                    <span style="margin-left: 10px">{{ getSignedStatus(getCurrentState(scope.row)) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="签收人">
+                  <template slot-scope="scope">
+                    <span style="margin-left: 10px">{{ getSignedBy(getCurrentState(scope.row)) || '' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="签收时间" width="160">
+                  <template slot-scope="scope">
+                    <span style="margin-left: 10px">{{ getCurrentState(scope.row).time || '' }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </div>
+          <div class="midle-bottom">
+            <el-button :id="getDomObj('allographCmd').domId" type="primary" :disabled="!allographRow" @click="allographCmd">代签</el-button>
+            <el-button :id="getDomObj('sendCmd').domId" type="primary" :disabled="disabledSent" @click="sendCmd">下达</el-button>
+            <el-button :id="getDomObj('saveCacheData').domId" type="primary" :disabled="disabledSent" @click="saveCacheData(true)">缓存</el-button>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="4">
+        <div class="right">
+          常用词汇
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import { sendCommandNew } from '@/api/jmap/training';
+import { mapState } from 'vuex';
+import { parseTime } from '@/utils/index';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {UserOperationType} from "../../../../scripts/ConstDic";
+export default {
+    name:'DispatcherCmd',
+    data() {
+        return {
+            operateTableHeight: 100,
+            searchTableHeight: 260,
+            tableHeight: 200,
+            activeTab: 'operate',
+            cmdTab: 'cmd',
+            textTab: 'text',
+            typeObj: {
+                Normal: '普通调度命令',
+                Construct: '施工调度命令',
+                Forward: '转发调度命令',
+                Request: '请求调度命令',
+                LongTerm: '长效调度命令',
+                ShiftScheduling: '班计划调度命令',
+                Other: '其他调度命令'
+            },
+            signedStatusObj: {
+                Cache: '缓存',
+                Sent: '已发送',
+                SrmReceived: '自律机接收',
+                Received: '已接收',
+                Signed: '已签收',
+                Reject: '已拒签'
+            },
+            command: {
+                cmdId: '',
+                cmdCode: '',
+                title: '',
+                transitId: '',
+                senderId: '',
+                sendTime: '',
+                sender: '',
+                authTime: '',
+                chiefOnDuty: '',
+                chiefOnDutyAuth: false,
+                authState: '',
+                finishedTime: '',
+                reviewer: '',
+                dailyPlanNum: '',
+                designer: '',
+                type: 'Normal',
+                content: '',
+                sendCompany: {
+                    id: '',
+                    name: '',
+                    rsCompany: true,
+                    cpType: '',
+                    code: '',
+                    trainViaGsmR: false,
+                    transStationCode: '',
+                    trainNum: ''
+                },
+                rcvCompanies: []
+                // allSigned: ''
+            },
+            rules: {
+                title: [
+                    { required: true, message: '命令标题不能为空', trigger: 'blur' },
+                    { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
+                ],
+                cmdCode: [
+                    { required: true, message: '命令号不能为空', trigger: 'blur' },
+                    { min: 1, max: 7, message: '长度在 1 到 7 个字符', trigger: 'blur' }
+                ]
+            },
+            typeTransition: {
+                DISPATCHER: 'Dispatcher',
+                STATION: 'Station',
+                TRAIN: 'Train'
+            },
+            DisStationId: 'DisStation1986',
+            allographRow: null,
+            tableChecked: false,
+            active1: true,
+            active2: true,
+            active3: true,
+            active4: true,
+            active5: true,
+            numTime: 24,
+            queryResData: {}, // 查询的结果数据
+            // currentInfo: {},
+            searchObj: {
+                timeType: '1',
+                startTime: '',
+                endTime: '',
+                sendTime: '',
+                hasNumber: false,
+                cmdCode: '',
+                hasCompanyOfSender: false,
+                sendCompany: {},
+                hasCompanyOfReceiver: false,
+                companyOfReceiver: '',
+                hasTitleKey: false,
+                titleKey: '',
+                allSigned: ''
+            },
+            searchTable: [],
+            searchSignedOption: [
+                { value: '', label: '全部'},
+                { value: true, label: '只显示签收完成的'},
+                { value: false, label: '只显示未签收完成的'}
+            ]
+        };
+    },
+    computed: {
+        ...mapState('training', [
+            'memberList', 'memberData', 'simulationUserList', 'initTime'
+        ]),
+        ...mapState('socket', [
+            'dispatchCommandState'
+        ]),
+        currentStatus() {
+            let s = '编辑';
+            const cpId = this.command.sendCompany.id;
+            if (this.queryResData.companyStateMap && this.queryResData.companyStateMap[cpId]) {
+                const state = this.queryResData.companyStateMap[cpId].state;
+                s = this.signedStatusObj[state] ? this.signedStatusObj[state] : '编辑';
+            }
+            return s;
+        },
+        getContentLable() {
+            const text = '命令正文';
+            const fontLength = this.command.content.length;
+            return `${text}  ${fontLength}字`;
+        },
+        disabledSent() {
+            let s = false;
+            const sentArr = ['编辑', '缓存'];
+            if (!this.command.cmdCode || !sentArr.includes(this.currentStatus)) {
+                s = true;
+            }
+            return s;
+        },
+        typeOptions() {
+            const list = [];
+            Object.keys(this.typeObj).forEach(item => {
+                list.push({
+                    label: this.typeObj[item],
+                    value: item
+                });
+            });
+            return list;
+        },
+        getSimulationTime() {
+            const t = parseTime(this.initTime, '{h}:{i}:{s}');
+            const tArr = t.split(':');
+            let s = '  ';
+            let h = tArr[0];
+            if (this.numTime != 24) {
+                s = '上午';
+                if (h > 12) {
+                    s = '下午';
+                    h = h - 12;
+                }
+            }
+            return `${s} ${h}:${tArr[1]}:${tArr[2]}`;
+        },
+        group() {
+            return this.$route.query.group;
+        },
+        getTableData() {
+            const mList = [];
+            const filterArr = this.memberList.filter(item => {
+                return item.type == 'STATION_SUPERVISOR';
+            });
+            filterArr.forEach(item => {
+                const name = this.getDeviceName(item.deviceCode);
+                mList.push({
+                    code: item.deviceCode || '',
+                    name: name,
+                    cpType: 'Station'
+                });
+            });
+            return mList;
+        },
+        memberDataList() {
+            return Object.values(this.memberData);
+        },
+        getActiveSender() {
+            const userInfo = this.memberDataList.find(item => {
+                return item.userId == this.$store.state.user.id;
+            });
+            const activeUser = userInfo || {};
+            return activeUser;
+        }
+    },
+    watch: {
+        getTableData() {
+            this.allographRow = null;
+        },
+        getActiveSender(obj) {
+            this.DisStationId = obj.deviceCode ? obj.deviceCode : 'DisStation1986';
+        },
+        dispatchCommandState(obj) {
+            Object.values(obj.cpStateMap).forEach(item => {
+                if (item.cpId) {
+                    if (!this.queryResData.companyStateMap) {
+                        this.queryResData.companyStateMap = {};
+                    }
+                    this.$set(this.queryResData.companyStateMap, item.cpId, item);
+                }
+            });
+        },
+        '$store.state.app.height': function (val) {
+            this.getOperateTableHeight();
+            this.getSearchTableHeight();
+            this.getTableHeight();
+        }
+    },
+    beforeDestroy() {},
+    mounted() {
+        this.initData();
+        this.searchCmd();
+        this.getSenderName();
+    },
+    created() {
+        this.getOperateTableHeight();
+        this.getSearchTableHeight();
+        this.getTableHeight();
+    },
+    methods:{
+        getDomObj(key) {
+            return OperationEvent.DispatchCmd.menuButton[key];
+        },
+        activeChange(key) {
+            this[key] = !this[key];
+            this.getOperateTableHeight();
+            if (key == 'active5') {
+                this.getSearchTableHeight();
+            }
+        },
+        getOperateTableHeight() {
+            const allH = this.$store.state.app.height;
+            const heardH = 100;
+            const titleH = 28 * 4;
+            let r = allH - heardH - titleH;
+            r = r > 0 ? r : 0;
+            const arr = ['active1', 'active2', 'active3', 'active4'];
+            let num = 0;
+            arr.forEach(key => {
+                if (this[key]) {
+                    num += 1;
+                }
+            });
+            if (num > 0) {
+                this.operateTableHeight = r / num;
+            }
+        },
+        getSearchTableHeight() {
+            const allH = this.$store.state.app.height;
+            const heardH = 42;
+            const titleH = 28;
+            const sH = 436;
+            let h = allH - heardH - titleH;
+            if (this.active5) {
+                h -= sH;
+            }
+            h = h > 0 ? h : 0;
+            this.searchTableHeight = h;
+        },
+        getTableHeight() {
+            const allH = this.$store.state.app.height;
+            const heardH = 29;
+            const sH = 250;
+            const textH = 181;
+            const tableTitleH = 22;
+            const btnH = 40;
+            let h = allH - heardH - sH - textH - tableTitleH - btnH;
+            h = h > 0 ? h : 0;
+            this.tableHeight = h;
+        },
+        cellClass(row) {
+            if (row.columnIndex === 0 && this.disabledSent) {
+                return 'DisableSelection';
+            }
+        },
+        getCurrentState(row) {
+            const rcList = this.command.rcvCompanies || [];
+            const StateMap = this.queryResData.companyStateMap || {};
+            const findRc = rcList.find(item => {
+                return item.code == row.code;
+            });
+            let findObj = {};
+            if (findRc && findRc.id && StateMap[findRc.id] && StateMap[findRc.id].state) {
+                findObj = StateMap[findRc.id];
+            }
+            return findObj;
+        },
+        getSignedStatus(row) {
+            let s = '';
+            if (row.signedByProxy) {
+                s = '代签';
+            } else {
+                s = this.signedStatusObj[row.state] || '';
+            }
+            return s;
+        },
+        selectableFn() {
+            return !this.disabledSent;
+        },
+        filterDisCmdData(state) {
+            const { companyStateMap = {}, disCmdMap = {}, rcvCompanyMap = {} } = this.queryResData;
+            const list = [];
+            if (state != 'Receive') {
+                Object.values(companyStateMap).forEach(item => {
+                    if (item.state == state) {
+                        const findObj = this.findDisCmdObj(disCmdMap, item.cpId);
+                        if (findObj) {
+                            list.push(findObj);
+                        }
+                    }
+                });
+            } else {
+                Object.values(rcvCompanyMap).forEach(item => {
+                    const findObj = this.findDisCmdObj(disCmdMap, item.id);
+                    if (findObj) {
+                        list.push(findObj);
+                    }
+                });
+            }
+            return list.reverse();
+        },
+        findDisCmdObj(obj, val) {
+            return Object.values(obj).find(item => {
+                return item.sendCompany.id == val;
+            });
+        },
+        search() {
+            const operate = {
+                operation: this.getDomObj('search').operation,
+                param: this.searchObj,
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.searchTable = [];
+                    this.searchCmd().then(res => {
+                        this.getSearchTable();
+                    });
+                }
+            });
+        },
+        getSearchTable() {
+            const list = Object.values(this.queryResData.disCmdMap).reverse().filter(item => {
+                return this.conditionFilter(item);
+            });
+            this.searchTable = list;
+        },
+        conditionFilter(item) {
+            let status = true;
+            if (this.searchObj.timeType == '1') {
+                if (this.searchObj.startTime && new Date(this.searchObj.startTime).getTime() > new Date(item.sendTime).getTime()) {
+                    status = false;
+                }
+                if (this.searchObj.endTime && new Date(this.searchObj.endTime).getTime() < new Date(item.sendTime).getTime()) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.timeType == '2' && this.searchObj.sendTime) {
+                if (this.searchObj.sendTime != item.sendTime) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasNumber && this.searchObj.cmdCode) {
+                if (this.searchObj.cmdCode != item.cmdCode) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasCompanyOfSender && this.searchObj.sendCompany) {
+                if (this.searchObj.sendCompany.name != item.sendCompany.name) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasCompanyOfReceiver && this.searchObj.companyOfReceiver) {
+                const findObj = item.rcvCompanies.find(ii => {
+                    const device = this.$store.getters['map/getDeviceByCode'](ii.code);
+                    const name = device ? device.name : '';
+                    return name == this.searchObj.companyOfReceiver;
+                });
+                if (!findObj) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.hasTitleKey && this.searchObj.titleKey) {
+                if (!item.title.includes(this.searchObj.titleKey) && !item.content.includes(this.searchObj.titleKey)) {
+                    status = false;
+                }
+            }
+            if (this.searchObj.allSigned != '') {
+                const cpId = item.sendCompany.id;
+                let s = false;
+                if (this.queryResData.companyStateMap && this.queryResData.companyStateMap[cpId] == 'Signed') {
+                    s = true;
+                }
+                if (this.searchObj.allSigned != s) {
+                    status = false;
+                }
+            }
+            return status;
+        },
+        setCurrentRow(obj, refName) {
+            const tableArr = ['table', 'table1', 'table2', 'table3', 'table4', 'table5'];
+            tableArr.forEach(key => {
+                if (key != refName) {
+                    this.$refs[key] && this.$refs[key].setCurrentRow();
+                } else {
+                    this.$refs[key] && this.$refs[key].setCurrentRow(obj);
+                }
+            });
+            this.allographRow = null;
+        },
+        handleCurrentChange(obj, refName) {
+            if (!obj) { return; }
+            // this.currentInfo = obj;
+            // this.command = {...obj};
+            Object.keys(this.command).forEach(key => {
+                this.command[key] = obj[key] || '';
+            });
+            this.setCurrentRow(obj, refName);
+            this.$refs.table.clearSelection();
+            const infoList = this.command.rcvCompanies || [];
+            infoList.forEach(item => {
+                const findObj = this.getTableData.find(ii => {
+                    return ii.code == item.code;
+                });
+                findObj && this.$refs.table.toggleRowSelection(findObj, true);
+            });
+        },
+        getSignedBy(info) {
+            const signedInfo = this.memberData[info.operatorId];
+            let name = '';
+            if (signedInfo) {
+                name = signedInfo.labelName;
+            }
+            return name;
+        },
+        getDeviceName(receiverId) {
+            let name = '';
+            if (receiverId) {
+                const device = this.$store.getters['map/getDeviceByCode'](receiverId);
+                name = device ? device.name : '';
+            }
+            return name;
+        },
+        JoinDeviceNameStr(devCodeArr) {
+            let name = '';
+            const nameArr = [];
+            devCodeArr.forEach(ii => {
+                const device = this.$store.getters['map/getDeviceByCode'](ii.code);
+                nameArr.push(device ? device.name : '');
+            });
+            name = nameArr.join(',');
+            return name;
+        },
+        refreshSearch() {
+            console.log('刷新');
+            const operate = {
+                operation: this.getDomObj('refreshSearch').operation,
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+            this.searchCmd();
+        },
+        clearCondition() {
+            this.searchTable = [];
+            this.searchObj = {
+                timeType: '1',
+                startTime: '',
+                endTime: '',
+                sendTime: '',
+                hasNumber: false,
+                cmdCode: '',
+                hasCompanyOfSender: false,
+                sendCompany: {},
+                hasCompanyOfReceiver: false,
+                companyOfReceiver: '',
+                hasTitleKey: false,
+                titleKey: '',
+                allSigned: ''
+            };
+        },
+        createCmd() {
+            const obj = this.resetData();
+            const findDiff = Object.keys(obj).find(key => {
+                if (key == 'sendCompany') {
+                    return obj[key].name != this.command[key].name;
+                } else if (key == 'rcvCompanies') {
+                    return this.command[key].length;
+                } else {
+                    return obj[key] != this.command[key];
+                }
+            });
+            new Promise((resolve, reject) => {
+                if (findDiff) {
+                    this.$confirm('当前调度命令已经被编辑修改过了，你要放弃所有的修改吗？', '操作提示', {
+                        confirmButtonText: '是',
+                        cancelButtonText: '否'
+                    }).then(() => {
+                        resolve();
+                    }).catch(() => {
+                        reject();
+                    });
+                } else {
+                    resolve();
+                }
+            }).then(() => {
+                const operate = {
+                    operation: this.getDomObj('createCmd').operation,
+                    userOperationType: UserOperationType.LEFTCLICK
+                };
+                this.$store.dispatch('trainingNew/next', operate);
+                this.initData();
+                this.getSenderName();
+                sendCommandNew(this.group, 'CTC_NEW_DIS_COMMAND', {}).then((res) => {
+                    console.log(res, '---新建调度命令号');
+                    this.command.cmdCode = res.data.cmdCode;
+                    this.command.cmdId = res.data.cmdId;
+                }).catch(error => {
+                    this.$messageBox('新建调度命令号失败：' + error.message);
+                });
+            }).catch(() => {
+                console.log('取消新建调度命令!');
+            });
+        },
+        resetData() {
+            const data = this.getSendCompanyData(this.$store.state.user.id);
+            return {
+                cmdId: '',
+                cmdCode: '',
+                title: '',
+                transitId: '',
+                senderId: '',
+                sendTime: '',
+                sender: this.command.sender,
+                authTime: '',
+                chiefOnDuty: '',
+                chiefOnDutyAuth: false,
+                authState: '',
+                finishedTime: '',
+                reviewer: '',
+                dailyPlanNum: '',
+                designer: '',
+                type: 'Normal',
+                content: '',
+                sendCompany: {
+                    id: '',
+                    name: data.name || '',
+                    rsCompany: true,
+                    cpType: data.type || '',
+                    code: data.code || '',
+                    trainViaGsmR: false,
+                    transStationCode: '',
+                    trainNum: ''
+                },
+                rcvCompanies: []
+            };
+        },
+        initData() {
+            this.command = {
+                ...this.resetData()
+            };
+            // this.currentInfo = {};
+            this.$refs.table && this.$refs.table.clearSelection();
+            this.$refs.form && this.$refs.form.resetFields();
+            this.setCurrentRow();
+        },
+        getSendCompanyData(memberId) {
+            const obj = this.memberDataList.find(item => {
+                return item.userId == memberId;
+            });
+            let data = {
+                type: '',
+                name: '',
+                code: ''
+            };
+            if (obj) {
+                data = {
+                    name: obj.label || '',
+                    rsCompany: false,
+                    cpType: this.typeTransition[obj.type] || obj.type,
+                    code: obj.deviceCode || this.DisStationId
+                };
+            }
+            return data;
+        },
+        senderChange(memberId) {
+            const data = this.getSendCompanyData(memberId);
+            this.$set(this.command, 'sendCompany', data);
+        },
+        getSenderName() {
+            const activeUser = this.memberDataList.find(item => {
+                return item.userId == this.$store.state.user.id;
+            });
+            if (activeUser) {
+                // this.command.senderId = activeUser.id;
+                this.command.sender = activeUser.labelName;
+                this.senderChange(activeUser.userId);
+            }
+        },
+        tabClick() {
+            console.log('tabClick');
+        },
+        selectionChange(selection) {
+            const arr = [];
+            selection.forEach(item => {
+                arr.push({
+                    name: item.name,
+                    rsCompany: true,
+                    cpType: item.cpType,
+                    code: item.code,
+                    ...item
+                });
+            });
+            this.command.rcvCompanies = arr;
+        },
+        getCompanyIdList(sum) {
+            return new Promise((resolve, reject) => {
+                sendCommandNew(this.group, 'CTC_NEW_COMPANY_DIS_COMMAND', {sum: sum}).then(suc => {
+                    resolve(suc.data);
+                }).catch(err => {
+                    reject(err.message);
+                });
+            });
+        },
+        saveCacheData(showMsg) {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    if (!this.command.content) {
+                        this.$messageBox('请选择填写命令正文');
+                        return;
+                    }
+                    if (!this.command.rcvCompanies.length) {
+                        this.$messageBox('请选择受令单位');
+                        return;
+                    }
+                    const params = Object.assign({}, this.command);
+                    const operate = {
+                        operation: this.getDomObj('saveCacheData').operation,
+                        param: params,
+                        userOperationType: UserOperationType.LEFTCLICK
+                    };
+                    this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                        if (valid) {
+                            this.cacheCmd(showMsg).then(suc => {
+                                this.searchCmd();
+                                this.initData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        cacheCmd(showMsg) {
+            console.log('缓存', this.command);
+            return new Promise(async(resolve, reject) => {
+                const data = JSON.parse(JSON.stringify(this.command));
+                const idList = await this.getCompanyIdList(data.rcvCompanies.length + 1);
+                data.rcvCompanies.forEach((item, index) => {
+                    item.id = idList[index];
+                });
+                data.sendCompany.id = idList[idList.length - 1];
+                sendCommandNew(this.group, 'CTC_SAVE_DIS_COMMAND', data).then((res) => {
+                    showMsg && this.$message.success('缓存调度命令成功！');
+                    resolve();
+                }).catch(error => {
+                    showMsg && this.$messageBox('缓存调度命令失败：' + error.message);
+                    reject(error.message);
+                });
+            });
+        },
+        tableRowChange(row, column, event) {
+            const sArr = [undefined, 'Sent', 'Received', 'SrmReceived'];
+            const findCode = this.command.rcvCompanies.find(item => {
+                return item.code == row.code;
+            });
+            if (this.currentStatus == '已发送' && findCode && sArr.includes(row.state)) {
+                this.allographRow = row;
+            } else {
+                this.allographRow = null;
+            }
+        },
+        allographCmd() {
+            if (!this.allographRow) { return; }
+            const test = `当前操作者：【${this.getActiveSender.labelName || ''}】，为【${this.command.cmdCode}】号调度命令的受令单位【${this.allographRow.name}】`;
+            const messageData = [test];
+            const h = this.$createElement;
+            messageData.push(h('p', null, '进行代签操作前，请您与受令单位进行联络确认。'));
+            messageData.push(h('p', null, '您确定要进行代签操作吗？'));
+            this.$confirm('提示', {
+                title: '代签操作提示',
+                message: h('div', null, messageData),
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                console.log('代签');
+                const params = {cmdId: this.command.cmdId, rcId: this.allographRow.cpId, proxySign: true};
+                const operate = {
+                    operation: this.getDomObj('allographCmd').operation,
+                    param: params,
+                    userOperationType: UserOperationType.LEFTCLICK
+                };
+                this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                    if (valid) {
+                        sendCommandNew(this.group, 'CTC_SIGN_DIS_COMMAND', params).then((res) => {
+                            console.log(res, '---res');
+                            this.$message.success('代签成功！');
+                            this.searchCmd();
+                            this.initData();
+                        }).catch(error => {
+                            this.$messageBox('代签令失败：' + error.message);
+                        });
+                    }
+                });
+            }).catch(() => {
+                console.log('取消代签');
+            });
+        },
+        sendCmd() {
+            const test = `【${this.command.cmdCode}】号调度命令下达到以下受令人：`;
+            const messageData = [test];
+            const h = this.$createElement;
+            this.command.rcvCompanies.forEach((item, index) => {
+                const msg = `${index + 1}. ${item.name || ''}`;
+                messageData.push(h('p', null, msg));
+            });
+            this.$confirm('提示', {
+                title: '操作提示',
+                message: h('div', null, messageData),
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        if (!this.command.content) {
+                            this.$messageBox('请选择填写命令正文');
+                            return;
+                        }
+                        if (!this.command.rcvCompanies.length) {
+                            this.$messageBox('请选择受令单位');
+                            return;
+                        }
+                        const params = Object.assign({}, this.command);
+                        const operate = {
+                            operation: this.getDomObj('sendCmd').operation,
+                            param: params,
+                            userOperationType: UserOperationType.LEFTCLICK
+                        };
+                        this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                            if (valid) {
+                                this.cacheCmd().then(suc => {
+                                    sendCommandNew(this.group, 'CTC_SEND_DIS_COMMAND', params).then((res) => {
+                                        console.log(res, '---res');
+                                        this.$message.success('发送调度命令成功！');
+                                        this.searchCmd();
+                                        this.initData();
+                                    }).catch(error => {
+                                        this.$messageBox('发送调度命令失败：' + error.message);
+                                    });
+                                }).catch(err => {
+                                    console.log('缓存调度命令失败', err);
+                                });
+                            }
+                        });
+                    }
+                });
+            });
+        },
+        searchCmd() {
+            return new Promise((resolve, reject) => {
+                sendCommandNew(this.group, 'CTC_QUERY_DIS_COMMAND', {holderType: 'Dispatcher', holderCode: this.DisStationId}).then((res) => {
+                    console.log(res, '---res----');
+                    this.queryResData = res.data || {};
+                    resolve();
+                }).catch(error => {
+                    this.$messageBox('查询调度命令失败：' + error.message);
+                    reject(error.message);
+                });
+            });
+        }
+    }
+
+};
+</script>
+<style lang="scss" scoped>
+ .dispatcher-cmd{
+	background: #ECE9D8;
+ }
+.main {
+	height: 100%;
+	.left {
+		height: 100%;
+		.operate-box {
+			overflow-y: auto;
+		}
+		.create-cmd {
+			height: 30px;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+		}
+		.box-title {
+			height: 28px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background: #B3B2C2;
+			.contant-null, .contant-icon {
+				width: 20px;
+				display: flex;
+				justify-content: center;
+			}
+			.contant-icon:hover {
+				cursor: pointer;
+			}
+			.contant-text {
+				display: flex;
+				justify-content: center;
+				flex: 1;
+				color: blue;
+			}
+		}
+		.search-box {
+			// min-height: 720px;
+			// display: flex;
+			// flex-direction: column;
+			// justify-content: center;
+			.search-condition {
+				padding: 5px;
+				.condition-top {
+					padding: 5px;
+				}
+				.condition-btn {
+					padding: 10px;
+					text-align: center;
+				}
+			}
+			.search-table {
+				flex: 1;
+			}
+			.condition-border {
+				margin: 10px 0;
+				padding: 5px;
+				border: 1px solid #92ACD7;
+				div {
+					margin: 5px 0;
+				}
+			}
+			.condition-row {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 32px;
+				line-height: 32px;
+			}
+			.el-checkbox {
+				margin-right: 5px;
+			}
+		}
+	}
+	/deep/ .el-tabs__item {
+		height: 30px !important;
+		line-height: 30px !important;
+	}
+	/deep/ .el-table .DisableSelection .cell .el-checkbox__inner{
+		display: none;
+		position: relative;
+	}
+	.el-table .DisableSelection .cell:before{
+		content: "";
+		position: absolute;
+	}
+	.middle, .left {
+		.middle-padding {
+			padding-right: 5px;
+		}
+		/deep/ .el-form-item {
+			margin-bottom: 0px;
+			.el-form-item__error {
+				top: 30px;
+			}
+		}
+		.el-input {
+			/deep/ .el-input__icon {
+				line-height: 22px;
+			}
+		}
+		.midle-bottom {
+			height: 40px;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+}
+</style>
+<style lang="scss">
+.dispatcher-cmd .el-tabs--border-card>.el-tabs__content {
+	padding: 5px !important;
+}
+.dispatcher-cmd span {
+	font-size: 13px !important;
+	line-height: 22px;
+}
+.dispatcher-cmd span .el-icon-arrow-up{
+	line-height: 18px;
+}
+.dispatcher-cmd .el-button {
+	height: 24px;
+	line-height: 22px;
+	padding: 0px;
+	width: 80px;
+	border: 2px outset #E2E2E2;
+	border-radius: 4px !important;
+	color: #000;
+	background: #F0F0F0;
+}
+.dispatcher-cmd .expand {
+	width: 120px;
+}
+
+.dispatcher-cmd .el-button:focus span {
+	border: 1px dashed gray;
+}
+
+.dispatcher-cmd .el-button:active {
+	border: 2px inset #E2E2E2;
+}
+
+.dispatcher-cmd .el-button:disabled {
+	border: 2px inset #E2E2E2;
+}
+
+.dispatcher-cmd .el-button:disabled span {
+	border: 0px;
+}
+
+.dispatcher-cmd .el-input {
+	border: 2px inset #E9E9E9;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.dispatcher-cmd .el-input__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+	height: 22px !important;
+	line-height: 22px !important;
+}
+
+.dispatcher-cmd .el-input.is-disabled .el-input__inner {
+	background: #F0F0F0 !important;
+}
+
+.dispatcher-cmd .el-textarea {
+	border: 2px inset #E9E9E9;
+	border-radius: 0px;
+}
+
+.dispatcher-cmd .el-textarea .el-textarea__inner {
+	color: #000;
+	background: #fff !important;
+	border: 0px;
+	border-radius: 0px !important;
+	box-sizing: border-box;
+}
+
+.dispatcher-cmd .el-textarea.is-disabled .el-textarea__inner {
+	background: #F0F0F0 !important;
+}
+
+.dispatcher-cmd .el-table--border th.gutter {
+	background: #EBEADB !important;
+}
+
+.dispatcher-cmd .el-table {
+	border: 2px inset #E9E9E9;
+	color: #000 !important;
+}
+
+.dispatcher-cmd .el-table .cell {
+	height: 22px;
+	line-height: 22px;
+}
+
+.dispatcher-cmd .el-table th.is-leaf {
+	background: #F0F0F0 !important;
+	border-right: 1px solid #BDBDBD !important;
+	border-bottom: 1px solid #BDBDBD !important;
+	color: #000 !important;
+	height: 20px !important;
+	padding: 0px;
+}
+
+.dispatcher-cmd .el-table tr td {
+	height: 20px !important;
+	padding: 0px;
+}
+
+.dispatcher-cmd .el-table .el-table__empty-text {
+	top: 15px !important;
+}
+
+.dispatcher-cmd .current-row>td {
+	background: #3399FF !important;
+	color: #fff !important;
+}
+
+.dispatcher-cmd .el-checkbox__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.dispatcher-cmd .el-checkbox__label {
+	color: #000 !important;
+}
+
+.dispatcher-cmd .el-checkbox.is-disabled .el-checkbox__inner {
+	background: #E6E6E6 !important;
+}
+
+.dispatcher-cmd .el-checkbox.is-disabled .el-checkbox__label {
+	color: #C5C9CC !important;
+}
+
+.dispatcher-cmd .el-checkbox__input.is-checked .el-checkbox__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.dispatcher-cmd .el-checkbox__input.is-checked .el-checkbox__inner::after {
+	position: absolute;
+	-webkit-box-sizing: content-box;
+	box-sizing: content-box;
+	content: "";
+	border: 1px solid #000;
+	border-left: 0;
+	border-top: 0;
+	height: 7px;
+	left: 4px;
+	top: 1px;
+}
+
+.dispatcher-cmd .el-radio__inner {
+	border: 1px inset #dcdfe6 !important;
+}
+
+.dispatcher-cmd .el-radio__label {
+	color: #000 !important;
+}
+
+.dispatcher-cmd .el-radio__input.is-checked .el-radio__inner {
+	background: #fff !important;
+	border: 1px inset #dcdfe6 !important;
+}
+
+.dispatcher-cmd .el-radio__input.is-checked .el-radio__inner::after {
+	width: 4px;
+	height: 4px;
+	border-radius: 100%;
+	background-color: #000 !important;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+}
+
+.dispatcher-cmd .el-radio.is-disabled .el-radio__inner {
+	background: #E6E6E6 !important;
+}
+
+.dispatcher-cmd .el-radio.is-disabled .el-radio__label {
+	color: #C5C9CC !important;
+}
+
+.dispatcher-cmd .base-label {
+	background: rgba(0, 0, 0, 1);
+	position: relative;
+	left: -15px;
+	top: -18px;
+}
+
+.dispatcher-cmd .el-form-item label {
+	font-weight: normal !important;
+	color: #000 !important;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/dispatchWork.vue b/src/views/newMap/display/terminals/dispatchWork.vue
new file mode 100644
index 000000000..e29d64eb1
--- /dev/null
+++ b/src/views/newMap/display/terminals/dispatchWork.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <component :is="menus" :selected="selected" />
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+export default {
+    name: 'DispatchWork',
+    components: {
+        StationDiagram
+    },
+    data() {
+        return {
+            menus: null,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        },
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        // 地图数据加载完毕
+        '$store.state.map.mapDataLoadedCount': function () {
+            const lineCode = this.$jlmap.lineCode;
+            if (lineCode) {
+                this.menus = this.$theme.loadDispatchWorkMenuComponent(lineCode);
+            }
+        },
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleDispatchWorkData();
+        }
+    },
+    beforeDestroy() {
+        clearSubscribe(getTopic('ATS_STATUS', this.group));
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleDispatchWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.mapData.pictureList.find(picture => picture.type === 'dispatchWork');
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                } else {
+                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                    const list = [];
+                    for (const key in this.mapDevice) {
+                        list.push(this.mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list);
+                    this.initLocation();
+                }
+            } else {
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                const list = [];
+                for (const key in this.mapDevice) {
+                    list.push(this.mapDevice[key]);
+                }
+                this.$jlmap.updateShowStation(list);
+                this.initLocation();
+            }
+        },
+        initLocation() {
+            const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+            if (trainingDetail && trainingDetail.mapLocationJson) { // 客户端切换后如有实训重新定位
+                const mapLocation = JSON.parse(trainingDetail.mapLocationJson);
+                this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+            }
+        },
+        // 新的画面显示逻辑
+        handlerPictureShow(picture) {
+            const list = [];
+            const deviceList = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+                deviceList.push(key);
+            }
+            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+            setTimeout(() => {
+                this.$jlmap.updatePicture(deviceList);
+                const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+                if (trainingDetail && trainingDetail.mapLocationJson) { // 客户端切换后如有实训重新定位
+                    const mapLocation = JSON.parse(trainingDetail.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                } else {
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+            }, 10);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue b/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue
new file mode 100644
index 000000000..59c9dbf49
--- /dev/null
+++ b/src/views/newMap/display/terminals/dispatcherLoger/addDispatcherLogerRunplan.vue
@@ -0,0 +1,378 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    :title="title"
+    :visible.sync="show"
+    width="670px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form id="AddDispatcherForm" ref="form" :model="model" label-width="80px" :rules="rules">
+      <el-form-item label="车站:" prop="stationCode" style="width: 100%;">
+        <el-select v-model="model.stationCode" placeholder="" style="width:180px" @change="changeStation">
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="列车类型:" prop="trainType">
+        <el-select v-model="model.trainType" placeholder="" style="width:180px">
+          <el-option
+            v-for="item in trainTypeList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="运行类型:" prop="runType" style="margin-left: 45px;">
+        <el-select v-model="model.runType" placeholder="" style="width:180px">
+          <el-option
+            v-for="item in runTypeList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="到达车次:" prop="arriveTripNumber">
+        <el-input v-model="model.arriveTripNumber" style="width:160px" :disabled="model.startRunPlan" />
+      </el-form-item>
+      <el-form-item label="出发车次:" prop="departTripNumber" style="margin-left: 66px;">
+        <el-input v-model="model.departTripNumber" style="width:160px" :disabled="model.endRunPlan" />
+      </el-form-item>
+      <el-form-item label="接车口:" prop="arriveDirectionCode">
+        <el-select v-model="model.arriveDirectionCode" placeholder="" style="width:180px" :disabled="model.startRunPlan">
+          <el-option
+            v-for="item in filterArrMapStationDirectionList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发车口:" prop="departDirectionCode" style="margin-left:45px;">
+        <el-select v-model="model.departDirectionCode" placeholder="" style="width:180px" :disabled="model.endRunPlan">
+          <el-option
+            v-for="item in filterDepMapStationDirectionList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="接车股道:" prop="arriveSectionCode">
+        <el-select v-model="model.arriveSectionCode" placeholder="" style="width:160px" :disabled="model.startRunPlan">
+          <el-option
+            v-for="item in filterArrSectionList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发车股道:" prop="departSectionCode" style="margin-left: 67px;">
+        <el-select v-model="model.departSectionCode" placeholder="" style="width:160px" :disabled="model.endRunPlan">
+          <el-option
+            v-for="item in filterDepSectionList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="到达时间:" prop="arrivePlanTime">
+        <el-date-picker v-model="model.arrivePlanTime" type="datetime" :disabled="model.startRunPlan" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:160px" />
+      </el-form-item>
+      <el-form-item label="" prop="startRunPlan" class="noMargin" style="margin-left:10px;">
+        <el-checkbox v-model="model.startRunPlan" @change="changeStartRp">始发</el-checkbox>
+      </el-form-item>
+      <el-form-item label="出发时间:" prop="departPlanTime" style="margin-left:10px;">
+        <el-date-picker v-model="model.departPlanTime" type="datetime" :disabled="model.endRunPlan" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:160px" />
+      </el-form-item>
+      <el-form-item label="" prop="endRunPlan" class="noMargin" style="margin-left:10px;">
+        <el-checkbox v-model="model.endRunPlan" @change="changeEndRp">终到</el-checkbox>
+      </el-form-item>
+      <el-form-item label="" prop="electrical" class="noMargin" style="margin-left:80px;">
+        <el-checkbox v-model="model.electrical">电力</el-checkbox>
+      </el-form-item>
+      <el-form-item label="" prop="passenger" class="noMargin" style="margin-left:10px;">
+        <el-checkbox v-model="model.passenger">办理客运</el-checkbox>
+      </el-form-item>
+      <el-form-item label="" prop="transfinite" style="margin-left:20px;" class="noMargin">
+        <el-select v-model="model.transfinite" placeholder="" style="width:110px">
+          <el-option
+            v-for="item in transfiniteList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <br>
+      <el-form-item label="" prop="trackDiscordant" style="margin-left:80px;width: 220px;" class="noMargin">
+        <el-checkbox v-model="model.trackDiscordant">运行股道与基本径路不一致</el-checkbox>
+      </el-form-item>
+      <el-form-item label="" prop="entryOutDiscordant" style="margin-left:90px;width: 220px;" class="noMargin">
+        <el-checkbox v-model="model.entryOutDiscordant">出入口与基本径路不一致</el-checkbox>
+      </el-form-item>
+      <!-- trackDiscordant -->
+      <!-- 运行股道与基本径路不一致 -->
+      <!-- entryOutDiscordant -->
+      <!-- 出入口与基本径路不一致 -->
+      <!-- keyTrains
+      重点列车 -->
+    </el-form>
+    <el-row justify="center" style="margin-top:10px">
+      <el-col :span="7" :offset="5">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="7" :offset="2">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import { transfiniteList, trainTypeList } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+export default {
+    name: 'AddDispatcherLogerRunplan',
+    data() {
+        var validateTripNumber = (rule, value, callback) => {
+            if (value) {
+                const judge = /^[a-zA-Z0-9]*[\d]$/.test(value);
+                if (judge) {
+                    if (value.toString().length > 6 || value.toString().length < 2) {
+                        callback('车次长度2-6位');
+                    } else {
+                        callback();
+                    }
+                } else {
+                    callback('字母+数字,最后一位数字');
+                }
+            } else {
+                // callback('请输入车次');
+                callback();
+            }
+        };
+        return {
+            dialogShow: false,
+            loading: false,
+            mapStationDirectionList:[],
+            filterArrMapStationDirectionList:[],
+            filterDepMapStationDirectionList:[],
+            filterArrSectionList:[],
+            filterDepSectionList:[],
+            filterSectionList:[],
+            trainTypeList:trainTypeList,
+            runTypeList:[
+                {name:'快速旅客列车', code:'FAST_PASSENGER_TRAIN' }
+            ],
+            transfiniteList:transfiniteList,
+            model:{
+                // runPlanCode:'', // 新增没有
+                trainType:'LOCAL_EXPRESS_PASSENGER_TRAIN', // 列车类型
+                runType:'FAST_PASSENGER_TRAIN', // 运行类型
+                stationCode:'', // 车站编码
+                // groupNumber:'', // 班别:目前没有
+                arriveSectionCode:'', // 到达股道
+                arrivePlanTime:'', // 到达计划时间
+                arriveTripNumber:'', // 到达车次
+                // arriveStationCode:'', // 到达车站
+                arriveDirectionCode:'', // 到达方向编码（到达口）
+
+                departSectionCode:'', // 发车股道
+                departPlanTime:'', // 发车计划时间
+                departTripNumber:'', // 发车车次
+                // departStationCode:'', // 发车车站
+                departDirectionCode:'', // 发向方向编码（发车口）
+
+                startRunPlan:false, // 始发计划  true,false
+                endRunPlan:false, // 终到计划   true,false
+
+                electrical:false, // 电力   true,false
+                passenger:false, // 客运    true,false
+                // keyTrains:false, // 重点列车   true,false
+                // military:false, // 是否军用    true,false
+
+                trackDiscordant:false, // 运行股道与基本径路不一致
+                entryOutDiscordant:false, // 出入口与基本径路不一致
+
+                transfinite:'NO' // 超限等级   NO：不超限   TRANSFINITE_SUPER：超级超限   TRANSFINITE_ONE_LEVEL：一级超限  TRANSFINITE_TWO_LEVEL：二级超限
+
+            },
+            rules: {
+                stationCode:[
+                    { required: true, message: '请选择车站', trigger: 'blur' },
+                    { required: true, message: '请选择车站', trigger: 'change' }
+                ],
+                arriveTripNumber:[
+                    { required: true, validator: validateTripNumber, trigger: 'blur' }
+                ],
+                departTripNumber:[
+                    { required: true, validator: validateTripNumber, trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.CTCCommand.addDispatcherLogerRp.menu.domId : '';
+        },
+        title() {
+            return '增加阶段计划车次';
+        }
+    },
+    methods: {
+        doShow({filterSectionList, mapStationDirectionList}) {
+            this.mapStationDirectionList = mapStationDirectionList;
+            this.filterSectionList = filterSectionList;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        changeStation(stationCode) {
+            this.filterArrMapStationDirectionList = this.mapStationDirectionList.filter(each=>{ return each.stationCode == stationCode; });
+            this.filterDepMapStationDirectionList = this.mapStationDirectionList.filter(each=>{ return each.stationCode == stationCode; });
+            this.filterArrSectionList = this.filterSectionList.filter(each=>{ return each.stationCode == stationCode; });
+            this.filterDepSectionList = this.filterSectionList.filter(each=>{ return each.stationCode == stationCode; });
+        },
+        changeEndRp(data) {
+            if (data) {
+                this.model.departSectionCode = '';
+                this.model.departPlanTime = '';
+                this.model.departTripNumber = '';
+                this.model.departDirectionCode = '';
+            }
+        },
+        changeStartRp(data) {
+            if (data) {
+                this.model.arriveSectionCode = '';
+                this.model.arrivePlanTime = '';
+                this.model.arriveTripNumber = '';
+                this.model.arriveDirectionCode = '';
+            }
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.model = {
+                trainType:'LOCAL_EXPRESS_PASSENGER_TRAIN', // 列车类型
+                runType:'FAST_PASSENGER_TRAIN', // 运行类型
+                stationCode:'', // 车站编码
+                arriveSectionCode:'', // 到达股道
+                arrivePlanTime:'', // 到达计划时间
+                arriveTripNumber:'', // 到达车次
+                // arriveStationCode:'', // 到达车站
+                arriveDirectionCode:'', // 到达方向编码（到达口）
+                departSectionCode:'', // 发车股道
+                departPlanTime:'', // 发车计划时间
+                departTripNumber:'', // 发车车次
+                // departStationCode:'', // 发车车站
+                departDirectionCode:'', // 发向方向编码（发车口)
+
+                startRunPlan:false, // 始发计划  true,false
+                endRunPlan:false, // 终到计划   true,false
+
+                electrical:false, // 电力   true,false
+                passenger:false, // 客运    true,false
+                trackDiscordant:false, // 运行股道与基本径路不一致
+                entryOutDiscordant:false, // 出入口与基本径路不一致
+
+                transfinite:'NO' // 超限等级   NO：不超限   TRANSFINITE_SUPER：超级超限   TRANSFINITE_ONE_LEVEL：一级超限  TRANSFINITE_TWO_LEVEL：二级超限
+            };
+            this.filterArrMapStationDirectionList = [];
+            this.filterDepMapStationDirectionList = [];
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    commitOperate(menuOperate.CTC.addDispatcherLogerRp, {planParam:this.model}, 3).then(({valid, response})=>{
+                        if (valid) {
+                            this.$emit('addDisLoger', response.data);
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.doClose();
+                        this.$emit('noticeInfo');
+                    });
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+
+    }
+};
+</script>
+<style lang="scss">
+.chengdou-03__systerm .el-dialog #AddDispatcherForm .el-form-item label{
+  padding-right:5px;
+  line-height:30px;
+}
+.chengdou-03__systerm .el-dialog #AddDispatcherForm .el-form-item{
+    margin-bottom:20px;
+}
+#AddDispatcherForm .el-form-item__content{
+    line-height:30px;
+}
+#AddDispatcherForm{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+#AddDispatcherForm .el-input__inner {
+    height: 22px !important;
+    line-height: 22px !important;
+}
+#AddDispatcherForm span.el-input__suffix .el-input__icon{
+    height:22px;
+    line-height:22px;
+}
+#AddDispatcherForm span.el-input__prefix .el-input__icon{
+    line-height:22px;
+    display:none;
+}
+#AddDispatcherForm .el-form-item.noMargin .el-form-item__content{
+  margin-left:0px !important;
+}
+#AddDispatcherForm .el-form-item.noMargin .el-checkbox__label{
+  padding-left: 5px;
+  vertical-align: top;
+  line-height: 30px;
+}
+
+#AddDispatcherForm .el-input--prefix .el-input__inner{
+  padding-left:10px;
+  padding-right: 26px;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue b/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue
new file mode 100644
index 000000000..7beb4c842
--- /dev/null
+++ b/src/views/newMap/display/terminals/dispatcherLoger/deleteDispatcherLoger.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm train-set-plan"
+    :title="title"
+    :visible.sync="show"
+    width="280px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="text-align: center;">
+      确定删除该条行车计划？
+    </div>
+    <el-row justify="center" class="button-group" style="margin-top:20px">
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+export default {
+    name: 'DeleteDispatcherLoger',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            model:{
+                stationCode:'',
+                runPlanCode:''
+            }
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.CTCCommand.deleteDispatcherLogerRp.menu.domId : '';
+        },
+        title() {
+            return '警告';
+        }
+    },
+    methods: {
+        doShow(row) {
+            // stationCode 车站编码
+            //     const param = {stationCode:this.currentRow.stationCode, runPlanCode:this.currentRow.runPlanCode};
+            //     commitOperate(menuOperate.CTC.deleteTrainFixedPath, param, 3).then(({valid})=>{
+            //         if (valid) {
+            //             that.$message.success('删除成功！');
+            //         }
+            //     }).catch(() => {
+            //         that.$message.error('删除失败');
+            //     });
+
+            // 4.调度台删除行车计划 CTC_ZONE_DELETE_RUN_PLAN  参数：stationCode 车站编码  runPlanCode 运行编码
+            this.model.stationCode = row.stationCode;
+            this.model.runPlanCode = row.runPlanCode;
+            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.loading = true;
+            const param = this.model;
+            commitOperate(menuOperate.CTC.deleteDispatcherLogerRp, param, 2).then(({valid})=>{
+                this.loading = false;
+                this.$emit('clearRpRow');
+                if (valid) {
+                    this.$emit('deleteDisLoger', param);
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.$emit('clearRpRow');
+                this.doClose();
+                this.$emit('noticeInfo');
+            });
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+            this.$emit('clearRpRow');
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
+};
+
+</script>
diff --git a/src/views/newMap/display/terminals/dispatcherLoger/index.vue b/src/views/newMap/display/terminals/dispatcherLoger/index.vue
new file mode 100644
index 000000000..93d67c358
--- /dev/null
+++ b/src/views/newMap/display/terminals/dispatcherLoger/index.vue
@@ -0,0 +1,491 @@
+<template>
+  <div class="dispatcherLoger">
+    <div class="dispatcherLogerButton">
+      <div class="dispatcherLogerLine" />
+      <div class="dispatcherLogerBtnGroup">
+        <div id="addRunplan" class="dispatcherLogerClickBtn" @click="addRunplan">添加</div>
+        <div id="deleteRunplan" class="dispatcherLogerClickBtn" @click="deleteRunplan">删除</div>
+        <div id="sendRunplan" class="dispatcherLogerClickBtn" @click="sendRunplan">发送计划</div>
+      </div>
+      <div class="closeDL">
+        <i class="el-icon-close close_icon" @click.stop="doClose" />
+      </div>
+    </div>
+    <div class="dispatcherLogerContent" :style="{'height':height+'px'}">
+      <el-table
+        id="dispatcherLogerContentTable"
+        ref="dispatcherLogerContentTable"
+        :data="tableData"
+        border
+        :height="height"
+        highlight-current-row
+        style="width: 100%;border:1px #ccc solid"
+        @cell-click="selectedTripNumber"
+      >
+        <!--  -->
+        <!-- @current-change="handleCurrentChange" -->
+        <el-table-column
+          prop="tripNumber"
+          label=""
+          width="100"
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.tripNumber }} {{ scope.row.status==-1?'(删)':'' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column width="155" prop="trainType" label="列车类型">
+          <template slot-scope="scope">
+            <div v-if="scope.row.trainType" class="accessName">
+              {{ trainTypeMap[scope.row.trainType] }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column width="155" prop="runType" label="运行类型">
+          <template slot-scope="scope">
+            <div v-if="scope.row.runType" class="accessName">
+              {{ runTypeMap[scope.row.runType].name }}
+            </div>
+          </template>
+        </el-table-column> -->
+        <el-table-column width="155" prop="arriveTripNumber" label="到达车次">
+          <template slot-scope="scope">{{ scope.row.arriveTripNumber }}</template>
+        </el-table-column>
+        <el-table-column width="155" prop="departTripNumber" label="发车车次">
+          <template slot-scope="scope">{{ scope.row.departTripNumber }}</template>
+        </el-table-column>
+        <!-- runPlanCode:"", stationCode:"", tripNumber:"", groupNumber:"",
+        trackSectionCode:"", arriveSectionCode:"", departSectionCode:"",
+        arriveTime:"", departTime:"", arrivePlanTime:"", departPlanTime:"",
+        arriveTripNumber:"", departTripNumber:"",
+
+        startRunPlan: null/false/true,endRunPlan: null/false/true,
+        electrical: null/false/true,passenger: null/false/true,
+        keyTrains: null/false/true,military: null/false/true,
+        trackDiscordant:null/false/true, entryOutDiscordant: null/false/true,
+        transfinite: NO/TRANSFINITE_SUPER/TRANSFINITE_ONE_LEVEL/TRANSFINITE_TWO_LEVEL -->
+        <!-- width="155"  -->
+        <el-table-column prop="arriveDirectionCode" label="接车口">
+          <template slot-scope="scope">
+            <div v-if="scope.row.arriveDirectionCode" class="accessName" :title="scope.row.arriveDirectionCode">
+              <!-- {{ mapStationDirectionData[scope.row.arriveDirectionCode].name }} -->
+              <el-select
+                v-model="tableData[scope.$index].arriveDirectionCode"
+                placeholder=""
+                size="mini"
+                :disabled="scope.row.status==-1"
+                popper-class="stationSelect"
+                @change="changeArriveDirectionCode($event,scope.row,scope.$index)"
+              >
+                <el-option
+                  v-for="item in mapStationDirectionData.filter(station=>{return station.stationCode == scope.row.stationCode})"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </div>
+          </template>
+        </el-table-column>
+        <!-- width="155"  -->
+        <el-table-column prop="departDirectionCode" label="发车口">
+          <template slot-scope="scope">
+            <div v-if="scope.row.departDirectionCode" class="accessName" :title="scope.row.departDirectionCode">
+              <!-- {{ mapStationDirectionData[scope.row.departDirectionCode].name }} -->
+              <el-select
+                v-model="tableData[scope.$index].departDirectionCode"
+                placeholder=""
+                size="mini"
+                :disabled="scope.row.status==-1"
+                popper-class="stationSelect"
+                @change="changeDepartDirectionCode($event,scope.row,scope.$index)"
+              >
+                <el-option
+                  v-for="item in mapStationDirectionData.filter(station=>{return station.stationCode == scope.row.stationCode})"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="155" prop="arriveSectionCode" label="接车股道">
+          <template slot-scope="scope">
+            <div v-if="scope.row.arriveSectionCode" class="accessName">
+              <el-select
+                v-model="tableData[scope.$index].arriveSectionCode"
+                placeholder=""
+                size="mini"
+                :disabled="scope.row.status==-1"
+                popper-class="stationSelect"
+                @change="changeArriveRunPlan($event,scope.row,scope.$index)"
+              >
+                <el-option
+                  v-for="item in filterSectionList.filter(section=>{return section.stationCode == scope.row.stationCode})"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </div>
+            <!--
+                electrical
+                电力
+                passenger
+                办理客运 -->
+            <!-- <div v-if="scope.row.arriveSectionCode" class="accessName">
+              {{ filterSectionMap[scope.row.arriveSectionCode].name }}
+            </div>
+          </template> -->
+          </template></el-table-column>
+        <el-table-column width="155" prop="departSectionCode" label="发车股道">
+          <template slot-scope="scope">
+            <div v-if="scope.row.departSectionCode" class="accessName">
+              <el-select
+                v-model="tableData[scope.$index].departSectionCode"
+                placeholder=""
+                size="mini"
+                popper-class="stationSelect"
+                :disabled="scope.row.status==-1"
+                @change="changeDepartRunPlan($event,scope.row,scope.$index)"
+              >
+                <el-option
+                  v-for="item in filterSectionList.filter(section=>{return section.stationCode == scope.row.stationCode})"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </div>
+            <!-- <div v-if="scope.row.departSectionCode" class="accessName">
+              {{ filterSectionMap[scope.row.departSectionCode].name }}
+            </div> -->
+          </template>
+        </el-table-column>
+        <el-table-column width="175" prop="arrivePlanTime" label="到达时间">
+          <template slot-scope="scope">
+            <div v-if="scope.row.arrivePlanTime" class="accessName">
+              <!-- {{ scope.row.arrivePlanTime }} -->
+              <el-date-picker v-model="scope.row.arrivePlanTime" size="mini" type="datetime" value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" style="width:165px" @change="changeArrivePlanTime($event,scope.row,scope.$index)" />
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="175" prop="departPlanTime" label="出发时间">
+          <template slot-scope="scope">
+            <div v-if="scope.row.departPlanTime" class="accessName">
+              <!-- {{ scope.row.departPlanTime }} -->
+              <el-date-picker v-model="scope.row.departPlanTime" size="mini" type="datetime" value-format="yyyy-MM-dd HH:mm" style="width:165px" format="yyyy-MM-dd HH:mm" @change="changeDepartPlanTime($event,scope.row,scope.$index)" />
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <add-dispatcher-loger-runplan ref="addDispatcherLogerRunplan" @noticeInfo="noticeInfo" @addDisLoger="addDisLoger" />
+    <delete-dispatcher-loger ref="deleteDispatcherLoger" @clearRpRow="clearRpRow" @noticeInfo="noticeInfo" @deleteDisLoger="deleteDisLoger" />
+    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+  </div>
+</template>
+<script>
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+// import { copyAssign } from '@/utils/index';
+import {getRunplanInRailway} from '@/api/runplan';
+// import AddDispatcherLogerRunplan from '@/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan';
+import AddDispatcherLogerRunplan from './addDispatcherLogerRunplan';
+import DeleteDispatcherLoger from './deleteDispatcherLoger';
+// import DeleteDispatcherLoger from '@/jmapNew/theme/datie_02/menus/dialog/deleteDispatcherLoger';
+import { mapGetters } from 'vuex';
+export default {
+    name:'DispatcherLoger',
+    components: {
+        NoticeInfo,
+        AddDispatcherLogerRunplan,
+        DeleteDispatcherLoger
+    },
+    data() {
+        return {
+            height: this.$store.state.app.height - 37,
+            filterSectionList:[],
+            mapStationDirectionData:[],
+            // filterSectionMap:{},
+            tableData:[],
+            group:'',
+            currentRow:null,
+            trainTypeMap:{
+                'LOCAL_EXPRESS_PASSENGER_TRAIN':'管内特快旅客列车',
+                'LOCAL_FAST_PASSENGER_TRAIN':'管内快速旅客列车',
+                'LOCAL_PASSENGER_TRAIN':'管内普通旅客快车',
+                'LOCAL_SLOW_PASSENGER_TRAIN':'管内普通旅客慢车',
+                'LOCAL_TEMPORARY_PASSENGER_TRAIN':'管内临时旅客列车',
+                'LOCAL_TEMPORARY_TOURIST_TRAIN':'管内临时旅游列车',
+
+                'FAST_PASSENGER_TRAIN':'跨局快速旅客列车',
+                'TEMPORARY_TOURIST_TRAIN':'跨局临时旅游列车',
+                'TWO_PASSENGER_TRAIN':'跨两局普通旅客快车',
+                'TWO_SLOW_PASSENGER_TRAIN':'跨两局普通旅客慢车',
+                'TWO_TEMPORARY_PASSENGER_TRAIN':'跨两局临时旅客列车',
+                'MORE_PASSENGER_TRAIN':'跨三局及其以上普通旅客快车',
+
+                'BACK_FACTORY_PASSENGER_TRAIN':'回送出入厂客车底列车',
+                'FAULT_TRUE_BACK_PASSENGER_TRAIN':'因故折返旅客列车'
+            },
+
+            runTypeMap:{'FAST_PASSENGER_TRAIN':'快速旅客列车'}
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList'
+        ])
+    },
+    watch:{
+        //     '$store.state.socket.railwaySimulationRpChange': function (val) {
+        //         this.loadData();
+        //     }
+        '$store.state.map.mapDataLoadedCount': function (val) { // 地图数据加载完成
+            this.loadData();
+        },
+        // 仿真-仿真重置消息
+        '$store.state.socket.simulationReset': function (val) { // 地图数据加载完成
+            this.loadData();
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        this.loadFilterSectionMap();
+        this.mapStationDirectionData = Object.values(this.$store.state.map.mapStationDirectionData);
+    },
+    beforeDestroy() {
+        this.rpMenuPopShow = false;
+        this.clearRpRow();
+    },
+    methods:{
+        loadData() {
+            getRunplanInRailway(this.group).then(response => {
+                this.tableData = response.data || [];
+            }).catch(()=>{
+                this.tableData = [];
+            });
+            this.tableData = [];
+            // 调用接口
+            // const railwaySimulationRpMsg = copyAssign({}, this.$store.state.socket.railwaySimulationRpMsg);
+            // this.tableData = Object.values(railwaySimulationRpMsg);
+        },
+        loadFilterSectionMap() {
+            // this.filterSectionMap = {};
+            // this.sectionList.forEach(section=>{
+            //     if (section.standTrack) {
+            //         this.filterSectionMap[section.code] = {code:section.code, name:section.name};
+            //     }
+            // });
+            this.filterSectionList = [];
+            this.filterSectionList = this.sectionList.filter(section=>{
+                return section.standTrack;
+            });
+        },
+        addDisLoger(model) {
+            this.tableData.unshift(model);
+        },
+        deleteDisLoger(model) {
+            this.tableData.map(data=>{
+                if (data.stationCode == model.stationCode && data.runPlanCode == model.runPlanCode) {
+                    data.status = -1;
+                }
+            });
+        },
+
+        changeArriveRunPlan(event, row, index) {
+            this.modifyDispatcherLogerRpSection(row, row.arriveSectionCode, 'R');
+        },
+        changeDepartRunPlan(event, row, index) {
+            this.modifyDispatcherLogerRpSection(row, row.departSectionCode, 'D');
+        },
+
+        changeArrivePlanTime(event, row, index) {
+            this.modifyDispatcherLogerRpPlanTime(row, row.arrivePlanTime, 'R');
+        },
+        changeDepartPlanTime(event, row, index) {
+            this.modifyDispatcherLogerRpPlanTime(row, row.departPlanTime, 'D');
+        },
+        changeArriveDirectionCode(event, row, index) {
+            this.modifyDispatcherLogerRpDirection(row, row.arriveDirectionCode, 'R');
+        },
+        changeDepartDirectionCode(event, row, index) {
+            this.modifyDispatcherLogerRpDirection(row, row.departDirectionCode, 'D');
+        },
+
+        // 调度台行车计划修改出入口
+        modifyDispatcherLogerRpDirection(row, directionCode, type) {
+            const params = {stationCode:row.stationCode, runPlanCode:row.runPlanCode, directionCode:directionCode, model:type};
+            commitOperate(menuOperate.CTC.modifyDispatcherLogerRpDirection, params, 3).then(({valid, response})=>{
+                if (valid) {
+                    const reslut = response.data;
+                    this.tableData.map(data=>{
+                        if (data.stationCode == reslut.stationCode && data.runPlanCode == reslut.runPlanCode) {
+                            data.arriveDirectionCode = reslut.arriveDirectionCode;
+                            data.departDirectionCode = reslut.departDirectionCode;
+                        }
+                    });
+                }
+            }).catch(() => {
+                // this.$message.error('发布失败');
+            });
+        },
+        // 调度台行车计划修改时间
+        modifyDispatcherLogerRpPlanTime(row, planTime, type) {
+            const params = {stationCode:row.stationCode, runPlanCode:row.runPlanCode, planTime:planTime, model:type};
+            commitOperate(menuOperate.CTC.modifyDispatcherLogerRpPlanTime, params, 3).then(({valid, response})=>{
+                if (valid) {
+                    const reslut = response.data;
+                    this.tableData.map(data=>{
+                        if (data.stationCode == reslut.stationCode && data.runPlanCode == reslut.runPlanCode) {
+                            data.arrivePlanTime = reslut.arrivePlanTime;
+                            data.departPlanTime = reslut.departPlanTime;
+                        }
+                    });
+                }
+            }).catch(() => {
+                // this.$message.error('发布失败');
+            });
+        },
+        // 修改发车时间
+        modifyDispatcherLogerRpSection(row, sectionCode, type) {
+            // stationCode   车站编码
+            // runPlanCode   运行计划编码
+            // sectionCode   股道
+            // model         接发    【R,D】
+            const params = {stationCode:row.stationCode, runPlanCode:row.runPlanCode, sectionCode:sectionCode, model:type};
+            commitOperate(menuOperate.CTC.modifyDispatcherLogerRpSection, params, 3).then(({valid, response})=>{
+                if (valid) {
+                    const reslut = response.data;
+                    this.tableData.map(data=>{
+                        if (data.stationCode == reslut.stationCode && data.runPlanCode == reslut.runPlanCode) {
+                            data.arriveSectionCode = reslut.arriveSectionCode;
+                            data.departSectionCode = reslut.departSectionCode;
+                        }
+                    });
+                }
+            }).catch(() => {
+                // this.$message.error('发布失败');
+            });
+        },
+        // 大铁 调度台 发布所有行车计划
+        sendRunplan() {
+            // 车站签收行车计划  stationSignRunplan
+            const that = this;
+            this.$confirm('确定发布所有行车计划?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                commitOperate(menuOperate.CTC.releaseAllDispatcherLogerRp, {}, 3).then(({valid})=>{
+                    if (valid) {
+                        that.$message.success('发布成功！');
+                    }
+                }).catch(() => {
+                    that.$message.error('发布失败');
+                });
+            }).catch(e => {});
+        },
+        clearRpRow() {
+            this.currentRow = null;
+            this.$refs.dispatcherLogerContentTable.setCurrentRow();
+        },
+        deleteRunplan() {
+            if (this.currentRow) {
+                const param = {stationCode:this.currentRow.stationCode, runPlanCode:this.currentRow.runPlanCode};
+                this.$refs.deleteDispatcherLoger.doShow(param);
+            }
+        },
+        addRunplan() {
+            this.$refs.addDispatcherLogerRunplan.doShow({
+                filterSectionList:this.filterSectionList,
+                mapStationDirectionList:this.mapStationDirectionData
+            });
+        },
+        selectedTripNumber(row, column, cell, event) {
+            this.currentRow = row;
+        },
+        noticeInfo() {
+            this.$refs.noticeInfo.doShow();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.dispatcherLoger{
+    z-index: 60;
+    position: absolute;
+    width: 100%;
+    top: 0;
+    left: 0;
+    background: #fff;
+}
+.dispatcherLogerButton{
+    height: 37px;
+    background: #f0f0f0;
+    border: 1px #a5a5a5 solid;
+    margin-top: 1px;
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    margin-left:10px;
+}
+.dispatcherLogerLine{
+    margin-top: 1px;
+    height: 31px;
+    width: 4px;
+    border: 1px #b3b3b2 solid;
+    margin-left: 2px;
+    background: #f7f7f7;
+}
+.dispatcherLogerBtnGroup{
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    margin-left: 45px;
+}
+.dispatcherLogerClickBtn{
+    background: #f0f0f0;
+    font-size: 13px;
+    border-top: 2px #e0e0e0 solid;
+    border-left: 2px #e0e0e0 solid;
+    border-bottom: 2px #4c4c4c solid;
+    border-right: 2px #4c4c4c solid;
+    padding: 6px 15px;
+    margin-top: 2px;
+    cursor:pointer;
+    margin-left: 3px;
+}
+.dispatcherLogerContent{
+    width: 100%;
+    background:#fff;
+    border-top: 3px #818181 solid;
+    border-left: 3px #818181 solid;
+    overflow-x: auto;
+    overflow-y: hidden;
+    position: relative;
+}
+.close_icon{
+
+}
+.closeDL{
+    position: absolute;
+    right:10px;
+    top:5px;
+    padding:5px;;
+    cursor: pointer;
+}
+</style>
+<style lang="scss">
+#dispatcherLogerContentTable.el-table td, #dispatcherLogerContentTable.el-table th{
+    padding-top: 5px;
+    padding-bottom: 5px;
+    border-color: #a5a5a5;
+}
+#dispatcherLogerContentTable.el-table .cell{ padding-left: 5px;padding-right: 5px; text-align: center;font-size: 13px;}
+#dispatcherLogerContentTable .el-table__body tr.current-row>td{
+  background-color: #6aa8ec;
+  color: #fff;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/dispatcherManage.vue b/src/views/newMap/display/terminals/dispatcherManage.vue
new file mode 100644
index 000000000..37948f2e1
--- /dev/null
+++ b/src/views/newMap/display/terminals/dispatcherManage.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="dispatcher-station">
+    <div class="station-title">上海局CTC系统-行调台-控制工具条</div>
+    <div class="main">
+      <div class="menu-list">
+        <el-button v-for="(item, index) in menuList" :key="index" class="btn" type="text" @click="clickMenu(item.refPath)">{{ item.label }}</el-button>
+      </div>
+      <div class="btn-box">
+        <div v-for="(item, index) in buttonList" :key="index" class="btn-div" @click="doShow(item.refPath)">
+          <div class="img">
+            <el-image
+              style="width: 83px; height: 83px"
+              :src="item.imgUrl"
+            />
+          </div>
+          <div :id="DispatcherManageDomObj[item.domId].domId" class="text">{{ item.label }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ZhanchangIcon from '@/assets/dispatcherStation/zhanchang.png';
+import YunxingIcon from '@/assets/dispatcherStation/yunxing.png';
+import CmdIcon from '@/assets/dispatcherStation/cmd.png';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import {UserOperationType} from "../../../../scripts/ConstDic";
+export default {
+    name: 'DispatcherManage',
+    components: {
+    },
+    data() {
+        return {
+            stationCode:'',
+            groupModel: '',
+            hasUnsubscribe:false,
+            buttonList: [
+                {
+                    label: '运行图',
+                    refPath: 'schedulingPlan',
+                    domId: 'schedulingPlan',
+                    imgUrl: YunxingIcon
+                },
+                {
+                    label: '调度命令',
+                    refPath: 'dispatchingCommand',
+                    domId: 'dispatchingCommand',
+                    imgUrl: CmdIcon
+                },
+                {
+                    label: '站场图',
+                    refPath: 'dispatchWork',
+                    domId: 'dispatchWork',
+                    imgUrl: ZhanchangIcon
+                },
+                {
+                    label: '数据更新',
+                    refPath: '',
+                    domId: 'dataUpdate',
+                    imgUrl: CmdIcon
+                },
+                {
+                    label: '时间同步',
+                    refPath: '',
+                    domId: 'timeLock',
+                    imgUrl: CmdIcon
+                }
+            ],
+            menuList: [
+                {
+                    label: '登录(L)',
+                    refPath: ''
+                },
+                {
+                    label: '应用程序(T)',
+                    refPath: ''
+                }
+            ]
+        };
+    },
+    computed: {
+        group() {
+            return this.$route.query.group;
+        },
+        DispatcherManageDomObj() {
+            return OperationEvent.DispatcherManage.menu || {};
+        }
+    },
+    mounted() {
+        this.groupModel = this.$route.query.group;
+    },
+    methods: {
+        doShow(refPath) {
+            if (!refPath) {
+                this.$alert('实现中......', '提示', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                    }
+                });
+                return;
+            } else {
+                this.$emit('loadingChange');
+                setTimeout(() => {
+                    this.$emit('pictureChange', refPath);
+                }, 100);
+            }
+            const operate = {
+                operation: this.DispatcherManageDomObj[refPath].operation,
+                userOperationType: UserOperationType.LEFTCLICK
+            };
+            this.$store.dispatch('trainingNew/next', operate);
+        },
+        clickMenu(refPath) {
+            this.$alert('实现中......', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.dispatcher-station{
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+	background: #E1EDF9;
+	.station-title {
+		height: 30px;
+		padding: 0 10px;
+		line-height: 30px;
+		width: 100%;
+	}
+	.main {
+		margin: 5px;
+		height: calc(100% - 40px);
+		border: 1px solid #000;
+		background: #C0C0C0;
+		.menu-list {
+			width: 100%;
+			padding-left: 50px;
+			background: #D9DFF0;
+			.el-button {
+				padding: 5px;
+			}
+		}
+		.btn-box {
+			height: 100%;
+			border-top: 2px solid #808080;
+			display: flex;
+			justify-content: space-around;
+			padding: 20px 10px;
+			.btn-div {
+				width: 120px;
+				height: 100px;
+				text-align: center;
+				.text {
+					font-weight: bold;
+					text-align: center;
+				}
+				&:hover {
+					cursor: pointer;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/src/views/newMap/displayBaSiDi/atr.vue b/src/views/newMap/display/terminals/displayBaSiDi/atr.vue
similarity index 99%
rename from src/views/newMap/displayBaSiDi/atr.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/atr.vue
index 726cbe586..090d439a3 100644
--- a/src/views/newMap/displayBaSiDi/atr.vue
+++ b/src/views/newMap/display/terminals/displayBaSiDi/atr.vue
@@ -362,7 +362,7 @@ export default {
             } else if (this.intervalMode === 'trainInterval') {
                 step.param.calculateParam.interval = this.trainInterval;
             }
-            this.$store.dispatch('training/nextNew', step).then(({valid, response}) => {
+            this.$store.dispatch('trainingNew/next', step).then(({valid, response}) => {
                 if (valid) {
                     this.trainInterval = response.data.intervalTime;
                     this.trainNumber = response.data.trainNumber;
@@ -458,7 +458,7 @@ export default {
                 over:true
             };
 
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.dialogShow = false;
                 }
diff --git a/src/views/newMap/displayBaSiDi/baSiDi.vue b/src/views/newMap/display/terminals/displayBaSiDi/baSiDi.vue
similarity index 89%
rename from src/views/newMap/displayBaSiDi/baSiDi.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/baSiDi.vue
index 66f7d9169..ce61eee4d 100644
--- a/src/views/newMap/displayBaSiDi/baSiDi.vue
+++ b/src/views/newMap/display/terminals/displayBaSiDi/baSiDi.vue
@@ -1,16 +1,8 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    :visible.sync="dialogVisible"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    :show-close="false"
-    z-index="1999"
-    :modal="false"
-    width="100%"
-  >
-    <div style="height: 130px;">
-      <div class="haerbin-01__systerm nav">
+  <div v-dialogDrag>
+    <div style="height: 130px;width: 100%;" class="el-dialog">
+      <div class="el-dialog__header" />
+      <div class="haerbin-01__systerm nav el-dialog__body">
         <el-row style="padding: 3px;">
           <el-col :span="20">
             <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;height: 132px;">
@@ -33,9 +25,9 @@
               </el-row>
               <div style="padding: 5px;height:20px;line-height: 20px;border-top: 2px solid #DDD9CA;display: flex;justify-content: space-between;">
                 <div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('rpsDialog')">背投</div>
+                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('bigScreen')">背投</div>
                   <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('carPack')">车场</div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('troDialog')">轨道</div>
+                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('troWork')">轨道</div>
                   <div class="div-simulate-button" style="width: 40px;">系统</div>
                   <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('traDialog')">列车</div>
                 </div>
@@ -108,17 +100,8 @@
       <audio id="buzzer" controls loop="loop" style="width: 0;height: 0">
         <source :src="buzzerAudio" type="audio/mpeg">
       </audio>
-      <div class="display-draft">
-        <el-button-group class="button-group-box">
-          <template v-if="!dataError">
-            <el-button type="success" :disabled="isRunPlan" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
-          </template>
-          <el-button type="primary" size="small" @click="back">{{ $t('display.demon.back') }}</el-button>
-        </el-button-group>
-      </div>
     </div>
-  </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -133,16 +116,6 @@ export default {
         AlarmTableHmi,
         LogDetail
     },
-    props: {
-        dataError: {
-            type: Boolean,
-            required: true
-        },
-        isRunPlan: {
-            type: Boolean,
-            required: true
-        }
-    },
     data() {
         return {
             dialogVisible: true,
@@ -194,18 +167,14 @@ export default {
         }
     },
     watch: {
-        '$store.state.training.initTime': function (initTime) {
-            // const date = new Date(initTime);
-            this.initDate(initTime);
-        },
         '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', time);
+            this.initDate(time);
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
             (val || []).forEach(item => {
                 if (!item.confirmed) {
                     this.tipContent.push(item);
-                    this.handleAlarm(item);
+                    // this.handleAlarm(item);
                     if (this.tipContent.length > 3) {
                         this.tipContent.shift();
                     }
@@ -252,7 +221,7 @@ export default {
     },
     methods: {
         undeveloped() {
-            this.doClose();
+            // this.doClose();
             this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
                 callback: action => {
@@ -289,9 +258,9 @@ export default {
             this.$emit('back');
         },
         initDate(date) {
-            this.time = timestampFormat('HH:mm:ss', date)
-            this.dateString = timestampFormat('YYYY.MM.DD', date)
-        },
+            this.time = timestampFormat('HH:mm:ss', date);
+            this.dateString = timestampFormat('YYYY.MM.DD', date);
+        }
     }
 };
 </script>
@@ -378,12 +347,4 @@ export default {
 	/deep/.el-dialog__body{
 		padding: 0;
 	}
-	.display-draft {
-		position: fixed;
-		right: 10px;
-		bottom: 15px;
-		.button-group-box{
-			float: right;
-		}
-	}
 </style>
diff --git a/src/views/newMap/displayBaSiDi/carPack.vue b/src/views/newMap/display/terminals/displayBaSiDi/carPack.vue
similarity index 98%
rename from src/views/newMap/displayBaSiDi/carPack.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/carPack.vue
index 541684d16..a4f10eb01 100644
--- a/src/views/newMap/displayBaSiDi/carPack.vue
+++ b/src/views/newMap/display/terminals/displayBaSiDi/carPack.vue
@@ -206,7 +206,7 @@ export default {
             //     val: '' + this.direction + '::' + this.trainCode
             // };
             // this.loading = true;
-            // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            // this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
             //     this.loading = false;
             //     if (valid) {
             //         this.doClose();
@@ -222,7 +222,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/newMap/display/terminals/displayBaSiDi/index.vue b/src/views/newMap/display/terminals/displayBaSiDi/index.vue
new file mode 100644
index 000000000..29d60fddb
--- /dev/null
+++ b/src/views/newMap/display/terminals/displayBaSiDi/index.vue
@@ -0,0 +1,167 @@
+<template>
+  <div class="main" :style="{width: '100%',height:'100%',position:'absolute',overflow:'hidden'}" style="background: #000;">
+    <ba-si-di ref="baSiDi" @handleDialogShow="handleDialogShow" />
+    <car-pack ref="carPack" />
+    <tra-dialog ref="traDialog" @openTrainTrunkDetail="openTrainTrunkDetail" />
+    <ttl-dialog ref="ttlDialog" />
+    <tmt-dialog ref="tmtDialog" />
+    <atr-dialog ref="atrDialog" />
+    <train-trunk-detail ref="trainTrunkDetail" @openTra="openTra" />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { clearSubscribe, displayTopic } from '@/utils/stomp';
+import { EventBus } from '@/scripts/event-bus';
+import BaSiDi from './baSiDi';
+import CarPack from './carPack';
+import TraDialog from './tra';
+import TtlDialog from './ttl';
+import TmtDialog from './tmt';
+import AtrDialog from './atr';
+import TrainTrunkDetail from './trainTrunkDetail';
+
+export default {
+    name: 'DisplayDraft',
+    components: {
+        BaSiDi,
+        CarPack,
+        TraDialog,
+        TtlDialog,
+        TmtDialog,
+        AtrDialog,
+        TrainTrunkDetail
+    },
+    data() {
+        return {
+            offset: 15,
+            offsetBottom: 15,
+            tipBottom: 0,
+            textStatusHeight: 0,
+            planRunning:false,
+            dataError: false,
+            group:''
+        };
+    },
+    computed:{
+        ...mapGetters([
+            'canvasWidth'
+        ]),
+        ...mapGetters('map', [
+            'stationList',
+            'trainList'
+        ]),
+        mode() {
+            return this.$route.params.mode;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        },
+        isRunPlan() {
+            return this.$store.state.training.started;
+        }
+    },
+    beforeDestroy() {
+        this.clearSubscribe();
+        this.$store.dispatch('training/reset');
+    },
+    methods:{
+        // 结束加载状态
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        clearSubscribe() {
+            clearSubscribe(`${displayTopic}\/${this.groupModel}`);
+        },
+        openTra() {
+            this.$refs.traDialog.doShow();
+        },
+        troClick() {
+            this.$refs.troDialog.doShow();
+        },
+        openTrainTrunkDetail(index) {
+            this.$refs.trainTrunkDetail.doShow(index);
+        },
+        handleDialogShow(type) {
+            if (type === 'troWork' || type === 'bigScreen') {
+                this.$emit('pictureChange', type);
+            } else {
+                this.$refs[type].doShow();
+            }
+        }
+    }
+};
+</script>
+<style>
+.nanjing-02__systerm .el-dialog {
+    background: #d8d8d8;
+    border: 2px solid rgba(144, 144, 144, 0.8);
+    border-radius: 6px;
+    color: #000;
+    font-size: 14px;
+}
+.nanjing-02__systerm .el-dialog .el-dialog__header {
+    padding: 5px;
+    height: 30px;
+	background-image: linear-gradient(#A5A5BA, #FDFEFD);
+	border-radius: 4px 4px 0 0;
+}
+.nanjing-02__systerm .el-dialog .el-dialog__title {
+    position: absolute;
+    top: 4px;
+    color: #000;
+    border-radius: 4px;
+    padding: 0 2px;
+    height: 20px;
+    line-height: 24px;
+	font-size: 15px;
+}
+.nanjing-02__systerm .el-dialog .el-dialog__headerbtn {
+    background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+    border: 1px solid #fff;
+    border-radius: 4px;
+    top: 6px;
+    right: 5px;
+    line-height: 16px;
+}
+.nanjing-02__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close{
+	color: #fff;
+}
+.nanjing-02__systerm .el-dialog .el-dialog__body {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 5px;
+    padding-right: 5px;
+    margin: 0px 1px 1px;
+	border: 2px solid rgb(212 212 212);
+    box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+    background: #E6E6E6;
+    opacity: 1;
+}
+.nanjing-02__systerm .el-dialog .el-button {
+    height: 26px;
+    line-height: 24px;
+	font-size: 13px;
+    padding: 0;
+    width: 80px;
+    border: 1px solid #8B958A;
+    border-radius: 0 !important;
+    color: #000;
+    background: #E6E6E6;
+}
+.nanjing-02__systerm .el-dialog .el-button.disabled {
+    border: 1px solid #B1B1B1;
+    color: #ABABAB;
+}
+</style>
diff --git a/src/views/newMap/displayBaSiDi/tmt.vue b/src/views/newMap/display/terminals/displayBaSiDi/tmt.vue
similarity index 98%
rename from src/views/newMap/displayBaSiDi/tmt.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/tmt.vue
index 6a9eb2cb6..7ebf6330d 100644
--- a/src/views/newMap/displayBaSiDi/tmt.vue
+++ b/src/views/newMap/display/terminals/displayBaSiDi/tmt.vue
@@ -1,16 +1,4 @@
 <template>
-  <!--<el-dialog-->
-  <!--v-dialogDrag-->
-  <!--class="route-setting"-->
-  <!--:title="title"-->
-  <!--:visible.sync="show"-->
-  <!--width="900px"-->
-  <!--label-position="top"-->
-  <!--:before-close="doClose"-->
-  <!--:z-index="2009"-->
-  <!--:modal="false"-->
-  <!--:close-on-click-modal="false"-->
-  <!--&gt;-->
   <div v-if="dialogShow" id="faultChoose">
     <div class="falutChooseTitle">{{ title }}</div>
     <div class="closeFalutChoose" @click="doClose">
@@ -272,7 +260,6 @@
     </div>
     <notice-info ref="noticeInfo" pop-class="haerbin-01__systerm" />
   </div>
-  <!--</el-dialog>-->
 </template>
 
 <script>
@@ -444,7 +431,7 @@ export default {
                 step.operation = OperationEvent.Train.moveTrainId.menu.operation;
                 step.param = params;
             }
-            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.changeShowMode();
@@ -468,7 +455,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/newMap/displayBaSiDi/tra.vue b/src/views/newMap/display/terminals/displayBaSiDi/tra.vue
similarity index 93%
rename from src/views/newMap/displayBaSiDi/tra.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/tra.vue
index 5c7acc516..3737d3a17 100644
--- a/src/views/newMap/displayBaSiDi/tra.vue
+++ b/src/views/newMap/display/terminals/displayBaSiDi/tra.vue
@@ -22,16 +22,13 @@
         </div>
       </div>
     </div>
-    <!--<train-trunk-detail ref="trainTrunkDetail" :train-view-list="trainViewList" />-->
   </el-dialog>
 </template>
 <script>
 import trainTrunkDown from '@/assets/baSiDi/up.png';
-// import TrainTrunkDetail from '../../../jmapNew/theme/nanjing_02/menus/dialog/trainTrunkDetail.vue';
 export default {
     name:'Tra',
     components:{
-        // TrainTrunkDetail
     },
     data() {
         return {
@@ -67,7 +64,6 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
         },
         toTrainTrunkDetail(index) {
-            // this.$refs.trainTrunkDetail.doShow(index);
             this.$emit('openTrainTrunkDetail', index);
             this.doClose();
         }
diff --git a/src/views/newMap/displayBaSiDi/trainTrunkDetail.vue b/src/views/newMap/display/terminals/displayBaSiDi/trainTrunkDetail.vue
similarity index 100%
rename from src/views/newMap/displayBaSiDi/trainTrunkDetail.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/trainTrunkDetail.vue
diff --git a/src/views/newMap/displayBaSiDi/ttl.vue b/src/views/newMap/display/terminals/displayBaSiDi/ttl.vue
similarity index 100%
rename from src/views/newMap/displayBaSiDi/ttl.vue
rename to src/views/newMap/display/terminals/displayBaSiDi/ttl.vue
diff --git a/src/views/newMap/display/terminals/emergencyDispatchWork.vue b/src/views/newMap/display/terminals/emergencyDispatchWork.vue
new file mode 100644
index 000000000..2a1ee9075
--- /dev/null
+++ b/src/views/newMap/display/terminals/emergencyDispatchWork.vue
@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+export default {
+    name: 'BigScreen',
+    components: {
+        StationDiagram
+    },
+    data() {
+        return {
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    watch: {
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleBigScreenData();
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    mounted() {
+        console.log('**********');
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleBigScreenData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            console.log(this.mapData, this.mapData.pictureList, '************');
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen');
+                if (picture) {
+                    this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+                    const deviceList = [];
+                    const mapDevice = this.$store.state.map.mapDevice;
+                    for (const deviceCode in mapDevice) {
+                        deviceList.push(deviceCode);
+                    }
+                    this.$jlmap.updatePicture(deviceList);
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue
new file mode 100644
index 000000000..a5674c3b2
--- /dev/null
+++ b/src/views/newMap/display/terminals/index.vue
@@ -0,0 +1,308 @@
+<template>
+  <div v-loading="loading" style="height: 100%">
+    <dispatcher-work v-if="picture === 'dispatchWork'" ref="dispatcherWork" />
+    <local-work v-else-if="picture === 'localWork'" ref="localWork" :centralized-station-map="centralizedStationMap" />
+    <jl3d-drive v-else-if="picture === 'drivingPlan'" ref="jl3dDrive" />
+    <jl3d-device v-else-if="picture === 'jl3dModle'" ref="jl3dModle" />
+    <cctv-view v-else-if="picture === 'cctvView'" ref="cctvView" />
+
+    <digital-stand v-else-if="picture === 'digitalStand'" ref="digitalStand" />
+    <iscs-system v-else-if="picture === 'iscsView'" ref="IscsSystem" />
+    <traffic-terminal-work v-else-if="picture === 'trafficTerminal'" ref="trafficTerminalWork" :centralized-station-map="centralizedStationMap" />
+    <ibp-plate v-else-if="picture === 'ibp'" ref="ibpPlate" />
+    <big-train-runplan-manage v-else-if="picture === 'trafficManageTerminal'" ref="bigTrainRunplanManage" />
+    <dispatch-cmd v-else-if="picture === 'dispatchingCommand'" ref="dispatchCmd" />
+    <dispatcher-loger v-else-if="picture === 'schedulingPlan'" ref="dispatcherLoger" />
+    <!-- 大客流策略 -->
+    <psl-terminal v-else-if="picture === 'psl'" ref="pslTerminal" />
+    <large-passenger-strategy v-else-if="picture === 'largePassengerStrategy'" ref="largePassengerStrategy" />
+    <large-passenger-view v-else-if="picture === 'largePassengerView'" ref="largePassengerView" />
+    <dispatcher-manage v-else-if="picture === 'dispatcherManage'" ref="dispatcherManage" @pictureChange="pictureChange" @loadingChange="loadingChange" />
+    <big-screen v-else-if="picture === 'bigScreen'" ref="bigScreen" />
+    <schedule-work v-else-if="picture === 'scheduleWork'" ref="scheduleWork" />
+    <emergency-dispatch-work v-else-if="picture === 'emergency'" ref="emergencyDispatchWork" />
+    <register-book v-else-if="picture === 'registerBook'" ref="registerBook" />
+    <train-ticket v-else-if="picture === 'trainTicket'" ref="trainTicket" />
+    <diagram-load v-else-if="picture === 'diagramLoad'" ref="diagramLoad" :group="group" />
+    <diagram-preview v-else-if="picture === 'diagramPreview'" ref="diagramPreview" />
+    <diagram-edit v-else-if="picture === 'diagramEdit'" ref="diagramEdit" />
+    <pis-terminal v-else-if="picture === 'pis'" ref="pisTerminal" />
+    <display-ba-si-di v-else-if="picture === 'baSiDi'" ref="displayBaSiDi" @pictureChange="pictureChange" />
+    <tro-work v-else-if="picture === 'troWork'" ref="troWork" />
+    <tro-detail-work v-else-if="picture === 'troDetailWork'" ref="troDetailWork" :show-station-code="showStationCode" @pictureChange="pictureChange" />
+    <jl3d-maintainer-select v-else-if="picture === 'maintainerSelect'" ref="jl3dMaintainerSelect" />
+    <interlock-work v-if="picture=='interlockWork'" ref="interlockWork" :centralized-station-map="centralizedStationMap" />
+
+    <terminal-menu
+      v-if="menuShow"
+      ref="terminalMenu"
+      :picture="picture"
+      @pictureChange="pictureChange"
+      @loadingChange="loadingChange"
+    />
+  </div>
+</template>
+
+<script>
+import {getSimulationMemberList, getAllSimulationUser} from '@/api/simulation';
+import {getToken} from '@/utils/auth';
+import {creatSubscribe, clearSubscribe, getTopic} from '@/utils/stomp';
+import { defaultCallback, stateCallback } from '@/utils/subscribeCallback';
+import DispatcherWork from './dispatchWork';
+import LocalWork from './localWork';
+import InterlockWork from './interlockWork';
+import TerminalMenu from './terminalMenu';
+import DispatchCmd from './dispatchCmd';
+import DispatcherLoger from './dispatcherLoger/index';
+import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
+import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
+import Jl3dMaintainerSelect from '@/views/jlmap3d/maintainer/jl3dmaintainerselect';
+import cctvView from './cctvView';
+import DigitalStand from '@/views/jlmap3d/simulation/jl3dsimulation';
+import IbpPlate from '@/views/ibp/ibpsystem/index';
+import TrafficTerminalWork from './trafficTerminalWork';
+import BigTrainRunplanManage from '@/views/bigTrainRunplanManage/index';
+import IscsSystem from '@/views/iscs/iscsSystemNew/index';
+import PslTerminal from './psl';
+import PisTerminal from './pis/index';
+import DispatcherManage from './dispatcherManage';
+import LargePassengerStrategy from './largePassengerStrategy';
+import LargePassengerView from './largePassengerView';
+import BigScreen from './bigScreen';
+import ScheduleWork from './schedulWork';
+import EmergencyDispatchWork from './emergencyDispatchWork';
+import RegisterBook from './registerBook';
+import TrainTicket from './trainTicket/index';
+import DiagramLoad from './diagramLoad';
+import DiagramPreview from './diagramPreview';
+import DiagramEdit from './diagramEdit/index';
+import DisplayBaSiDi from './displayBaSiDi/index';
+import TroWork from './troWork';
+import TroDetailWork from './troDetailWork';
+
+export default {
+    name: 'Index',
+    components: {
+        TroWork,
+        DispatcherWork,
+        LocalWork,
+        InterlockWork,
+        TerminalMenu,
+        DispatchCmd,
+        DispatcherLoger,
+        Jl3dDevice,
+        Jl3dDrive,
+        cctvView,
+        IbpPlate,
+        TrafficTerminalWork,
+        DigitalStand,
+        BigTrainRunplanManage,
+        IscsSystem,
+        LargePassengerStrategy,
+        LargePassengerView,
+        PslTerminal,
+        PisTerminal,
+        DispatcherManage,
+        BigScreen,
+        ScheduleWork,
+        EmergencyDispatchWork,
+        RegisterBook,
+        TrainTicket,
+        DiagramLoad,
+        DiagramPreview,
+        DiagramEdit,
+        DisplayBaSiDi,
+        TroDetailWork,
+        Jl3dMaintainerSelect
+    },
+    data() {
+        return {
+            picture: '',
+            centralizedStationList: [],
+            centralizedStationMap: {},
+            loading: false,
+            isFirst: true,
+            group: '',
+            showStationCode: ''
+        };
+    },
+    computed: {
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
+        },
+        userId() {
+            return this.$store.state.user.id;
+        },
+        roleDeviceCode() {
+            return this.$store.state.training.roleDeviceCode;
+        },
+        menuShow() {
+            return !this.$route.query.singleClient || !this.$store.state.training.roles;
+        }
+    },
+    watch: {
+        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
+            this.subscribe('STATE');
+            this.subscribe('ATS_STATUS');
+            if (this.isFirst) {
+                this.$store.dispatch('training/setMapDefaultState');
+                this.isFirst = false;
+            }
+        },
+        '$store.state.socket.memberChangeCount': function () { // 仿真成员变更
+            this.initMemberUserInfo();
+        },
+        '$store.state.map.map': function (map) {
+            try {
+                if (map) {
+                    this.initMemberUserInfo();
+                    this.setCentralizedStationList(map); // 获取集中站列表
+                    if (this.$route.query.client) {
+                        setTimeout(() => {
+                            this.pictureChange(this.$route.query.client);
+                        }, 200);
+                    }
+                }
+            } catch (error) {
+                console.log('[ERROR] ', error);
+                this.mapViewLoaded(false);
+            }
+        },
+        '$store.state.menuOperation.selectedCount':function() {
+            const device = this.$store.state.menuOperation.selected;
+            if (device && device._type === 'Station' && this.$store.state.menuOperation.subType === 'troButton') {
+                this.showStationCode = device.code;
+                this.pictureChange('troDetailWork');
+            }
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        this.isFirst = true;
+        this.subscribe('COMMON');
+    },
+    beforeDestroy() {
+        this.clearSubscribe();
+        this.$store.dispatch('map/mapClear');
+        this.$store.dispatch('map/setPictureDeviceMap', {});
+        this.$store.dispatch('training/setRoles', '');
+        this.$store.dispatch('map/initJlmapLoadedCountClear');
+        this.$store.dispatch('socket/clearSimulationRoleList');
+        this.$store.dispatch('trainingNew/clearTrainingData');
+        this.$store.dispatch('runPlan/setPlanData', []);
+    },
+    methods: {
+        async initMemberUserInfo() {
+            try {
+                let memberResp = '';
+                let userResp = '';
+                memberResp = await getSimulationMemberList(this.group);
+                userResp = await getAllSimulationUser(this.group);
+                this.$store.dispatch('training/setMemberList', {memberList: memberResp.data, userId: this.userId});
+                this.$store.dispatch('training/setSimulationUserList', userResp.data);
+            } catch {
+                this.$messageBox('获取仿真成员或用户列表失败！');
+            }
+        },
+        subscribe(type) { // 根据显示端分别订阅
+            const header = {group: this.group || '', 'X-Token': getToken()};
+            switch (type) {
+            case 'COMMON':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            case 'ATS_STATUS':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            case 'STATE':
+                creatSubscribe(getTopic(type, this.group), header, stateCallback);
+                break;
+            case 'CTC':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            case 'LPF':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            case 'YJDDZH':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            case 'RUNFACT':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            case 'JL3D':
+                creatSubscribe(getTopic(type, this.group), header, defaultCallback);
+                break;
+            }
+        },
+        clearSubscribe() {
+            clearSubscribe(getTopic('COMMON', this.group));
+            clearSubscribe(getTopic('ATS_STATUS', this.group));
+            clearSubscribe(getTopic('STATE', this.group));
+            clearSubscribe(getTopic('CTC', this.group));
+            clearSubscribe(getTopic('LPF', this.group));
+            clearSubscribe(getTopic('JL3D', this.group));
+        },
+        loadingChange() {
+            this.loading = true;
+        },
+        pictureChange(val) {
+            this.picture = val;
+            this.$store.dispatch('map/setPicture', this.picture);
+            if (val === 'ibp') {
+                this.$nextTick(() => { this.$refs.ibpPlate.show(this.roleDeviceCode, ''); });
+            } else if (val === 'drivingPlan') {
+                this.$nextTick(() => { this.$refs.jl3dDrive.show(this.mapId, this.group); this.mapViewLoaded(true); });
+            } else if (val === 'trafficTerminal') {
+                this.$nextTick(() => { this.subscribe('CTC'); });
+            } else if (val === 'largePassengerView') {
+                this.$nextTick(() => { this.subscribe('LPF'); });
+            } else if (val === 'emergency') {
+                this.$nextTick(() => { this.subscribe('YJDDZH'); });
+            } else if (val === 'diagramPreview') {
+                this.$nextTick(() => { this.subscribe('RUNFACT'); });
+            } else if (val === 'digitalStand') {
+                this.$nextTick(() => { this.subscribe('JL3D'); });
+            } else if (val === 'cctvView') {
+                const RealCctvList = ['richorjoint', 'richorhhcj'];
+                const project = this.$route.query.project || 'login';
+                if (!RealCctvList.includes(project)) {
+                    this.$nextTick(() => { this.subscribe('JL3D'); });
+                }
+            } else if (val === 'scheduleWork') {
+                this.mapViewLoaded(true);
+            }
+            this.$nextTick(() => { this.loading = false; });
+        },
+        popupTerminalShow(val) {
+            this.$refs[val].doShow();
+        },
+        close() {},
+        setCentralizedStationList(map) {
+            this.centralizedStationList = [];
+            (map.stationList || []).forEach(item => {
+                if (item.centralized) {
+                    this.centralizedStationList.push({value: item.code, name: item.name});
+                    this.centralizedStationMap[item.code] = item.code;
+                    item.chargeStationCodeList && item.chargeStationCodeList.length && item.chargeStationCodeList.forEach(ele => {
+                        this.centralizedStationMap[ele] = item.code;
+                    });
+                }
+            });
+            if (this.centralizedStationList.length && !this.showStation) {
+                this.showStation = this.centralizedStationList[0].value;
+            }
+        },
+        // 设置地图加载状态
+        mapViewLoaded(loading) {
+            this.loading = loading;
+            this.$store.dispatch('app/animationsClose');
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/interlockWork.vue b/src/views/newMap/display/terminals/interlockWork.vue
new file mode 100644
index 000000000..4c3bc082a
--- /dev/null
+++ b/src/views/newMap/display/terminals/interlockWork.vue
@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <component :is="menus" :selected="selected" />
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+  </div>
+</template>
+<script>
+import StationDiagram from '../stationDiagram/index';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+import {mapGetters} from 'vuex';
+export default {
+    name:'InterlockWork',
+    components: {
+        StationDiagram
+    },
+    props: {
+        centralizedStationMap:{
+            type: Object,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            menus: null,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        },
+        roleDeviceCode() {
+            return this.$store.state.training.roleDeviceCode;
+        },
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        // 地图数据加载完毕
+        '$store.state.map.mapDataLoadedCount': function () {
+            const lineCode = this.$jlmap.lineCode;
+            if (lineCode) {
+                this.menus = this.$theme.loadLocalWorkMenuComponent(lineCode);
+            }
+        },
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleLocalWorkData();
+        },
+        '$store.state.training.roleDeviceCode': function (val) {
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.mapData.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'localWork');
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                }
+            }
+        }
+    },
+    beforeDestroy() {
+        clearSubscribe(getTopic('ATS_STATUS', this.group));
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        // 新的画面显示逻辑
+        handlerPictureShow(picture) {
+            const list = [];
+            const deviceList = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+                deviceList.push(key);
+            }
+            this.$jlmap.updateShowStation(list);
+            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+            setTimeout(() => {
+                this.$jlmap.updatePicture(deviceList);
+                this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);
+            }, 10);
+        },
+        handleLocalWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            if (this.mapData && this.mapData.pictureList) {
+                // let type = this.datie ? 'chainStation' : 'localWork';
+                // const station = this.mapDevice[this.roleDeviceCode];
+                // if (station && station.depot) {
+                //     type = 'chainStation';
+                // }
+                const type = 'localWork';
+                const picture = this.mapData.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === type);
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                } else {
+                    this.handlerSwitchStationMode();
+                }
+            } else {
+                this.handlerSwitchStationMode();
+            }
+        },
+        // 旧的分集中站显示逻辑
+        handlerSwitchStationMode() {
+            this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+            this.showStation = this.centralizedStationMap[this.roleDeviceCode];
+            const showStation = this.centralizedStationMap[this.roleDeviceCode];
+            const list = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list, showStation);
+            this.$jlmap.setCenter(showStation);
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/terminals/largePassengerStrategy.vue b/src/views/newMap/display/terminals/largePassengerStrategy.vue
new file mode 100644
index 000000000..1fcd4ab24
--- /dev/null
+++ b/src/views/newMap/display/terminals/largePassengerStrategy.vue
@@ -0,0 +1,509 @@
+<template>
+  <div class="bigLPFStrategy">
+    <div class="bigLPFStrategyL">
+      <div class="bigLPFStrategyLTitle">大客流站台直方图</div>
+      <div :id="bigLPFStrategyId" class="bigLPFStrategyLChart" />
+    </div>
+    <div class="bigLPFStrategyR">
+      <div class="LPFstrategyTop">
+        <div class="LPFstrategyTitle">
+          <span class="LPFstrategyTitleL">客流策略</span>
+          <span v-if="LPFstrategyList.length>0" class="LPFstrategyTitleR">【 推算时长:{{ recoimemmandTime }}分钟 】</span>
+        </div>
+      </div>
+      <div id="LPFstrategyListOut">
+        <div v-if="LPFstrategyList.length<=0" class="noLPFstrategy">暂无策略</div>
+        <!-- <el-tabs v-model="activeName" class="border-card">
+            <el-tab-pane class="view-control" label="策略列表" name="first"> -->
+        <!-- <div class=""></div> -->
+        <!-- <el-tabs v-else v-model="activeName" type="card" class="LPFstrategyListIn">
+          <el-tab-pane label="策略列表" name="first"> -->
+        <!-- <div v-else class="eachLPFstrategy">
+          <div class="eachLPFstrategyData1">大客流站台列表</div>
+          <div v-for="(eachLPFstand,index) in LPFstandList" :key="index">
+            <div class="eachLPFstrategyData">站台{{ index+1 }}：{{ eachLPFstand.name }}</div>
+            <div class="eachLPFstrategyData">等待人数：{{ eachLPFstand.wait }}</div>
+          </div>
+        </div> -->
+        <div v-for="(eachLPFstrategy,index) in LPFstrategyList" :key="index" class="eachLPFstrategy">
+          <div class="eachLPFstrategyData1">策略{{ index+1 }}：{{ eachLPFstrategy.description }}</div>
+          <div class="eachLPFstrategyData">指标数据：</div>
+          <div class="eachLPFstrategyData">
+            <span> 影响的列车数量: {{ eachLPFstrategy.effectTrainNum }}</span>
+            <span class="eachLPFstrategySpan">时刻表总偏移量: {{ eachLPFstrategy.scheduleOffset }}秒 </span>
+          </div>
+          <!-- <div class="eachLPFstrategyData">影响的列车: {{ eachLPFstrategy.effectTrainSet.toString() }}</div> -->
+          <div class="eachLPFstrategyData">
+            <span> 可多载离的乘客数量（累计的）: {{ eachLPFstrategy.extraNum }}</span>
+          </div>
+        </div>
+        <!-- </el-tab-pane> -->
+        <!-- <el-tab-pane label="大客流站台列表" name="second"> -->
+
+        <!-- </el-tab-pane> -->
+        <!-- </el-tabs> -->
+        <!-- </el-tab-pane>
+            <el-tab-pane class="view-control" label="大客流站台列表" name="second">
+              {{ 111 }}
+            </el-tab-pane>
+          </el-tabs> -->
+      </div>
+    </div>
+    <!-- <div class="quitLPFstrategy"><el-button type="primary" class="quitLPFButton" @click="quitLPFstrategy">退出</el-button></div> -->
+  </div>
+</template>
+<script>
+import echarts from 'echarts';
+import { mapGetters } from 'vuex';
+import { clearSubscribe, LPFTopic} from '@/utils/stomp';
+// import { getToken } from '@/utils/auth';
+import { loadMapDataById } from '@/utils/loaddata';
+export default {
+    name:'BigLPFStrategy',
+    data() {
+        return {
+            group:'',
+            myChart: null,
+            activeName:'first',
+            LPFstrategyList:[],
+            recoimemmandTime:0,
+            bigLPFStrategyId:'bigLPFStrategyId',
+            upStandList:[],
+            downStandList:[],
+            stationNameList:[],
+            LPFstandList:[]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList',
+            'stationStandList',
+            'mapConfig'
+        ])
+    },
+    watch: {
+        '$store.state.socket.LPFstrategy':function(val) {
+            if (val && val.recommendList && val.recommendList.length > 0) {
+                this.LPFstrategyList = [];
+                this.recoimemmandTime = val.duration;
+                val.recommendList.forEach(strategy=>{
+                    const eachStrategy = {};
+                    switch (strategy.type) {
+                    case 'JUMP': {
+                        // {"type":"JUMP","description":"为列车[132056],设置罗汉山-上行站台跳停",
+                        // "effectTrainSet":["004"],"effectTrainNum":1,"scheduleOffset":-50,
+                        // "extraNum":0,"groupNumber":"004","serviceNumber":"13","tripNumber":"2056","standCode":"PF61848"}]}
+                        // const stand = this.$store.getters['map/getDeviceByCode'](strategy.standCode);
+                        // const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                        // eachStrategy.description = '为列车[' + strategy.groupNumber +
+                        // '-' + strategy.serviceNumber + '|' + strategy.tripNumber +
+                        // ']，设置站台' + station.name + '-' + (stand.right ? '右行' : '左行') +
+                        // stand.name + ' (' + stand.code + ') 跳停';
+                        // 为列车[005-02|2057],设置站台秀山-右行-PF42(PF44165)跳停",
+                        eachStrategy.description = strategy.description;
+                        break;
+                    }
+                    // "type":"PARK_TIME",
+                    // "description":"福州火车站-上行站台设置停站时间[85]",
+                    // "effectTrainSet":["012","004","005","009"],"effectTrainNum":4,
+                    // "scheduleOffset":160,"extraNum":2540,"time":85,"standCode":"PF83991"
+                    case 'PARK_TIME': {
+                        // const stand = this.$store.getters['map/getDeviceByCode'](strategy.standCode);
+                        // const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                        eachStrategy.description = strategy.description;
+                        // eachStrategy.description = '为站台[' + station.name + '-' + (stand.right ? '右行' : '左行') +
+                        // stand.name + '(' + stand.code + ')] 设置停站时间，' + strategy.time + '秒';
+                        break;
+                    }
+                    case 'J_P': {
+                        // const stand = this.$store.getters['map/getDeviceByCode'](strategy.standCode);
+                        // const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                        // eachStrategy.description = '为列车[' + strategy.groupNumber +
+                        // '-' + strategy.serviceNumber + '|' + strategy.tripNumber +
+                        // ']，设置站台' + station.name + '-' + (stand.right ? '右行' : '左行') +
+                        // stand.name + ' (' + stand.code + ') 跳停，并且为站台[' + station.name + '-' + (stand.right ? '右行' : '左行') +
+                        // stand.name + '(' + stand.code + ')] 设置停站时间，' + strategy.time + '秒';
+                        eachStrategy.description = strategy.description;
+                    }
+                    }
+                    eachStrategy.effectTrainNum = strategy.effectTrainNum;
+                    eachStrategy.scheduleOffset = strategy.scheduleOffset;
+                    eachStrategy.extraNum = strategy.extraNum;
+                    eachStrategy.effectTrainSet = strategy.effectTrainSet;
+                    this.LPFstrategyList.push(eachStrategy);
+                });
+                this.LPFstandList = [];
+                val.lpfList.forEach(standInfo=>{
+                    const stand = this.$store.getters['map/getDeviceByCode'](standInfo.standCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                    this.LPFstandList.push({name:station.name + '-' + (stand.right ? '右行' : '左行') +
+                        stand.name + '(' + stand.code + ')', wait:standInfo.wait});
+                });
+            }
+        },
+        '$store.state.socket.simulationOver':function(val) {
+            this.quitLPFstrategy();
+        },
+        '$store.state.app.windowSizeCount': function() { // 窗口缩放
+            this.setWindowSize();
+        },
+        '$store.state.map.mapDataLoadedCount': function (val) {
+            const upRight = this.mapConfig.upRight;
+            const stationList = this.stationList.sort((a, b) => {
+                return parseInt(a.kmRange) - parseInt(b.kmRange);
+            });
+            stationList.forEach((station)=>{
+                if (!station.depot) {
+                    this.stationNameList.push(station.name);
+                }
+            });
+            this.stationStandList.forEach((stand)=>{
+                const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                if ((stand.right && upRight) || (!stand.right && !upRight)) {
+                    this.upStandList[station.name] = 0;
+                } else {
+                    this.downStandList[station.name] = 0;
+                }
+            });
+            this.loadInitData();
+            // this.subscribe();
+        },
+        '$store.state.socket.standPfiNum':function(val) {
+            if (val) {
+                // console.log(val, 'standPfiNum');
+                val.forEach(stationNum=>{
+                    const upRight = this.mapConfig.upRight;
+                    const stand = this.$store.getters['map/getDeviceByCode'](stationNum.standCode);
+                    const station = this.$store.getters['map/getDeviceByCode'](stand.stationCode);
+                    if ((stand.right && upRight) || (!stand.right && !upRight)) {
+                        this.upStandList[station.name] = stationNum.num;
+                    } else {
+                        this.downStandList[station.name] = stationNum.num;
+                    }
+                });
+                this.updateData();
+            }
+        }
+    },
+    beforeDestroy() {
+        if (this.group) {
+            this.clearSubscribe();
+            this.$store.dispatch('socket/resetTrainPassagerNum');
+            this.$store.dispatch('socket/setIsFirst', false);
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        loadMapDataById(this.$route.query.mapId, 'parse');
+    },
+    methods:{
+        // async subscribe() {
+        //     this.clearSubscribe();
+        //     const header = { group: this.group || '', 'X-Token': getToken() };
+        //     creatSubscribe(`${LPFTopic}\/${this.$route.query.group}`, header);
+        //     console.log('----------------');
+        // },
+        clearSubscribe() {
+            clearSubscribe(`${LPFTopic}\/${this.group}`);
+        },
+        quitLPFstrategy() {
+            window.close();
+        },
+        updateData() {
+            const result = this.covertData();
+            const upStandNumList = result.upStandNumList;
+            const downStandNumList = result.downStandNumList;
+            const series = [{
+                name: '上行',
+                type: 'bar',
+                data:upStandNumList
+            },
+            {
+                name: '下行',
+                type: 'bar',
+                data:downStandNumList
+            }];
+            this.myChart && this.myChart.setOption({series: series});
+        },
+        covertData() {
+            const upStandNumList = [];
+            const downStandNumList = [];
+            this.stationNameList.forEach(station=>{
+                upStandNumList.push(this.upStandList[station]);
+                downStandNumList.push(this.downStandList[station]);
+            });
+            return {upStandNumList:upStandNumList, downStandNumList:downStandNumList};
+        },
+
+        async loadInitData() {
+            const result = this.covertData();
+            const upStandNumList = result.upStandNumList;
+            const downStandNumList = result.downStandNumList;
+            this.myChart && this.myChart.showLoading();
+            const option = {
+                tooltip: {
+                    trigger: 'axis'
+                },
+                color:['#0029ca', '#33459c'],
+                grid: [
+                    {
+                        right: '80px',
+                        left: '80px',
+                        height: '85%',
+                        top:'40px'
+                    }
+                ],
+                xAxis: [
+                    {
+                        type: 'category',
+                        data: this.stationNameList,
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        }
+                    }
+                ],
+                yAxis: [
+                    {
+                        type: 'value',
+                        splitLine: {
+                            show: false
+                        },
+                        axisTick: {
+                            show: false
+                        },
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        }
+                    }
+                ],
+                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: [
+                    {
+                        name: '上行',
+                        type: 'bar',
+                        data:upStandNumList
+                    },
+                    {
+                        name: '下行',
+                        type: 'bar',
+                        data:downStandNumList
+                    }
+                ]
+            };
+            await this.loadInitChart(option);
+            this.myChart && this.myChart.hideLoading();
+        },
+        loadInitChart(option) {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.myChart = echarts.init(document.getElementById(this.bigLPFStrategyId));
+                    if (this.myChart) {
+                        this.myChart.setOption(option);
+                        this.reSize({ width: this.$store.state.app.width * 0.74, height: this.$store.state.app.height - 40 });
+                    }
+                    resolve(true);
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        setWindowSize() {
+            this.reSize({ width: this.$store.state.app.width * 0.74, height: this.$store.state.app.height - 40 });
+        },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.LPFstrategyList{
+    position: absolute;
+    width: 360px;
+    left: 10px;
+    height: 500px;
+    top: 80px;
+    background: #f1f1f1;
+    border-radius: 6px;
+    z-index: 2;
+}
+.eachLPFstrategy{
+    width: 96%;
+    box-shadow: 0px 5px 5px #ccc;
+    border-top: 1px #dedede solid;
+    margin-top: 10px;
+    padding:10px;
+    background: #fff;
+    font-size: 14px;
+    margin-left: 2%;
+    border-radius: 5px;
+}
+.LPFstrategyTop{
+    background:#fff;
+    height: 40px;
+    border-bottom: 1px #d4d4d4 solid;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left:0;
+}
+.bigLPFStrategyLTitle{
+    padding: 15px 20px 0px 20px;
+    font-size: 15px;
+    background: #fff;
+    height: 40px;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+.LPFstrategyTitle{
+    float: left;
+    width:100%;
+    padding-top: 10px;
+    padding-left: 15px;
+    font-size: 15px;
+    padding-right: 20px;
+}
+.LPFstrategyClose{
+    float: right;
+    margin-right: 5px;
+    padding: 5px;
+    margin-top: 5px;
+}
+#LPFstrategyListOut{
+    height: 100%;
+    overflow: auto;
+    background: #f1f1f1;
+    padding-bottom:20px;
+    border-bottom: 1px #d4d4d4 solid;
+    &::-webkit-scrollbar {
+        width: 5px;
+    }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        background: #c3c3c3;
+    }
+
+    &::-webkit-scrollbar-track {
+        border-radius: 0;
+        background: #f0f0f0;
+
+    }
+}
+.eachLPFstrategyData1{
+    line-height:145%;
+    font-weight:600;
+}
+.eachLPFstrategyData{
+    margin-top:5px;
+}
+.eachLPFstrategySpan{
+    margin-left:50px;
+}
+.bigLPFStrategyL{
+    width: 74%;
+    float: left;
+    height: 100%;
+    padding: 40px 0px 0px 0px;
+    position: relative;
+}
+.bigLPFStrategyR{
+    width: 26%;
+    float: right;
+    border-left: 1px #eee solid;
+    height: 100%;
+    padding: 40px 0px;
+    position: relative;
+    box-shadow: -5px 0px 5px #dedede;
+}
+.bigLPFStrategy{
+    width:100%;
+    height:100%;
+    position: relative;
+}
+.noLPFstrategy{
+    padding:50px 0px;
+    text-align: center;
+}
+.quitLPFstrategy{
+    position: absolute;
+    right: 10px;
+    bottom: 5px;
+}
+.quitLPFButton{
+    height: 30px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+#bigLPFStrategyId{
+    width:100%;
+    height:100%;
+}
+.LPFstrategyTitleL{}
+.LPFstrategyTitleR{
+    // float:right
+}
+.LPFstrategyListIn{height:100%;overflow:hidden;padding-top: 41px;position:relative;}
+</style>
+<style lang="scss">
+#LPFstrategyListOut .LPFstrategyListIn .el-tabs__header.is-top{
+    margin-bottom: 10px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: #fff;
+    width: 100%;
+    border-bottom: 1px #ccc solid;
+}
+#LPFstrategyListOut .LPFstrategyListIn .el-tabs__content{
+    height: 100%;
+    padding-bottom: 10px;
+    overflow: auto;
+    &::-webkit-scrollbar {
+        width: 5px;
+    }
+    &::-webkit-scrollbar-thumb {
+        border-radius: 10px;
+        background: #c3c3c3;
+    }
+
+    &::-webkit-scrollbar-track {
+        border-radius: 0;
+        background: #f0f0f0;
+
+    }
+}
+#LPFstrategyListOut .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{
+    border-bottom-color:#dedede;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/largePassengerView.vue b/src/views/newMap/display/terminals/largePassengerView.vue
new file mode 100644
index 000000000..8281e2a90
--- /dev/null
+++ b/src/views/newMap/display/terminals/largePassengerView.vue
@@ -0,0 +1,130 @@
+<template>
+  <div class="bigLPFView">
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+    <div class="trainExample">
+      <div class="currentFlowDataName">{{ currentFlowDataName }}</div>
+      <div class="trainExampleL">
+        <div class="trainExampleName">车站 颜色图例</div>
+        <div class="eachTrainExample">
+          <span class="smallExample" />
+          <span class="eachTrainExampleName">0 ~ 400</span>
+        </div>
+        <div class="eachTrainExample">
+          <span class="mediumExample" />
+          <span class="eachTrainExampleName">400 ~ 800</span>
+        </div>
+        <div class="eachTrainExample">
+          <span class="bigExample" />
+          <span class="eachTrainExampleName">800及以上</span>
+        </div>
+      </div>
+      <div class="trainExampleR">
+        <div class="trainExampleName">列车 颜色图例</div>
+        <div class="eachTrainExample">
+          <span class="smallExample" />
+          <span class="eachTrainExampleName">0 ~ 400</span>
+        </div>
+        <div class="eachTrainExample">
+          <span class="mediumExample" />
+          <span class="eachTrainExampleName">400 ~ 1000</span>
+        </div>
+        <div class="eachTrainExample">
+          <span class="bigExample" />
+          <span class="eachTrainExampleName">1000及以上</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+export default {
+    name:'LargePassengerView',
+    components: {
+        StationDiagram
+    },
+    data() {
+        return {
+            selected: null,
+            currentFlowDataName:''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    watch: {
+        // 地图数据加载完毕
+        '$store.state.map.mapDataLoadedCount': function () {
+        },
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleDispatchWorkData();
+        }
+    },
+    methods:{
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleDispatchWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+            const list = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.bigLPFView{
+    width:100%;
+    height:100%;
+    position: relative;
+}
+.trainExample{
+    position: absolute;
+    width: 360px;
+    padding: 10px;
+    left: 20px;
+    bottom: 40px;
+    color: #fff;
+    border: 1px #fff solid;
+    border-radius: 5px;
+    background: #000;
+}
+.trainExampleName{margin-bottom: 10px;}
+.eachTrainExample{margin-top: 5px;}
+.smallExample,.mediumExample,.bigExample{
+    width: 50px;
+    height: 20px;
+    display: inline-block;
+}
+.eachTrainExampleName{
+    vertical-align: top;
+    line-height: 23px;
+    margin-left: 8px;
+}
+.smallExample{background: #29a909;}
+.mediumExample{background: #ffa500;}
+.bigExample{background: #F00;}
+.trainExampleL{
+    float: left;
+    display: inline-block;
+    margin-right: 35px;
+    margin-left: 10px;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/localWork.vue b/src/views/newMap/display/terminals/localWork.vue
new file mode 100644
index 000000000..0e3cac8ce
--- /dev/null
+++ b/src/views/newMap/display/terminals/localWork.vue
@@ -0,0 +1,149 @@
+<template>
+  <div>
+    <component :is="menus" :selected="selected" />
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+export default {
+    name: 'LocalWork',
+    components: {
+        StationDiagram
+    },
+    props: {
+        centralizedStationMap:{
+            type: Object,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            menus: null,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        },
+        roleDeviceCode() {
+            return this.$store.state.training.roleDeviceCode;
+        },
+        // 大铁线路
+        datie() {
+            return ['16', '19'].includes(this.$route.query.lineCode);
+        },
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        // 地图数据加载完毕
+        '$store.state.map.mapDataLoadedCount': function () {
+            const lineCode = this.$jlmap.lineCode;
+            if (lineCode) {
+                this.menus = this.$theme.loadLocalWorkMenuComponent(lineCode);
+            }
+        },
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleLocalWorkData();
+        },
+        '$store.state.training.roleDeviceCode': function (val) {
+            const type = this.datie ? 'chainStation' : 'localWork';
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.mapData.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === type);
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                }
+            }
+        }
+    },
+    beforeDestroy() {
+        clearSubscribe(getTopic('ATS_STATUS', this.group));
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleLocalWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            if (this.mapData && this.mapData.pictureList) {
+                let type = this.datie ? 'chainStation' : 'localWork';
+                const station = this.mapDevice[this.roleDeviceCode];
+                if (station && station.depot) {
+                    type = 'chainStation';
+                }
+                const picture = this.mapData.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === type);
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                } else {
+                    this.handlerSwitchStationMode();
+                }
+            } else {
+                this.handlerSwitchStationMode();
+            }
+        },
+        // 新的画面显示逻辑
+        handlerPictureShow(picture) {
+            const list = [];
+            const deviceList = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+                deviceList.push(key);
+            }
+            this.$jlmap.updateShowStation(list);
+            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+            setTimeout(() => {
+                this.$jlmap.updatePicture(deviceList);
+                const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+                if (trainingDetail && trainingDetail.mapLocationJson) { // 客户端切换后如有实训重新定位
+                    const mapLocation = JSON.parse(trainingDetail.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                } else {
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+                this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);
+            }, 10);
+        },
+        // 旧的分集中站显示逻辑
+        handlerSwitchStationMode() {
+            this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+            this.showStation = this.centralizedStationMap[this.roleDeviceCode];
+            const showStation = this.centralizedStationMap[this.roleDeviceCode];
+            const list = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list, showStation);
+            const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+            if (trainingDetail && trainingDetail.mapLocationJson) { // 客户端切换后如有实训重新定位
+                const mapLocation = JSON.parse(trainingDetail.mapLocationJson);
+                this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+            } else {
+                this.$jlmap.setCenter(showStation);
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/pis/components/slideshow.vue b/src/views/newMap/display/terminals/pis/components/slideshow.vue
new file mode 100644
index 000000000..ecc8cd449
--- /dev/null
+++ b/src/views/newMap/display/terminals/pis/components/slideshow.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="wrapper">
+    <div class="slidecontent" :class="{ animation: animation }" :style="`transform: translateX(-${currentIndex}00%)`">
+      <template v-for="(path, idx) in _paths">
+        <img class="img" :src="idx - currentIndex < 3 ? `${prefix}${path}` : ''" :key="`${path}${idx}`" />
+      </template>
+    </div>
+  </div>
+</template>
+
+<script>
+let timer
+export default {
+  name: 'SlideShow',
+  props: {
+    paths: {
+      type: Array,
+      validator: val => Array.isArray(val) && val.every(item => typeof item === 'string'),
+    },
+    prefix: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      currentIndex: 0,
+      animation: true,
+    }
+  },
+  computed: {
+    len() {
+      return this._paths.length
+    },
+    _paths() {
+      return [...this.paths, this.paths[0]]
+    },
+  },
+  mounted() {
+    this.initAnimation()
+    window.addEventListener('visibilitychange', this.visibilityChangeHandler)
+  },
+  methods: {
+    initAnimation() {
+      timer = setInterval(() => {
+        this.animation = true
+        this.currentIndex = this.nextIndex(this.currentIndex)
+        setTimeout(() => {
+          if (this.currentIndex === this.len - 1) {
+            this.animation = false
+            this.currentIndex = this.nextIndex(this.currentIndex)
+          }
+        }, 1000)
+      }, 4000)
+    },
+    pauseAnimation() {
+      clearInterval(timer)
+    },
+    visibilityChangeHandler() {
+      if (document.hidden) this.pauseAnimation()
+      else this.initAnimation()
+    },
+    nextIndex(idx) {
+      return idx < this.len - 1 ? idx + 1 : 0
+    },
+  },
+  beforeDestroy() {
+    timer = null
+    window.removeEventListener('visibilitychange', this.visibilityChangeHandler)
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+  .slidecontent {
+    height: 100%;
+    white-space: nowrap;
+    .img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+.animation {
+  transition: 1s linear all;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/pis/index.vue b/src/views/newMap/display/terminals/pis/index.vue
new file mode 100644
index 000000000..f4c0342c1
--- /dev/null
+++ b/src/views/newMap/display/terminals/pis/index.vue
@@ -0,0 +1,441 @@
+<template>
+  <div class="screen">
+    <div v-if="view === 'stand'" class="station">
+      <div class="datetime">
+        <div class="logo">
+          <img :src="logo" alt="">
+        </div>
+        <div>
+          <span>{{ date }}</span>
+          <span class="time">{{ time }}</span>
+        </div>
+      </div>
+      <div class="traininfo">
+        <div class="currentStation">
+          <div>本站 This Station</div>
+          <div class="text-center bigger">{{ standPisState.stationName }}</div>
+          <div class="text-center">{{ standPisState.stationNameEn }}</div>
+        </div>
+        <div class="devide" />
+        <div class="nextTrain">
+          <div>第一班列车 1st</div>
+          <div v-if="standPisState.secondTrainRemain !== null">
+            <div v-if="standPisState.firstTrainRemain > 0" class="text-center yellow">
+              <span class="bigger">{{ standPisState.firstTrainRemain }} 分钟</span> <span>min</span>
+            </div>
+            <div v-else-if="standPisState.firstTrainRemain > -1" class="text-center yellow">
+              <span class="bigger">即将进站</span>
+            </div>
+            <div v-else class="text-center yellow">
+              <span class="bigger">列车到达</span>
+            </div>
+          </div>
+          <div>开往 {{ standPisState.firstEndStationName }}</div>
+          <div v-if="standPisState.firstEndStationNameEn">TO {{ standPisState.firstEndStationNameEn }}</div>
+        </div>
+        <div class="devide" />
+        <div class="secondTrain">
+          <div>第二班列车 2nd</div>
+          <div v-if="standPisState.secondTrainRemain !== null">
+            <div v-if="standPisState.secondTrainRemain > 0" class="text-center bigger">
+              {{ standPisState.secondTrainRemain }} 分钟 <span>min</span>
+            </div>
+            <div v-else-if="standPisState.secondTrainRemain > -1" class="text-center bigger">即将进站</div>
+            <div v-else class="text-center bigger">列车到达</div>
+          </div>
+          <div>开往 {{ standPisState.secondEndStationName }}</div>
+          <div v-if="standPisState.secondEndStationNameEn">TO {{ standPisState.secondEndStationNameEn }}</div>
+        </div>
+      </div>
+      <div class="media">
+        <div class="mediacontent">
+          <SlideShow
+            :prefix="prefix"
+            :paths="
+              Array(27)
+                .fill()
+                .map((e, i) => `img${i + 1}.jpg`)
+            "
+          />
+        </div>
+        <div class="banner">
+          <div class="text">{{ standPisState.text }}</div>
+          <div class="text">{{ standPisState.text }}</div>
+        </div>
+      </div>
+      <div class="tempratrue">
+        <div class="directionIdentifer">《《</div>
+        <div class="trainpic">
+          <div class="pic" />
+          <div class="textarea">
+            <div v-for="i in 6" :key="i">舒适 Vacant</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="view === 'train'" class="train">
+      <div class="train-pis-content">
+        <div class="left">
+          <div class="logo">
+            <img :src="logo" alt="">
+          </div>
+          <div class="info">
+            <div class="time block">
+              <div>时间 TIME</div>
+              <div>{{ time }}</div>
+            </div>
+            <div class="date block">
+              <div>日期 DATE</div>
+              <div>{{ date }}</div>
+            </div>
+            <div class="next block">
+              <div class="up">
+                <div>{{ !!onboardPisState.parking ? '当前站' : '下一站' }}</div>
+                <div>{{ !!onboardPisState.parking ? 'Current Station' : 'Next Station' }}</div>
+              </div>
+              <div class="down">
+                <div>{{ onboardPisState.stationName }}</div>
+                <div>{{ onboardPisState.stationNameEN }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="right">
+          <div class="dest">
+            <div>
+              开往: {{ onboardPisState.endStationName
+              }}{{ onboardPisState.endStationNameEn ? ' / TO: ' + currentTrain.endStationNameEn : '' }}
+            </div>
+          </div>
+          <div class="media">
+            <SlideShow
+              :prefix="prefix"
+              :paths="
+                Array(27)
+                  .fill()
+                  .map((e, i) => `img${i + 1}.jpg`)
+              "
+            />
+          </div>
+        </div>
+      </div>
+      <div class="banner">
+        <div class="text">{{ onboardPisState.text }}</div>
+        <div class="text">{{ onboardPisState.text }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { creatSubscribe, clearSubscribe, getTopic, displayTopic } from '@/utils/stomp';
+import { timestampFormat } from '@/utils/date';
+import logo from '@/assets/icon/favicon_hhzy.png';
+import SlideShow from './components/slideshow';
+export default {
+    name: 'PIS',
+    components: { SlideShow },
+    data() {
+        return {
+            view: '',
+            date: '',
+            time: '',
+            logo,
+            standPisState: {
+                standCode: '',
+                stationName: '',
+                firstTrainRemain: undefined,
+                firstEndStationName: '',
+                secondTrainRemain: undefined,
+                secondEndStationName: '',
+                text:
+          '党的十八大提出，倡导富强、民主、文明、和谐，倡导自由、平等、公正、法治，倡导爱国、敬业、诚信、友善，积极培育和践行社会主义核心价值观。富强、民主、文明、和谐是国家层面的价值目标，自由、平等、公正、法治是社会层面的价值取向，爱国、敬业、诚信、友善是公民个人层面的价值准则，这24个字是社会主义核心价值观的基本内容。'
+            },
+            onboardPisState: {
+                groupNumber: '',
+                stationName: '',
+                endStationName: '',
+                parking: 0,
+                text: '今日天气：晴，最低气温15℃，最高气温22℃，风向风力：东北风3级，空气质量：良好'
+            },
+            standPisImgUrl: `${this.$store.state.user.ossUrl}/PICTURE/2022-08-01/standPis.png`,
+            onboardPisImgUrl: `${this.$store.state.user.ossUrl}/PICTURE/2022-08-01/onboardPis.png`,
+            prefix: `${this.$store.state.user.ossUrl}/PICTURE/pis/`
+        };
+    },
+    watch: {
+        '$store.state.socket.simulationTimeSync': function(val) {
+            this.time = timestampFormat('HH:mm', val);
+            this.date = timestampFormat('YYYY年MM月DD日', val);
+        },
+        '$store.state.socket.standPisState': function(val) {
+            this.standPisState.stationName = val.stationName;
+            this.standPisState.firstTrainRemain = val.firstTrainRemain;
+            this.standPisState.firstEndStationName = val.firstEndStationName;
+            this.standPisState.secondTrainRemain = val.secondTrainRemain;
+            this.standPisState.secondEndStationName = val.secondEndStationName;
+            if (val.text) this.standPisState.text = val.text;
+        },
+        '$store.state.socket.onboardPisState': function(val) {
+            this.onboardPisState.stationName = val.stationName;
+            this.onboardPisState.endStationName = val.endStationName;
+            this.onboardPisState.parking = val.parking;
+        }
+    },
+    mounted() {
+        this.initPage(this.$route.query);
+    },
+    beforeDestroy() {
+        this.clearPage();
+    },
+
+    methods: {
+        initPage(query) {
+            const { type, group, standCode, groupNumber } = query;
+            this.query = query;
+            if (type === 'PIS_STAND') {
+                this.view = 'stand';
+                creatSubscribe(getTopic(type, group, { standCode }));
+            } else if (type === 'PIS_TRAIN') {
+                this.view = 'train';
+                creatSubscribe(getTopic(type, group, { groupNumber }));
+            }
+            creatSubscribe(`${displayTopic}\/${group}`);
+        },
+        clearPage() {
+            clearSubscribe(
+                getTopic(
+                    this.query.type,
+                    this.query.group,
+                    this.view === 'stand' ? { standCode: this.query.standCode } : { groupNumber: this.query.groupNumber }
+                )
+            );
+            clearSubscribe(`${displayTopic}\/${this.query.group}`);
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.screen {
+  height: 100vh;
+  width: 100vw;
+  font-size: 28px;
+  color: #fff;
+  user-select: none;
+}
+.station {
+  height: 100%;
+  display: grid;
+  gap: 10px;
+  padding: 10px;
+  background: linear-gradient(#009eb5, #00b7d7);
+  grid-template-columns: repeat(4, 1fr);
+  grid-template-rows: repeat(5, 1fr);
+  & > div {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    overflow: visible;
+  }
+  .datetime,
+  .traininfo {
+    border: 1px solid rgb(143, 192, 184);
+    border-radius: 5px;
+    background: #009ab8;
+    box-shadow: 2px 2px 3px 1px #69898f, 0px 0px 5px 0px inset lightgrey;
+  }
+  .datetime {
+    grid-area: 1/1/2/2;
+    flex-direction: column;
+    justify-content: space-evenly;
+    .time {
+      font-size: 1.2em;
+      margin-left: 0.5em;
+    }
+    .logo {
+      & > img {
+        height: 110px;
+      }
+    }
+  }
+  .traininfo {
+    grid-area: 2/1/5/2;
+    flex-direction: column;
+    justify-content: space-evenly;
+    font-size: 24px;
+    & > div {
+      width: 100%;
+      padding: 0 30px;
+      line-height: 1.6em;
+    }
+    .devide {
+      width: 80%;
+      height: 2px;
+      background: rgba($color: #fff, $alpha: 0.7);
+      border-radius: 100%;
+    }
+    .text-center {
+      text-align: center;
+    }
+    .bigger {
+      font-size: 1.5em;
+    }
+    .yellow {
+      color: #cff055;
+    }
+    .nextTrain {
+      font-size: 1.1em;
+    }
+  }
+  .media {
+    grid-area: 1/2/5/5;
+    flex-direction: column;
+    justify-content: space-between;
+    .mediacontent {
+      width: 100%;
+      height: calc(85% - 10px);
+      background: linear-gradient(#cff055, #009eb5);
+      background-position: center;
+      background-size: cover;
+    }
+    .banner {
+      width: 100%;
+      height: 15%;
+      border: 1px solid rgb(143, 192, 184);
+      border-radius: 5px;
+      background: #009ab8;
+      box-shadow: 2px 2px 3px 1px #69898f, 0px 0px 5px 0px inset lightgrey;
+      overflow: hidden;
+      padding: 10px;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      .text {
+        white-space: nowrap;
+        font-size: 60px;
+        animation: 40s linear infinite scroll;
+        color: #cff055;
+      }
+    }
+  }
+  .tempratrue {
+    grid-area: 5/1/6/5;
+    justify-content: space-evenly;
+    .directionIdentifer {
+      font-size: 72px;
+    }
+    .trainpic {
+      width: 80%;
+      .pic {
+        height: 120px;
+        background-image: url('~@/assets/pis/train.png');
+        background-size: cover;
+        background-position: center;
+      }
+      .textarea {
+        display: flex;
+        justify-content: space-evenly;
+      }
+    }
+  }
+}
+.train {
+  height: 100%;
+  background: linear-gradient(90deg, #44537b, #445567, #44537b);
+  .train-pis-content {
+    height: 88%;
+    padding: 15px;
+    display: flex;
+    .left,
+    .right {
+      height: 100%;
+    }
+    .left {
+      width: 30%;
+      background: linear-gradient(90deg, #3e4e69, #586baa, #3e4e69);
+      padding: 20px;
+      .logo {
+        height: 12%;
+        display: flex;
+        justify-content: center;
+        & > img {
+          height: 100%;
+          transform: translateY(-10px);
+        }
+      }
+      .info {
+        height: 88%;
+        background-color: #7076b0;
+        border-radius: 15px;
+        padding: 8px;
+        overflow: visible;
+        display: flex;
+        flex-direction: column;
+        font-size: 2rem;
+        font-weight: bold;
+        .time {
+          height: 25%;
+        }
+        .date {
+          height: 25%;
+          margin: 8px 0;
+        }
+        .next {
+          height: 50%;
+        }
+        .block {
+          background: linear-gradient(90deg, #445397, #7b7cc2, #445397);
+          border-radius: 7px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: space-evenly;
+          .up,
+          .down {
+            text-align: center;
+          }
+        }
+      }
+    }
+    .right {
+      width: 70%;
+      .dest {
+        height: 15%;
+        display: flex;
+        align-items: center;
+        padding: 20px;
+        font-size: 40px;
+      }
+      .media {
+        height: 85%;
+        background: linear-gradient(#7b7cc2, #cff055);
+        background-position: center;
+        background-size: cover;
+      }
+    }
+  }
+  .banner {
+    height: 12%;
+    overflow: hidden;
+    padding: 10px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .text {
+      white-space: nowrap;
+      font-size: 60px;
+      animation: 40s linear infinite scroll;
+      color: #cff055;
+    }
+  }
+}
+@keyframes scroll {
+  from {
+    transform: translateX(0);
+  }
+  to {
+    transform: translateX(-100%);
+  }
+}
+</style>
diff --git a/src/views/newMap/display/terminals/psl.vue b/src/views/newMap/display/terminals/psl.vue
new file mode 100644
index 000000000..2a19261ec
--- /dev/null
+++ b/src/views/newMap/display/terminals/psl.vue
@@ -0,0 +1,210 @@
+<template>
+  <div style="background: #939FAC;width: 100%;height: 100%">
+    <div style="width: 50%;position: relative;left: 25%;">
+      <div class="psl-title">
+        <div>PSL</div>
+        <el-select v-model="standCode" style="margin-left: 10px;">
+          <el-option
+            v-for="item in standList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </div>
+      <div class="psl-content">
+        <div class="content-row">
+          <div class="cell btn">
+            <div class="btn-text">所有滑动门/应急门关闭且锁紧指示灯</div>
+            <img :src="getIcon('top', indicators.qbgmLight ? 'on' : 'off')">
+          </div>
+        </div>
+        <div class="content-row">
+          <div class="cell">
+            <div class="btn-text">PSL操作指示灯</div>
+            <img :src="getIcon('red', indicators.pslczLight ? 'on' : 'off')">
+          </div>
+          <div class="cell">
+            <div class="btn-text">互锁解除指示灯</div>
+            <img :src="getIcon('red', indicators.hsjcLight ? 'on' : 'off')">
+          </div>
+        </div>
+        <div class="content-row">
+          <div class="cell">
+            <div class="btn-text">开门状态指示灯</div>
+            <img :src="getIcon('red', indicators.kmLight ? 'on' : 'off')">
+          </div>
+          <div class="cell">
+            <div class="btn-text">关门状态指示灯</div>
+            <img :src="getIcon('green', indicators.gmLight ? 'on' : 'off')">
+          </div>
+        </div>
+        <div class="content-row">
+          <div class="cell btn">
+            <div class="btn-text">禁止</div>
+            <img
+              :src="getIcon('key')"
+              :class="['key', { 'key-on': indicators.yxjzKey }]"
+              @click="btnClickHandler('YXJZ')"
+            >
+            <div class="btn-text-opt">允许</div>
+          </div>
+          <div class="cell btn">
+            <div class="btn-text">禁止</div>
+            <img
+              :src="getIcon('key')"
+              :class="['key', { 'key-on': indicators.hsjcKey }]"
+              @click="btnClickHandler('HSJC')"
+            >
+            <div class="btn-text-opt">互锁解除</div>
+          </div>
+        </div>
+        <div class="content-row">
+          <div class="cell btn">
+            <div class="btn-text">开门按钮</div>
+            <img :src="getIcon('red', 'btn')" @click="btnClickHandler('KM')">
+          </div>
+          <div class="cell btn">
+            <div class="btn-text">关门按钮</div>
+            <img :src="getIcon('green', 'btn')" @click="btnClickHandler('GM')">
+          </div>
+        </div>
+        <div class="content-row">
+          <div class="cell btn">
+            <div class="btn-text">试灯按钮</div>
+            <img
+              class="btn-sd btn-img"
+              :src="getIcon('green', 'btn')"
+              @mousedown.left="btnClickHandler('SD')"
+              @mouseup.left="btnClickHandler('SD')"
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import icons from '@/assets/psl_images/psl_icons';
+import { getPslStatus, pressPslButton } from '@/api/simulation';
+import {mapGetters} from 'vuex';
+export default {
+    name: 'PSL',
+    data() {
+        return {
+            indicators: {
+                qbgmLight: true,
+                pslczLight: false,
+                hsjcLight: false,
+                kmLight: false,
+                gmLight: false,
+                yxjzKey: false,
+                hsjcKey: false
+            },
+            standCode: '',
+            standList: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.socket.simulationPslStatus': function(val) {
+            if (val && val[this.standCode]) {
+                Object.assign(this.indicators, val[this.standCode]);
+            }
+        }
+    },
+    mounted() {
+        const stationCode = this.$store.state.training.roleDeviceCode;
+        this.standCode = '';
+        this.standList = [];
+        this.stationStandList.forEach(stand => {
+            if (stand.stationCode === stationCode) {
+                let dir = '';
+                if (this.$store.state.map.mapConfig.upRight) {
+                    dir = stand.right ? '上行' : '下行';
+                } else {
+                    dir = stand.right ? '下行' : '上行';
+                }
+                this.standList.push({ code: stand.code, name: dir + '-' + stand.name });
+            }
+        });
+        this.standCode = this.standList[0].code;
+        this.initData(this.group, this.standCode);
+    },
+    methods: {
+        initData(group, standCode) {
+            getPslStatus(group, standCode)
+                .then(resp => {
+                    if (resp.data) {
+                        this.indicators = resp.data;
+                    }
+                })
+                .catch(err => {});
+        },
+
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        getIcon(type, status) {
+            return status !== undefined ? icons[`${type}_${status}`] : icons[type];
+        },
+        btnClickHandler(btnType) {
+            pressPslButton(this.group, this.standCode, btnType);
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+	.psl-title {
+		display: flex;
+		justify-content: center;
+		color: #fff;
+		font-size: 50px;
+		padding: 50px;
+		align-items: center;
+	}
+	.btn-text {
+		color: #fff;
+	}
+	.psl-content {
+		.content-row {
+			display: flex;
+			justify-content: space-evenly;
+			.cell {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				width: 120px;
+				height: 100px;
+				.key {
+					transition: 0.1s;
+				}
+				.key-on {
+					transform: rotate(90deg);
+				}
+				.btn-text-opt {
+					position: absolute;
+					left: 80%;
+					top: 35%;
+					width: 100%;
+					color: #fff;
+				}
+			}
+		.btn {
+			cursor: pointer;
+		}
+		}
+	}
+</style>
diff --git a/src/views/newMap/display/terminals/realCctv.vue b/src/views/newMap/display/terminals/realCctv.vue
new file mode 100644
index 000000000..422416e43
--- /dev/null
+++ b/src/views/newMap/display/terminals/realCctv.vue
@@ -0,0 +1,159 @@
+<template>
+  <div class="jl3dpassflow">
+    <div id="jlReal3d" class="jlReal3d">
+      <div class="realCctv1">
+        <video id="myvideo0" class="video-js">
+          <source :src="`${host}/hls/cctv1.m3u8`" type="application/x-mpegURL">
+        </video>
+      </div>
+      <div class="realCctv2">
+        <video id="myvideo1" class="video-js">
+          <source :src="`${host}/hls/cctv2.m3u8`" type="application/x-mpegURL">
+        </video>
+      </div>
+    </div>
+    <!-- <div class="menudown">
+      <el-button-group>
+        <el-button type="primary" @click="back">退出</el-button>
+      </el-button-group>
+    </div> -->
+  </div>
+</template>
+<script>
+import Video from 'video.js';
+import 'video.js/dist/video-js.css';
+import { getSessionStorage } from '@/utils/auth';
+export default {
+    name:'RealCCTV',
+    data() {
+        return {
+            videoList:[]
+        };
+    },
+    computed: {
+        host() {
+            const project = getSessionStorage('project');
+            const RealCctvMap = {
+                richorjoint: 'http://192.168.1.254',
+                richorhhcj: 'http://192.168.0.254'
+            };
+            return RealCctvMap[project];
+        }
+    },
+    mounted() {
+        for (var i = 0; i < 2; i++) {
+            const videoPlay = new Video('myvideo' + i, {
+                controls: false,
+                autoplay: 'muted',
+                loop: false,
+                preload: 'auto',
+                width: window.innerWidth / 2 + 'px',
+                height: window.innerHeight + 'px',
+                hls: {
+                    withCredentials: true
+                }
+            }, function () {
+                console.log('videojs播放器初始化成功');
+                const video = this;
+                var lastTime = -1;
+                this.on('loadeddata', function() {
+                    console.log('loadeddata');
+                });
+                this.on('seeked', function() {
+                    // 已经拿到视频流,可以播放
+                    console.log('seeked');
+                    // var currentTime = video.currentTime();
+                    // if (currentTime != lastTime) {
+                    //     video.currentTime(currentTime + 10000);
+                    //     video.play();
+                    // }
+                });
+                this.on('error', function() {
+                    console.log('error');
+                    if (video.error().code == '') {
+                        const src = video.getMedia().src[0].src;
+                        video.reset();
+                        video.src(src);
+                        video.load();
+                        video.play();
+                        var currentTime = video.currentTime();
+                        lastTime = currentTime;
+                    }
+                });
+                this.on('loadedmetadata', function() {
+                    console.log('loadedmetadata');
+                    // 加载到元数据后开始播放视频
+                    // startVideo();
+                    video.autoplay(true);
+
+                    // var tryTimes = 0;
+                    let isVideoBreak = null;
+                    clearInterval(isVideoBreak);
+                    isVideoBreak = setInterval(function() {
+                        // debugger;
+                        var currentTime = video.currentTime();
+                        console.log('currentTime' + currentTime + 'lastTime' + lastTime);
+                        if (currentTime == lastTime) {
+                            video.currentTime(currentTime + 10000);
+                            video.play();
+                            // video.src({
+                            //     src:that.videosrc
+                            // });
+                            // // 尝试5次播放后，如仍未播放成功提示刷新
+                            // if (++tryTimes > 5) {
+                            //     alert('您的网速有点慢，刷新下试试');
+                            //     tryTimes = 0;
+                            // }
+                        } else {
+                            lastTime = currentTime;
+                            // tryTimes = 0;
+                        }
+                    }, 3000);
+                });
+                this.on('play', function() {
+                    console.log('play');
+                });
+            });
+            this.videoList.push(videoPlay);
+        }
+    },
+    methods:{
+    }
+};
+</script>
+<style>
+.jl3dpassflow{
+    width: 100%;
+    height: 100%;
+}
+.jlReal3d{
+	width: 100%;
+    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;
+}
+  .menudown{
+    bottom:0;
+    right:0;
+    position:absolute;
+    z-index: 2;
+}
+.video-js video{
+    outline: none !important;
+}
+</style>
+
diff --git a/src/views/newMap/display/terminals/registerBook.vue b/src/views/newMap/display/terminals/registerBook.vue
new file mode 100644
index 000000000..e7916f83f
--- /dev/null
+++ b/src/views/newMap/display/terminals/registerBook.vue
@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <div style="padding: 20px;font-size: 20px;text-align: center;">簿册</div>
+    <div style="text-align: right;">
+      <el-button size="small" style="margin-right: 20px;margin-bottom: 10px;" type="primary" @click="add">新增</el-button>
+    </div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+    >
+      <el-table-column prop="date" label="月 日" width="95">
+        <template slot-scope="scope">
+          <el-input v-if="dataIndex === scope.$index" v-model="scope.row.moonDay" />
+          <span v-else>{{ scope.row.moonDay }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="time" label="时 分" width="95">
+        <template slot-scope="scope">
+          <el-input v-if="dataIndex === scope.$index" v-model="scope.row.hourMinute" />
+          <span v-else>{{ scope.row.hourMinute }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkResult" label="检查试验结果，所发现的不良及破损程度" width="280">
+        <template slot-scope="scope">
+          <el-input v-if="dataIndex === scope.$index" v-model="scope.row.result" />
+          <span v-else>{{ scope.row.result }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="通 知 时 间">
+        <el-table-column prop="noticeDate" label="月 日" width="100">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.noticeTime.moonDay" />
+            <span v-else>{{ scope.row.noticeTime.moonDay }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="noticeTime" label="时 分" width="100">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.noticeTime.hourMinute" />
+            <span v-else>{{ scope.row.noticeTime.hourMinute }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="noticeWay" label="通知到达的方式" width="130">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.noticeTime.info" />
+            <span v-else>{{ scope.row.noticeTime.info }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="到 达 时 间">
+        <el-table-column prop="arriveDate" label="月 日" width="100">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.arriveTime.moonDay" />
+            <span v-else>{{ scope.row.arriveTime.moonDay }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="arriveTime" label="时 分" width="100">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.arriveTime.hourMinute" />
+            <span v-else>{{ scope.row.arriveTime.hourMinute }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="arriveSeal" label="该段的工作人员到达后盖章" width="200">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.arriveTime.info" />
+            <span v-else>{{ scope.row.arriveTime.info }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="销除不良及破损的时分及盖章">
+        <el-table-column prop="repairDate" label="月 日" width="100">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.endTime.moonDay" />
+            <span v-else>{{ scope.row.endTime.moonDay }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="repairTime" label="时 分" width="100">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.endTime.hourMinute" />
+            <span v-else>{{ scope.row.endTime.hourMinute }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="repairReason" label="破损及不良的原因，采用何种办法进行修理的。工作人员及车站值班员盖章。">
+          <template slot-scope="scope">
+            <el-input v-if="dataIndex === scope.$index" v-model="scope.row.endTime.info" />
+            <span v-else>{{ scope.row.endTime.info }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="" width="60">
+        <template slot-scope="scope">
+          <el-button v-if="dataIndex === scope.$index" type="text" size="small" @click="saveData(scope.row, scope.$index)">保存</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+export default {
+    name: 'Index',
+    data() {
+        return {
+            tableData: [],
+            dataIndex: null,
+            value: ''
+        };
+    },
+    mounted() {
+        this.queryData();
+    },
+    methods: {
+        doClose() {
+            this.dataIndex = null;
+        },
+        doShow() {
+            this.queryData();
+        },
+        queryData() {
+            const params = { stationCode: this.$store.state.training.roleDeviceCode};
+            commitOperate(menuOperate.Rail.railQueryRegister, params, 3).then(({valid, operate, response})=>{
+                this.tableData = response.data ? response.data.lines : [];
+                this.dataIndex = null;
+            }).catch(()=>{
+                this.$message.error('查询簿册失败！');
+            });
+        },
+        saveData(data) {
+            const params = { stationCode: this.$store.state.training.roleDeviceCode, line: data };
+            commitOperate(menuOperate.Rail.railFillInRegister, params, 3).then(({valid, operate})=>{
+                this.queryData();
+            }).catch(()=>{
+                this.$message.error('保存簿册失败！');
+            });
+        },
+        add() {
+            const data = {
+                moonDay: '',
+                hourMinute: '',
+                result: '',
+                noticeTime: {
+                    moonDay: '',
+                    hourMinute: '',
+                    info: ''
+                },
+                arriveTime: {
+                    moonDay: '',
+                    hourMinute: '',
+                    info: ''
+                },
+                endTime: {
+                    moonDay: '',
+                    hourMinute: '',
+                    info: ''
+                }
+            };
+            this.dataIndex = this.tableData.length || 0;
+            this.tableData.push(data);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/schedulWork.vue b/src/views/newMap/display/terminals/schedulWork.vue
new file mode 100644
index 000000000..760c4a875
--- /dev/null
+++ b/src/views/newMap/display/terminals/schedulWork.vue
@@ -0,0 +1,320 @@
+<template>
+  <div class="scheduling" style="padding: 10px;">
+    <el-card class="scheduling_header">
+      <el-form>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item :label="$t('display.schedule.scheduleSelect')">
+              <el-date-picker
+                v-model="formModel.planDate"
+                clearable
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions"
+                @change="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('display.schedule.runDiagramName')">
+              <el-input v-model="formModel.runPlanName" size="small" style="width:140px;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="text-align: right">
+              <el-button-group>
+                <el-button size="small" type="primary" @click="handleSave">{{ $t('display.schedule.save') }}</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <div class="scheduling_body">
+      <div class="scheduling_body-table">
+        <edit-table ref="table" v-loading="loading" border stripe :table-data="tableData" :table-form="tableForm" :row-style="handleRowStyle" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { querySechedulingNew, generateSchedulingNew, saveSchedulingNew } from '@/api/scheduling';
+import { hexColor } from '@/jmapNew/theme/parser/util';
+import EditTable from '@/views/components/editTable/index';
+export default {
+    name: 'SchedulWork',
+    components: {
+        EditTable
+    },
+    data() {
+        return {
+            loading: false,
+            runPlanList: [],
+            groupNumberList: [],
+            pickerOptions: {
+                disabledDate(time) {
+                    return time.getTime() < Date.now() - 24 * 3600 * 1000;
+                }
+            },
+            formModel: {
+                id: '',
+                mode: '',
+                planDate: '',
+                runPlanName: ''
+            },
+            tableForm: {
+                index: true,
+                columns: [
+                    // {
+                    //     title: this.$t('display.schedule.driverNumber'),
+                    //     prop: 'driverCode',
+                    //     type: 'text'
+                    // },
+                    {
+                        title: this.$t('display.schedule.trainNumber'),
+                        prop: 'groupNumber',
+                        type: 'select',
+                        width: '150',
+                        options: () => { return this.groupNumberList; },
+                        editable: true,
+                        editing: true
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineSection'),
+                        prop: 'outDepotTrip.outDepotSectionCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotSectionCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineServerNumber'),
+                        prop: 'outDepotTrip.serviceNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.serviceNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTargetNumber'),
+                        prop: 'outDepotTrip.destinationCode',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.destinationCode; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTime'),
+                        prop: 'outDepotTrip.outDepotTime',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.outDepotTime; }
+                    },
+                    {
+                        title: this.$t('display.schedule.onlineTripNumber'),
+                        prop: 'outDepotTrip.tripNumber',
+                        type: 'text',
+                        format: (row) => { return row.outDepotTrip.tripNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.outDepot'),
+                        prop: 'outDepotTrip.outDepotCode',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.outDepotTrip.outDepotCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.outDepotStatus'),
+                        prop: 'outDepotTrip.status',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.outDepotTrip.status, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.outDepotTrip.status) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineSection'),
+                        prop: 'offlineSection',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotSectionCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineServerNumber'),
+                        prop: 'offlineServerNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.serviceNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTargetNumber'),
+                        prop: 'offlineTargetNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.destinationCode; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTime'),
+                        prop: 'offlineTime',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.inDepotTime; }
+                    },
+                    {
+                        title: this.$t('display.schedule.offlineTripNumber'),
+                        prop: 'offlineTripNumber',
+                        type: 'text',
+                        format: (row) => { return row.inDepotTrip.tripNumber; }
+                    },
+                    {
+                        title: this.$t('display.schedule.inDepot'),
+                        prop: 'inDepot',
+                        type: 'text',
+                        format: (row) => { return this.handleDeviceName(row.inDepotTrip.inDepotCode); }
+                    },
+                    {
+                        title: this.$t('display.schedule.inDepotStatus'),
+                        prop: 'inStatus',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.inDepotTrip.status, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.inDepotTrip.status) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    }
+                ]
+            },
+            tableData: []
+        };
+    },
+    computed: {
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        '$store.state.map.mapDataLoadedCount': function () {
+            const trainList = this.$store.state.map.map.trainList || [];
+            this.groupNumberList = [];
+            trainList.forEach(item => {
+                this.groupNumberList.push({value: item.code, label: item.groupNumber});
+            });
+        }
+    },
+    methods: {
+        handleQuery(day) {
+            if (day) {
+                this.loading = true;
+                querySechedulingNew(this.group, {day}).then(resp => {
+                    if (!resp.data) {
+                        this.$confirm(this.$t('display.schedule.noSchedulePlan'), this.$t('global.tips'), {
+                            confirmButtonText: this.$t('global.confirm'),
+                            cancelButtonText: this.$t('global.cancel'),
+                            type: 'warning'
+                        }).then(() => {
+                            this.handleGenerate(day);
+                        }).catch(() => {
+                            this.clearData();
+                            this.loading = false;
+                        });
+                    } else {
+                        this.tableData = this.initTableData(resp.data.planList || []);
+                        this.formModel.id = resp.data.id;
+                        this.formModel.planDate = resp.data.planDate;
+                        this.formModel.runPlanName = resp.data.runPlanName;
+                        this.$message.success(`${this.$t('display.schedule.loadData')} ${day} ${this.$t('display.schedule.schedulePlanSuccess')}`);
+                        this.loading = false;
+                    }
+                }).catch(error => {
+                    this.clearData();
+                    this.$messageBox(`${error.message}`);
+                    this.loading = false;
+                });
+            }
+        },
+        handleGenerate(day) {
+            generateSchedulingNew(this.group, {day}).then(resp => {
+                this.loading = false;
+                this.tableData = this.initTableData(resp.data.planList || []);
+                this.formModel.id = resp.data.id;
+                // this.formModel.planDate = resp.data.planDate;
+                this.formModel.runPlanName = resp.data.runPlanName;
+                this.$message.success(this.$t('display.schedule.createSchedulePlanSuccess'));
+            }).catch(error => {
+                this.loading = false;
+                this.clearData();
+                this.$messageBox(`${error.message}`);
+            });
+        },
+        handleSave() {
+            if (this.formModel.planDate) {
+                saveSchedulingNew(this.group, this.tableData).then(resp => {
+                    if (resp.data && !resp.data.pass) {
+                        this.setConflictList(resp.data.conflictList);
+                        this.$message.warning(this.$t('display.schedule.checkFailed'));
+                    } else {
+                        this.setConflictList([]);
+                        this.$message.success(this.$t('display.schedule.saveSchedulePlanSuccess'));
+                    }
+                }).catch(() => {
+                    this.$messageBox(this.$t('display.schedule.saveSchedulePlanFail'));
+                });
+            } else {
+                this.$messageBox(this.$t('display.schedule.selectSchedulePlan'));
+            }
+
+        },
+        handleRowStyle({row, rowIndex}) {
+            return row['$conflict'] ? {background: row.$conflict} : {background: '#FFF'};
+        },
+        setConflictList(list) {
+            this.tableData.forEach(elem => { elem['$conflict'] = null; });
+            if (list && list.length) {
+                list.forEach(idList => {
+                    const color = hexColor.colorRandom();
+                    this.tableData.forEach(elem => {
+                        if (idList.includes(parseInt(elem.id))) {
+                            elem['$conflict'] = color;
+                        }
+                    });
+                });
+            }
+            this.tableData = [...this.tableData];
+        },
+        initTableData(tableData) {
+            tableData.forEach(elem => {
+                this.$set(elem, '$conflict', null);
+            });
+
+            return tableData;
+        },
+        clearData() {
+            this.formModel.planDate = '';
+            this.tableData = [];
+        },
+        handleDeviceName(code) {
+            const device = this.$store.getters['map/getDeviceByCode'](code) || {};
+            return device.name;
+        }
+    }
+};
+</script>
+
+<style scoped rel="stylesheet/scss" lang="scss">
+.scheduling {
+	&_header {
+		background: #fff;
+		padding: 30px 30px 0;
+	}
+	&_body {
+		margin-top: 30px;
+		background: #ffff;
+		border: 1px solid #F1F1F1;
+		width: 100%;
+		overflow: auto;
+	}
+}
+
+/deep/ .el-dialog__body {
+	background: #fafafa;
+}
+
+/deep/ label {
+	font-weight: 0;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/terminalMenu.vue b/src/views/newMap/display/terminals/terminalMenu.vue
new file mode 100644
index 000000000..a310bf23b
--- /dev/null
+++ b/src/views/newMap/display/terminals/terminalMenu.vue
@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <div v-if="isShow && terminalList.length" class="terminalList">
+      <div v-for="(eachTerminal,index) in terminalList" :key="index" :class="picture==eachTerminal.code?'eachTerminal active':'eachTerminal'" @click="eachTerminal.click(eachTerminal.code)">{{ eachTerminal.name }}</div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+    name:'TerminalList',
+    props: {
+        picture: {
+            type: String,
+            default() {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            isFirst: true,
+            terminalList:[],
+            centralizedStationList: [],
+            centralizedStationMap: {},
+            commonTerminal: [
+                {
+                    name: this.$route.query.simType === 'RAILWAY' ? '联锁操作终端' : '现地工作站',
+                    code: 'localWork',
+                    roleList: ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
+                        'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING'],
+                    isShow: () => true,
+                    click: this.changePictureShow
+                },
+                {
+                    name: '行调工作站',
+                    code: 'dispatchWork',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.lineCode !== '14',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '行调台',
+                    code: 'dispatcherManage',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '车务终端',
+                    code: 'trafficTerminal',
+                    roleList: ['STATION_SUPERVISOR'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '车务管理终端',
+                    code: 'trafficManageTerminal',
+                    roleList: ['STATION_SUPERVISOR'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '调度计划',
+                    code: 'schedulingPlan',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '调度命令',
+                    code: 'dispatchingCommand',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '路票',
+                    code: 'trainTicket',
+                    roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
+                        'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'DRIVER'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '簿册',
+                    code: 'registerBook',
+                    roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER',
+                        'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'DRIVER'],
+                    isShow: () => this.$route.query.simType === 'RAILWAY',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '运行图加载',
+                    code: 'diagramLoad',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '运行图预览',
+                    code: 'diagramPreview',
+                    roleList: ['DISPATCHER', 'STATION_SUPERVISOR', 'DRIVER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '运行图编制',
+                    code: 'diagramEdit',
+                    roleList: [],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '派班工作站',
+                    code: 'scheduleWork',
+                    roleList: ['DEPOT_DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: 'cctv视图',
+                    code: 'cctvView',
+                    roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: 'ISCS',
+                    code: 'iscsView',
+                    roleList: ['DISPATCHER', 'STATION_SUPERVISOR'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '大屏',
+                    code: 'bigScreen',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '司机视角',
+                    code: 'drivingPlan',
+                    roleList: ['DRIVER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: 'IBP盘',
+                    code: 'ibp',
+                    roleList: ['STATION_SUPERVISOR'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '数字沙盘',
+                    code: 'digitalStand',
+                    roleList: ['STATION_SUPERVISOR', 'DISPATCHER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '大客流策略',
+                    code: 'largePassengerStrategy',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.itemMap && this.itemMap.LPF,
+                    click: this.changePictureShow
+                },
+                {
+                    name: '大客流视图',
+                    code: 'largePassengerView',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.itemMap && this.itemMap.LPF,
+                    click: this.changePictureShow
+                },
+                {
+                    name: 'PSL',
+                    code: 'psl',
+                    roleList: ['STATION_SUPERVISOR'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: 'BaSiDi',
+                    code: 'baSiDi',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.lineCode === '14' && this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '轨道总览',
+                    code: 'troWork',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.lineCode === '14' && this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '轨道详览',
+                    code: 'troDetailWork',
+                    roleList: ['DISPATCHER'],
+                    isShow: () => this.$route.query.lineCode === '14' && this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                },
+                {
+                    name: '通号端',
+                    code: 'maintainerSelect',
+                    roleList: ['MAINTAINER'],
+                    isShow: () => this.$route.query.simType === 'METRO',
+                    click: this.changePictureShow
+                }
+            ],
+            itemMap: {}
+        };
+    },
+    computed:{
+        // 设备数据不显示
+        isShow() {
+            return !this.$route.query.projectDevice;
+        },
+        // 线路类型
+        lineCode() {
+            return this.$route.query.lineCode;
+        },
+        simType() {
+            return this.$route.query.simType;
+        },
+        roles() {
+            return this.$store.state.training.roles;
+        }
+    },
+    watch: {
+        '$store.state.training.roles': function (val) {
+            this.initTerminalList();
+            const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+            if (this.isFirst && this.$route.query.client) {
+                this.isFirst = false;
+            } else {
+                if (trainingDetail && trainingDetail.client) {
+                    this.changePictureShow(trainingDetail.client);
+                } else {
+                    this.initPictureShow();
+                    this.isFirst = false;
+                }
+            }
+        },
+        '$store.state.training.memberList': function (val) {
+            if (!this.$store.state.training.roles && !this.$route.query.singleClient) {
+                this.changePictureShow('dispatchWork');
+            }
+        },
+        '$store.state.socket.simulationWorkParam': function (val) {
+            if (val) {
+                this.itemMap = val.itemMap || {};
+                this.initTerminalList();
+            }
+        }
+    },
+    mounted() {
+        this.initTerminalList();
+    },
+    methods:{
+        initTerminalList() {
+            this.terminalList = [];
+            this.commonTerminal.forEach(item => {
+                if (item.roleList.includes(this.roles) && item.isShow()) {
+                    this.terminalList.push(item);
+                }
+            });
+        },
+        noEvent(code) {
+            this.$emit('pictureChange', code);
+        },
+        initPictureShow() {
+            const localWorkRoleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN',
+                'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', 'TRAIN_MASTER', 'DEPOT_DISPATCHER'];
+            if (localWorkRoleList.includes(this.roles)) {
+                this.changePictureShow('localWork');
+            } else if (this.roles === 'DISPATCHER') {
+                if (this.$route.query.lineCode === '14') {
+                    this.changePictureShow('baSiDi');
+                    this.$store.dispatch('app/animationsClose');
+                } else if (this.$route.query.simType === 'RAILWAY') {
+                    this.changePictureShow('dispatcherManage');
+                } else {
+                    this.changePictureShow('dispatchWork');
+                }
+            } else if (this.roles === 'MAINTAINER') {
+                // 通号
+                this.changePictureShow('maintainerSelect');
+            } else if (this.roles === 'DRIVER') {
+                // 司机模拟
+                this.changePictureShow('drivingPlan');
+            }
+        },
+        changePictureShow(code) {
+            this.$emit('loadingChange');
+            setTimeout(() => {
+                this.$emit('pictureChange', code);
+            }, 100);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.terminalList{
+    position: absolute;
+    right: 0;
+    top: 45%;
+    width: 111px;
+    padding: 1px;
+    background: #fff;
+    border-radius: 5px 0 0 5px;
+	z-index: 2000;
+}
+.eachTerminal{
+    padding: 8px 0;
+    text-align: center;
+    border-bottom: 1px #dedede solid;
+    font-size: 14px;
+    cursor: pointer;
+    background: #f5f7fa;
+}
+.eachTerminal.active{
+    color:#409eff;
+    background: #ffff;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/trafficTerminalWork.vue b/src/views/newMap/display/terminals/trafficTerminalWork.vue
new file mode 100644
index 000000000..74b716050
--- /dev/null
+++ b/src/views/newMap/display/terminals/trafficTerminalWork.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <component :is="menus" :selected="selected" />
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+export default {
+    name: 'CtcWork',
+    components: {
+        StationDiagram
+    },
+    props: {
+        centralizedStationMap:{
+            type: Object,
+            default() {
+                return {};
+            }
+        }
+    },
+    data() {
+        return {
+            menus: null,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        },
+        roleDeviceCode() {
+            return this.$store.state.training.roleDeviceCode;
+        },
+        group() {
+            return this.$route.query.group;
+        }
+    },
+    watch: {
+        // 地图数据加载完毕
+        '$store.state.map.mapDataLoadedCount': function () {
+            const lineCode = this.$jlmap.lineCode;
+            if (lineCode) {
+                this.menus = this.$theme.loadCtcWorkMenuComponent(lineCode);
+            }
+        },
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleTrafficTerminalWorkData();
+        }
+    },
+    beforeDestroy() {
+        clearSubscribe(getTopic('ATS_STATUS', this.group));
+        clearSubscribe(getTopic('CTC', this.group));
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleTrafficTerminalWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.mapData.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(this.roleDeviceCode) && picture.type === 'chainStation');
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                } else {
+                    this.handlerSwitchStationMode();
+                }
+            } else {
+                this.handlerSwitchStationMode();
+            }
+        },
+        // 新的画面显示逻辑
+        handlerPictureShow(picture) {
+            const list = [];
+            const deviceList = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+                deviceList.push(key);
+            }
+            this.$jlmap.updateShowStation(list);
+            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+            this.$jlmap.updatePicture(deviceList);
+            this.$jlmap.updateTransform(picture.scaling, picture.origin);
+            this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);
+        },
+        // 旧的分集中站显示逻辑
+        handlerSwitchStationMode() {
+            this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+            this.showStation = this.centralizedStationMap[this.roleDeviceCode];
+            const showStation = this.centralizedStationMap[this.roleDeviceCode];
+            const list = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+            }
+            this.$jlmap.updateShowStation(list, showStation);
+            this.$jlmap.setCenter(showStation);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/trainTicket/greenLicence.vue b/src/views/newMap/display/terminals/trainTicket/greenLicence.vue
new file mode 100644
index 000000000..cda2ba62c
--- /dev/null
+++ b/src/views/newMap/display/terminals/trainTicket/greenLicence.vue
@@ -0,0 +1,91 @@
+<template>
+  <div style="border: 1px solid #000000;margin: 0 auto;padding: 20px;background: #9df59b;width: 580px;">
+    <div style="text-align: center;font-size: 28px;">许&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;可&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;证</div>
+    <div style="font-size: 14px;margin-top: 15px;display: flex;align-items: center;margin-bottom: 20px;justify-content: end;">
+      <div>第</div>
+      <el-input v-model="greenLicenseForm.number" size="small" :disabled="switchFlag" style="width: 80px;" />
+      <div style="margin-right: 20px;">号</div>
+    </div>
+    <div style="font-size: 16px;margin-top: 20px;">
+      <span style="margin-left: 36px;">在</span>
+      <el-radio-group v-model="greenLicenseForm.reason" :disabled="switchFlag" style="display: inline;">
+        <el-radio label="出站（进路）信号机故障">出站（进路）信号机故障</el-radio>
+        <el-radio label="未设出站信号机" style="margin-left: 5px;">未设出站信号机</el-radio>
+        <el-radio label="列车头部越过出站（进路）信号机" style="margin-left: 5px;">列车头部越过出站（进路）信号机</el-radio>
+      </el-radio-group>
+      <span>的情况下，准许第</span>
+      <el-input v-model="greenLicenseForm.tripNumber" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>次列车由</span>
+      <el-input v-model="greenLicenseForm.line" style="display: inline;" :disabled="switchFlag" size="small" class="inline-input" />
+      <span>线上发车。</span>
+    </div>
+    <div style="font-size: 16px;margin-top: 60px;display: flex;align-items: center;justify-content: end;">
+      <div><span style="color: #f00;">{{ greenLicenseForm.stationSeal }}</span>（站名印）车站值班员（签名）</div>
+      <el-input v-model="greenLicenseForm.signature" :disabled="switchFlag" size="small" style="width: 80px;" />
+    </div>
+    <div style="font-size: 16px;margin-top: 15px;display: flex;align-items: center;margin-bottom: 10px;justify-content: end;">
+      <el-input v-model="greenLicenseForm.year" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div>年</div>
+      <el-input v-model="greenLicenseForm.moon" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div>月</div>
+      <el-input v-model="greenLicenseForm.day" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div>日填发</div>
+    </div>
+    <div v-if="switchFlag" style="text-align: center;">
+      <el-select v-model="memberId" size="small" style="width: 200px" placeholder="请选择">
+        <el-option
+          v-for="item in giveMemberList"
+          :key="item.id"
+          :label="item.labelName"
+          :disabled="item.userId == userId"
+          :value="item.id"
+        />
+      </el-select>
+      <el-button size="small" style="margin-left: 10px;" type="primary" @click="giveTicket">给予</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'GreenLicence',
+    props: {
+        greenLicenseForm:{
+            type: Object,
+            required: true
+        },
+        switchFlag:{
+            type: Boolean,
+            required: true
+        },
+        giveMemberList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            memberId: ''
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
+    },
+    methods: {
+        giveTicket() {
+            if (this.memberId) {
+                this.$emit('giveTicket', { ticketId: this.greenLicenseForm.id, memberId: this.memberId });
+                this.memberId = '';
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/trainTicket/index.vue b/src/views/newMap/display/terminals/trainTicket/index.vue
new file mode 100644
index 000000000..33b5ad960
--- /dev/null
+++ b/src/views/newMap/display/terminals/trainTicket/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <div style="padding: 20px;">
+    <div style="padding: 20px;font-size: 20px;text-align: center;">路票</div>
+    <div style="display: flex;align-items: center;margin-bottom: 10px;">
+      <div>附件类型：</div>
+      <el-select v-model="attachmentType" size="small" placeholder="请选择" @change="attachmentTypeChange">
+        <el-option
+          v-for="item in typeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </div>
+    <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tab-pane v-if="userRole === 'STATION_SUPERVISOR'" label="路票填写" name="first">
+        <rail-ticket v-if="attachmentType === 'RAIL_TICKET'" :switch-flag="false" :ticket-form="ticketForm" :station-list="stationList" />
+        <green-licence v-else-if="attachmentType === 'GREEN_LICENCE'" :switch-flag="false" :green-license-form="greenLicenseForm" />
+        <red-licence v-else-if="attachmentType === 'RED_LICENCE'" :switch-flag="false" :red-license-form="redLicenseForm" />
+        <div style="text-align: center;">
+          <el-button size="small" style="margin-top: 10px;" type="primary" @click="submit">提交</el-button>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="路票查询" name="second">
+        <div v-if="attachmentType === 'RAIL_TICKET'" style="height: 450px;overflow-y: auto;">
+          <template v-for="(item, index) in railTicketList">
+            <rail-ticket :key="index" :switch-flag="true" :ticket-form="item" :station-list="stationList" :give-member-list="giveMemberList" @giveTicket="giveTicket" />
+          </template>
+        </div>
+        <div v-else-if="attachmentType === 'GREEN_LICENCE'" style="height: 450px;overflow-y: auto;">
+          <template v-for="(item, index) in greenLicenseList">
+            <green-licence :key="index" :switch-flag="true" :green-license-form="item" :give-member-list="giveMemberList" @giveTicket="giveTicket" />
+          </template>
+        </div>
+        <div v-else-if="attachmentType === 'RED_LICENCE'" style="height: 450px;overflow-y: auto;">
+          <template v-for="(item, index) in redLicenseList">
+            <red-licence :key="index" :switch-flag="true" :red-license-form="item" :give-member-list="giveMemberList" @giveTicket="giveTicket" />
+          </template>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+import RailTicket from './trainTicket';
+import GreenLicence from './greenLicence';
+import RedLicence from './redLicence';
+import { EventBus } from '@/scripts/event-bus';
+export default {
+    name: 'Index',
+    components: {
+        RailTicket,
+        GreenLicence,
+        RedLicence
+    },
+    data() {
+        return {
+            attachmentType: 'RAIL_TICKET',
+            railTicketList: [],
+            greenLicenseList: [],
+            redLicenseList: [],
+            giveMemberList: [],
+            activeName: 'first',
+            ticketForm: {
+                number: '',
+                tripNumber: '',
+                station: '',
+                nextStation: '',
+                stationSeal: '',
+                no: '',
+                deputy: false
+            },
+            greenLicenseForm: {
+                number: '',
+                reason: '',
+                tripNumber: '',
+                line: '',
+                stationSeal: '',
+                signature: '',
+                year: '',
+                moon: '',
+                day: ''
+            },
+            redLicenseForm: {
+                number: '',
+                licenseReceived: true,
+                licenseTripNumber: '',
+                licenseStation: '',
+                licenseNextStation: '',
+                licenseHour: '',
+                licenseMinute: '',
+                licenseTripNumber2: '',
+                noticeTripNumber: '',
+                noticeHour1: '',
+                noticeMinute1: '',
+                noticeTripNumber1: '',
+                noticeHour2: '',
+                noticeMinute2: '',
+                noticeTripNumber2: '',
+                stationSeal: '',
+                signature: '',
+                year: '',
+                moon: '',
+                day: ''
+            },
+            typeList: [
+                {label: '路票', value: 'RAIL_TICKET'},
+                {label: '绿色许可证', value: 'GREEN_LICENCE'},
+                {label: '红色许可证', value: 'RED_LICENCE'}
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ]),
+        userRole() {
+            return this.$store.state.training.userRole;
+        },
+        roleDeviceCode() {
+            return this.$store.state.training.roleDeviceCode;
+        }
+    },
+    watch: {
+        '$store.state.training.roleDeviceCode': function (val) {
+            const station = this.$store.getters['map/getDeviceByCode'](val);
+            if (station) {
+                this.ticketForm.station = station.name;
+                this.ticketForm.stationSeal = station.name;
+                this.greenLicenseForm.stationSeal = station.name;
+                this.redLicenseForm.stationSeal = station.name;
+            }
+        }
+    },
+    mounted() {
+        EventBus.$on('trainTicketMember', (memberList) => {
+            this.giveMemberList = memberList;
+        });
+        const station = this.$store.getters['map/getDeviceByCode'](this.roleDeviceCode);
+
+        if (station) {
+            this.ticketForm.station = station.name;
+            this.ticketForm.stationSeal = station.name;
+            this.greenLicenseForm.stationSeal = station.name;
+            this.redLicenseForm.stationSeal = station.name;
+        }
+        if (this.userRole !== 'STATION_SUPERVISOR') {
+            this.activeName = 'second';
+            this.query();
+        }
+    },
+    methods: {
+        handleClick() {
+            if (this.activeName === 'second') {
+                this.query();
+            }
+        },
+        attachmentTypeChange() {
+            if (this.activeName === 'second') {
+                this.query();
+            }
+        },
+        clearData() {
+            const station = this.$store.getters['map/getDeviceByCode'](this.roleDeviceCode) || {};
+            this.ticketForm = {number: '', tripNumber: '', station: station.name, nextStation: '', stationSeal: station.name, no: '', deputy: false};
+            this.greenLicenseForm = {number: '', reason: '', tripNumber: '', line: '', stationSeal: station.name, signature: '', year: '', moon: '', day: '' };
+            this.redLicenseForm = {number: '', licenseReceived: true, licenseTripNumber: '', licenseStation: '', licenseNextStation: '', licenseHour: '',
+                licenseMinute: '', licenseTripNumber2: '', noticeTripNumber: '', noticeHour1: '', noticeMinute1: '', noticeTripNumber1: '', noticeHour2: '',
+                noticeMinute2: '', noticeTripNumber2: '', stationSeal: station.name, signature: '', year: '', moon: '', day: ''};
+        },
+        query() {
+            const params = { type: this.attachmentType };
+            commitOperate(menuOperate.Rail.railQueryTicket, params, 3).then(({valid, response, operate}) => {
+                if (valid) {
+                    if (this.attachmentType === 'RAIL_TICKET') {
+                        this.railTicketList = response.data || [];
+                    } else if (this.attachmentType === 'GREEN_LICENCE') {
+                        this.greenLicenseList = response.data || [];
+                    } else if (this.attachmentType === 'RED_LICENCE') {
+                        this.redLicenseList = response.data || [];
+                    }
+                }
+            }).catch(()=> {
+                this.$message.error('查询路票失败！');
+            });
+        },
+        submit() {
+            let commitFlag = true;
+            const params = { ticket: { type: this.attachmentType }, stationCode: this.roleDeviceCode };
+            if (this.attachmentType === 'RAIL_TICKET') {
+                if (!this.ticketForm.number || !this.ticketForm.tripNumber || !this.ticketForm.nextStation || !this.ticketForm.no) {
+                    commitFlag = false;
+                } else {
+                    params.ticket = Object.assign(params.ticket, this.ticketForm);
+                }
+            } else if (this.attachmentType === 'GREEN_LICENCE') {
+                if (!this.greenLicenseForm.number || !this.greenLicenseForm.reason || !this.greenLicenseForm.tripNumber || !this.greenLicenseForm.line ||
+					!this.greenLicenseForm.signature || !this.greenLicenseForm.year || !this.greenLicenseForm.moon || !this.greenLicenseForm) {
+                    commitFlag = false;
+                } else {
+                    params.ticket = Object.assign(params.ticket, this.greenLicenseForm);
+                }
+            } else if (this.attachmentType === 'RED_LICENCE') {
+                if (!this.redLicenseForm.number || !this.redLicenseForm.licenseTripNumber || !this.redLicenseForm.licenseStation || !this.redLicenseForm.licenseNextStation ||
+					!this.redLicenseForm.licenseHour || !this.redLicenseForm.licenseMinute || !this.redLicenseForm.licenseTripNumber2 || !this.redLicenseForm.noticeTripNumber ||
+					!this.redLicenseForm.noticeHour1 || !this.redLicenseForm.noticeMinute1 || !this.redLicenseForm.noticeTripNumber2 || !this.redLicenseForm.signature ||
+					!this.redLicenseForm.year || !this.redLicenseForm.moon || !this.redLicenseForm.day) {
+                    commitFlag = false;
+                } else {
+                    params.ticket = Object.assign(params.ticket, this.redLicenseForm);
+                }
+            }
+            if (commitFlag) {
+                commitOperate(menuOperate.Rail.railFillInTicket, params, 3).then(({valid, operate})=>{
+                    this.clearData();
+                    this.$message.success('提交路票成功！');
+                }).catch(()=>{
+                    this.$message.error('提交路票失败！');
+                });
+            } else {
+                this.$message.error('信息填写不完整，请检查！');
+            }
+
+        },
+        giveTicket(params) {
+            commitOperate(menuOperate.Rail.railGiveTicketTo, params, 3).then(({valid, operate}) => {
+                this.$message.success('给予路票成功！');
+                this.query();
+            }).catch(()=> {
+                this.$message.error('给予路票失败！');
+            });
+        }
+    }
+};
+</script>
+
+<style scoped>
+/deep/.inline-input .el-input__inner{
+	width: 80px;
+}
+/deep/.station-input .el-input__inner{
+	width: 200px;
+	height: 50px;
+	line-height: 50px;
+	font-size: 40px;
+}
+/deep/.el-radio__label{
+	font-size: 16px;
+}
+/deep/.el-radio{
+	margin-right: 0;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/trainTicket/redLicence.vue b/src/views/newMap/display/terminals/trainTicket/redLicence.vue
new file mode 100644
index 000000000..ad54260d7
--- /dev/null
+++ b/src/views/newMap/display/terminals/trainTicket/redLicence.vue
@@ -0,0 +1,119 @@
+<template>
+  <div style="border: 1px solid #000000;margin: 0 auto;padding: 20px;background: #e799d8;width: 580px;">
+    <div style="text-align: center;font-size: 28px;">许&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;可&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;证</div>
+    <div style="font-size: 14px;margin-top: 15px;display: flex;align-items: center;margin-bottom: 20px;justify-content: end;">
+      <div>第</div>
+      <el-input v-model="redLicenseForm.number" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div style="margin-right: 20px;">号</div>
+    </div>
+    <div style="font-size: 16px;margin-top: 10px;text-indent:36px;">
+      <span>现在一切电话中断，准许第</span>
+      <el-input v-model="redLicenseForm.licenseTripNumber" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>次列车自</span>
+      <el-input v-model="redLicenseForm.licenseStation" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>站至</span>
+      <el-input v-model="redLicenseForm.licenseNextStation" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>站，本列车前于</span>
+      <el-input v-model="redLicenseForm.licenseHour" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>时</span>
+      <el-input v-model="redLicenseForm.licenseMinute" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>分发出的第</span>
+      <el-input v-model="redLicenseForm.licenseTripNumber2" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>次列车，邻站到达通知</span>
+      <el-radio-group v-model="redLicenseForm.licenseReceived" :disabled="switchFlag" style="display: inline;">
+        <el-radio :label="true">已</el-radio>
+        <el-radio :label="false" style="margin-left: 5px;">未</el-radio>
+      </el-radio-group>
+      <span>收到</span>
+    </div>
+    <div style="text-align: center;font-size: 28px;margin-top: 10px;">通&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;知&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;书</div>
+    <div style="font-size: 16px;margin-top: 10px;text-indent: 36px;">
+      <span>1.第</span>
+      <el-input v-model="redLicenseForm.noticeTripNumber" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>次列车到达你站后，准接你站发出的列车。</span>
+    </div>
+    <div style="font-size: 16px;margin-top: 10px;text-indent: 36px;">
+      <span>2.于</span>
+      <el-input v-model="redLicenseForm.noticeHour1" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>时</span>
+      <el-input v-model="redLicenseForm.noticeMinute1" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>分发出第</span>
+      <el-input v-model="redLicenseForm.noticeTripNumber1" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>次列车，并于</span>
+      <el-input v-model="redLicenseForm.noticeHour2" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>时</span>
+      <el-input v-model="redLicenseForm.noticeMinute2" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>分再发出第</span>
+      <el-input v-model="redLicenseForm.noticeTripNumber2" :disabled="switchFlag" style="display: inline;" size="small" class="inline-input" />
+      <span>次列车。</span>
+    </div>
+    <div style="font-size: 16px;margin-top: 60px;display: flex;align-items: center;justify-content: end;">
+      <div><span style="color: #f00;">{{ redLicenseForm.stationSeal }}</span>（站名印）车站值班员（签名）</div>
+      <el-input v-model="redLicenseForm.signature" :disabled="switchFlag" size="small" style="width: 80px;" />
+    </div>
+    <div style="font-size: 16px;margin-top: 15px;display: flex;align-items: center;margin-bottom: 10px;justify-content: end;">
+      <el-input v-model="redLicenseForm.year" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div>年</div>
+      <el-input v-model="redLicenseForm.moon" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div>月</div>
+      <el-input v-model="redLicenseForm.day" :disabled="switchFlag" size="small" style="width: 80px;" />
+      <div>日填发</div>
+    </div>
+    <div v-if="switchFlag" style="text-align: center;">
+      <el-select v-model="memberId" size="small" style="width: 200px" placeholder="请选择">
+        <el-option
+          v-for="item in giveMemberList"
+          :key="item.id"
+          :label="item.labelName"
+          :disabled="item.userId == userId"
+          :value="item.id"
+        />
+      </el-select>
+      <el-button size="small" style="margin-left: 10px;" type="primary" @click="giveTicket">给予</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'RedLicence',
+    props: {
+        redLicenseForm:{
+            type: Object,
+            required: true
+        },
+        switchFlag:{
+            type: Boolean,
+            required: true
+        },
+        giveMemberList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            memberId: ''
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
+    },
+    methods: {
+        giveTicket() {
+            if (this.memberId) {
+                this.$emit('giveTicket', { ticketId: this.redLicenseForm.id, memberId: this.memberId });
+                this.memberId = '';
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/trainTicket/trainTicket.vue b/src/views/newMap/display/terminals/trainTicket/trainTicket.vue
new file mode 100644
index 000000000..03bb33bd4
--- /dev/null
+++ b/src/views/newMap/display/terminals/trainTicket/trainTicket.vue
@@ -0,0 +1,95 @@
+<template>
+  <div style="border: 1px solid #000000;margin: 0 auto;padding: 20px;width: 580px;">
+    <div style="text-align: center;font-size: 28px;">路&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;票</div>
+    <div style="display: flex;justify-content: center;align-items: center;font-size: 18px;margin-top: 10px;">
+      <div>电话记录&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;第</div>
+      <el-input v-model="ticketForm.number" :disabled="switchFlag" size="mini" style="width: 80px;" />
+      <div>号</div>
+    </div>
+    <div style="display: flex;justify-content: center;align-items: center;font-size: 18px;margin-top: 10px;">
+      <div style="margin-left: 80px;">车&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</div>
+      <el-input v-model="ticketForm.tripNumber" :disabled="switchFlag" size="mini" style="width: 80px;" />
+    </div>
+    <div style="display: flex; justify-content: center;font-size: 40px;font-weight: bolder;margin-top: 25px;align-items: center;">
+      <div>{{ ticketForm.station }}</div>
+      <svg-icon icon-class="arrow" style="width: 100px" />
+      <div>
+        <el-select v-model="ticketForm.nextStation" size="small" :disabled="switchFlag" class="station-input" placeholder="请选择">
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.name"
+          />
+        </el-select>
+      </div>
+    </div>
+    <div style="display: flex; justify-content: space-between;font-size: 18px;margin-top: 25px;margin-bottom: 25px;align-items: center;">
+      <div style="margin-left: 50px;"><span style="color: #f00">{{ ticketForm.stationSeal }}</span>（站名印）</div>
+      <div>
+        <span>编号</span>
+        <el-input v-model="ticketForm.no" size="small" :disabled="switchFlag" style="width: 80px;" />
+      </div>
+    </div>
+    <div v-if="switchFlag" style="text-align: center;">
+      <el-select v-model="memberId" size="small" style="width: 200px" placeholder="请选择">
+        <el-option
+          v-for="item in giveMemberList"
+          :key="item.id"
+          :label="item.labelName"
+          :disabled="item.userId == userId"
+          :value="item.id"
+        />
+      </el-select>
+      <el-button size="small" style="margin-left: 10px;" type="primary" @click="giveTicket">给予</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'TrainTicket',
+    props: {
+        ticketForm:{
+            type: Object,
+            required: true
+        },
+        switchFlag:{
+            type: Boolean,
+            required: true
+        },
+        stationList: {
+            type: Array,
+            required: true
+        },
+        giveMemberList: {
+            type: Array,
+            default() {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            memberId: ''
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user ? this.$store.state.user.id : '';
+        }
+    },
+    methods: {
+        giveTicket() {
+            if (this.memberId) {
+                this.$emit('giveTicket', { ticketId: this.ticketForm.id, memberId: this.memberId });
+                this.memberId = '';
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/terminals/troDetailWork.vue b/src/views/newMap/display/terminals/troDetailWork.vue
new file mode 100644
index 000000000..b3e533f50
--- /dev/null
+++ b/src/views/newMap/display/terminals/troDetailWork.vue
@@ -0,0 +1,170 @@
+<template>
+  <div style="text-align: center;">
+    <component :is="menus" :selected="selected" />
+    <station-diagram ref="stationDiagram" @setSelected="setSelected" />
+    <div class="button-box">
+      <div class="arrow-button" :style="{backgroundImage: 'url(' + buttonLeft + ')' }" @click="changeStation(-1)" />
+      <div class="arrow-button" :style="{backgroundImage: 'url(' + buttonDbup + ')' }" @click="goTroDialog" />
+      <div class="arrow-button" :style="{backgroundImage: 'url(' + buttonRight + ')' }" @click="changeStation(1)" />
+    </div>
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+import ButtonDbupIcon from '@/assets/baSiDi/dbup.png';
+import ButtonRightIcon from '@/assets/baSiDi/right.png';
+import ButtonLeftIcon from '@/assets/baSiDi/left.png';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+export default {
+    name: 'TroDetailWork',
+    components: {
+        StationDiagram
+    },
+    props: {
+        showStationCode: {
+            type: String,
+            default: () => {
+                return '';
+            }
+        }
+    },
+    data() {
+        return {
+            menus: null,
+            selected: null,
+            buttonDbup: ButtonDbupIcon,
+            buttonRight: ButtonRightIcon,
+            buttonLeft: ButtonLeftIcon
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList',
+            'stationList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    watch: {
+        '$store.state.map.mapDataLoadedCount': function () {
+            const lineCode = this.$jlmap.lineCode;
+            if (lineCode) {
+                this.menus = this.$theme.loadDispatchWorkMenuComponent(lineCode);
+            }
+        },
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleDispatchWorkData();
+            this.$jlmap && this.$jlmap.setCenterOffset(this.deviceCode || this.showStationCode, { x: 200, y:0 });
+        }
+    },
+    beforeDestroy() {
+        clearSubscribe(getTopic('ATS_STATUS', this.group));
+    },
+    methods: {
+        setSelected(val) {
+            this.selected = val;
+        },
+        handleDispatchWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            this.$jlmap.off('pan');
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.mapData.pictureList.find(picture => picture.type === 'dispatchWork');
+                if (picture) {
+                    this.handlerPictureShow(picture);
+                } else {
+                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                    const list = [];
+                    for (const key in this.mapDevice) {
+                        list.push(this.mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list);
+                    this.initLocation();
+                }
+            } else {
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                const list = [];
+                for (const key in this.mapDevice) {
+                    list.push(this.mapDevice[key]);
+                }
+                this.$jlmap.updateShowStation(list);
+                this.initLocation();
+            }
+        },
+        goTroDialog() {
+            this.$emit('pictureChange', 'troWork');
+        },
+        initLocation() {
+            const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+            if (trainingDetail && trainingDetail.mapLocationJson) { // 客户端切换后如有实训重新定位
+                const mapLocation = JSON.parse(trainingDetail.mapLocationJson);
+                this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+            }
+        },
+        // 新的画面显示逻辑
+        handlerPictureShow(picture) {
+            const list = [];
+            const deviceList = [];
+            for (const key in this.mapDevice) {
+                list.push(this.mapDevice[key]);
+                deviceList.push(key);
+            }
+            this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
+            setTimeout(() => {
+                this.$jlmap.updatePicture(deviceList);
+                const trainingDetail = this.$store.state.trainingNew.trainingDetail;
+                if (trainingDetail && trainingDetail.mapLocationJson) { // 客户端切换后如有实训重新定位
+                    const mapLocation = JSON.parse(trainingDetail.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                } else {
+                    this.$jlmap.updateTransform(picture.scaling, picture.origin);
+                }
+            }, 10);
+        },
+        changeStation(value) {
+            this.deviceCode = this.deviceCode || this.showStationCode || this.stationList[0].code;
+            const device = this.$store.getters['map/getDeviceByCode'](this.deviceCode);
+            const stationSn = device.sn + value;
+            const station = this.stationList.find((item) => {
+                return item.sn === stationSn;
+            });
+            if (station && station.depot) {
+                this.changeStation(value * 2);
+            } else if (station) {
+                this.deviceCode = station.code;
+                this.$jlmap && this.$jlmap.setCenterOffset(this.deviceCode, { x: 200, y:0 });
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+.arrow-button{
+	width: 45px;
+	height: 30px;
+	cursor: pointer;
+	background-size: 45px 30px;
+	background-repeat: no-repeat;
+}
+.button-box{
+	width: 150px;
+	height: 35px;
+	display: flex;
+	position: absolute;
+	bottom: 60px;
+	left: calc(50% - 75px);
+	z-index: 9999;
+	justify-content: space-between;
+	justify-items: center;
+}
+</style>
diff --git a/src/views/newMap/display/terminals/troWork.vue b/src/views/newMap/display/terminals/troWork.vue
new file mode 100644
index 000000000..5cd72c5dc
--- /dev/null
+++ b/src/views/newMap/display/terminals/troWork.vue
@@ -0,0 +1,85 @@
+<template>
+  <div>
+    <station-diagram ref="stationDiagram" />
+  </div>
+</template>
+
+<script>
+import StationDiagram from '../stationDiagram/index';
+import {mapGetters} from 'vuex';
+import { clearSubscribe, getTopic} from '@/utils/stomp';
+export default {
+    name: 'TroWork',
+    components: {
+        StationDiagram
+    },
+    data() {
+        return {
+            deviceCode: ''
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'sectionList',
+            'signalList',
+            'trainWindowList'
+        ]),
+        mapData() {
+            return this.$store.state.map.map;
+        },
+        mapDevice() {
+            return this.$store.state.map.mapDevice;
+        }
+    },
+    watch: {
+        '$store.state.map.initJlmapLoadedCount': function (val) {
+            this.handleDispatchWorkData();
+        }
+    },
+    beforeDestroy() {
+        this.updateJlmapMode('02');
+        clearSubscribe(getTopic('ATS_STATUS', this.group));
+    },
+    methods: {
+        handleDispatchWorkData() {
+            const logicData = {routeData:this.$store.state.map.routeData, autoReentryData: this.$store.state.map.autoReentryData};
+            const repaint = this.$store.state.map.initJlmapLoadedCount === 1;
+            this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint);
+            if (this.mapData && this.mapData.pictureList) {
+                const picture = this.mapData.pictureList.find(picture => picture.type === 'dispatchWork');
+                if (picture) {
+                    this.handlerPictureShow(picture);
+
+                } else {
+                    this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                    const list = [];
+                    for (const key in this.mapDevice) {
+                        list.push(this.mapDevice[key]);
+                    }
+                    this.$jlmap.updateShowStation(list);
+                }
+            } else {
+                this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]);
+                const list = [];
+                for (const key in this.mapDevice) {
+                    list.push(this.mapDevice[key]);
+                }
+                this.$jlmap.updateShowStation(list);
+            }
+            this.updateJlmapMode('05');
+        },
+        updateJlmapMode(mode) {
+            const list = [];
+            const mapDevice = this.$store.state.map.mapDevice;
+            for (const key in mapDevice) {
+                list.push(mapDevice[key]);
+            }
+            this.$jlmap && this.$jlmap.updateShowMode(list, mode);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/theoryExam.vue b/src/views/newMap/display/theoryExam.vue
new file mode 100644
index 000000000..f68205b09
--- /dev/null
+++ b/src/views/newMap/display/theoryExam.vue
@@ -0,0 +1,618 @@
+<template>
+  <el-dialog :visible.sync="dialogVisible" :close-on-click-modal="false" class="theoryExam" fullscreen style="background:#eeeeee" :before-close="close">
+    <div v-if="!isResult" v-loading="loading" class="theoryExamBody">
+      <div class="theoryExamBodyL">
+        <div class="theoryExamQuestion">
+          <div class="QuestionName">{{ covert() }}</div>
+          <div class="choiceList">
+            <div v-if="judgeQuestionType('radio',questionList[currentQuestionNum])">
+              <el-radio
+                v-for="(choice,index) in questionList[currentQuestionNum].optionList "
+                :key="index"
+                v-model="currentRadioAnswer"
+                :label="choice.id"
+                class="eachChoice"
+                @change="changeAnswer"
+              >{{ choiceTypeList[index]+'、 '+choice.content }}</el-radio>
+            </div>
+            <div v-else-if="judgeQuestionType('multi',questionList[currentQuestionNum])">
+              <el-checkbox-group v-model="currentSelectAnswer" @change="changeAnswer">
+                <el-checkbox
+                  v-for="(choice,index) in questionList[currentQuestionNum].optionList "
+                  :key="index"
+                  :label="choice.id"
+                  class="eachChoice"
+                >{{ choiceTypeList[index]+'、 '+choice.content }}</el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </div>
+          <div v-if="!isTest&&isSelect" class="correctAnswer" :style="answerIsCorrect?'color: #67C23A;':'color: #ff4d4f;'">
+            <span class="practiceIconTips" :class="answerIsCorrect?'el-icon-success':'el-icon-error'" />
+            <span class="practicecorrectAnswer">{{ '答案：'+correctAnswer }}</span>
+          </div>
+        </div>
+        <div class="buttonList" :style="!isTest?'bottom: 15px;':''">
+          <el-button v-if="!isTest" :disabled="isSelect" type="success" class="commitQuestion" size="small" @click="commitQuestion">确 认</el-button>
+          <div class="prevAndNext">
+            <el-button-group>
+              <el-button type="primary" size="small" :disabled="currentQuestionNum==0" @click="prevQuestion"><span class="el-icon-arrow-left" style="margin-right:5px;" />上一题</el-button>
+              <el-button type="primary" size="small" :disabled="checkNextButton()" @click="nextQuestion">下一题<span class="el-icon-arrow-right" style="margin-left:5px;" /></el-button>
+            </el-button-group>
+          </div>
+          <el-button v-if="isTest" type="success" class="commitExam" size="small" @click="commitExam">交卷</el-button>
+        </div>
+        <div v-if="isTest" class="examTips">距离测试结束还有 {{ currentTime }}</div>
+      </div>
+      <div class="theoryExamBodyR">
+        <div v-if="mode=='test'" class="theoryExamBodyRT">
+          <span class="noAnswer">未作答</span>
+          <span class="hasAnswer">已作答</span>
+          <!-- <span class="hasSign">标记</span> -->
+        </div>
+        <div class="theoryExamQuestionList">
+          <!-- :class="item.answerOptionId.length>0?'hasSelect':''" -->
+          <div v-for="(item,index) in questionList" :id="'eachQuestionNum'+index" :key="index" class="eachQuestionNum" @click="changeQuestion(index+1)">
+            {{ (index+1) }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-else class="theoryExamBody">
+      <div v-if="theoryExamWrongList.length>0" class="theoryExamWrongList">
+        <div class="theoryExamScore">{{ '测验得分：' }}<span class="resultScoreStyle">{{ resultScore+' 分' }}</span></div>
+        <div class="theoryExamWrongListName">错题列表</div>
+        <div class="theoryExamWrongListL">
+          <div class="QuestionName">{{ covertWrong() }}</div>
+          <div class="choiceList">
+            <div v-if="judgeQuestionType('radio',theoryExamWrongList[wrongQuestionNum].question)">
+              <el-radio
+                v-for="(choice,index) in theoryExamWrongList[wrongQuestionNum].question.optionList "
+                :key="index"
+                v-model="currentRadioAnswer"
+                :label="choice.id"
+                :disabled="true"
+                class="eachChoice"
+              >{{ choiceTypeList[index]+'、 '+choice.content }}</el-radio>
+            </div>
+            <div v-else-if="judgeQuestionType('multi',theoryExamWrongList[wrongQuestionNum].question)">
+              <el-checkbox-group v-model="currentSelectAnswer">
+                <el-checkbox
+                  v-for="(choice,index) in theoryExamWrongList[wrongQuestionNum].question.optionList"
+                  :key="index"
+                  :label="choice.id"
+                  :disabled="true"
+                  class="eachChoice"
+                >{{ choiceTypeList[index]+'、 '+choice.content }}</el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </div>
+          <div class="correctAnswer" style="color: #ff4d4f;">
+            <span class="practicecorrectAnswer">{{ '答案：'+wrongCorrectAnswer() }}</span>
+          </div>
+        </div>
+        <div class="theoryExamWrongListR">
+          <div class="theoryExamWrongQuestionList">
+            <div v-for="(wrongQuestion,index) in theoryExamWrongList" :key="index" class="eachQuestionNum" :class="wrongQuestionNum==index?'active':''" @click="changeWrongQuestion(index)">
+              {{ index+1 }}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div v-else>
+        <div class="el-icon-success theoryExamEnd" />
+        <div class="theoryExamScore1">{{ '测验得分：' }}<span class="resultScoreStyle">{{ resultScore+' 分' }}</span></div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import {getItemListByProjectCode, updatePracticeQuestionProgress, getPracticeQuestionProgress, submitPracticeQuestionData} from '@/api/competition';
+export default {
+    name:'TheoryExam',
+    data() {
+        return {
+            loading:false,
+            dialogVisible:false,
+            mode:'',
+            currentTime:'00:30:00',
+            allTime:30 * 60,
+            questionList:[],
+            inter:null,
+            currentQuestionNum:0,
+            wrongQuestionNum:0,
+            currentSelectAnswer:[],
+            currentRadioAnswer:'',
+            answerIsCorrect:false,
+            hasAnswerList:{},
+            correctAnswer:'',
+            isSelect:false,
+            isResult:false,
+            theoryExamWrongList:[],
+            resultScore:0,
+            choiceTypeList:['A', 'B', 'C', 'D', 'E', 'F', 'G']
+        };
+    },
+    computed:{
+        isTest() {
+            return this.mode == 'test';
+        }
+    },
+    methods:{
+        doShow({type}) {
+            this.isResult = false;
+            this.loading = true;
+            this.allTime = 30 * 60;
+            this.currentTime = '00:30:00';
+            this.isSelect = false;
+            this.questionList = [];
+            this.currentSelectAnswer = [];
+            this.currentRadioAnswer = '';
+            this.hasAnswerList = {};
+            let currentMode = '01';
+            if (type == 'practice') {
+                currentMode = '01';
+            } else if (type == 'test') {
+                currentMode = '02';
+            }
+            this.mode = type;
+            getItemListByProjectCode('DRTS', {mode:currentMode}).then(res=>{
+                this.questionList = res.data;
+                if (this.isTest) {
+                    this.questionList.forEach((question, index)=>{
+                        this.hasAnswerList[index] = {questionId:question.id, answerContents:[]};
+                    });
+                }
+                if (this.mode == 'practice') {
+                    getPracticeQuestionProgress('DRTS').then(res=>{
+                        this.currentQuestionNum = res.data.questionIndex;
+                        this.loading = false;
+                    }).catch(error=>{
+                        console.log(error.message);
+                    });
+                } else {
+                    this.initCurrentTime();
+                    this.currentQuestionNum = 0;
+                    this.wrongQuestionNum = 0;
+                    this.loading = false;
+                }
+            });
+            this.dialogVisible = true;
+        },
+        close() {
+            this.dialogVisible = false;
+            clearInterval(this.inter);
+        },
+        covert() {
+            const typeList = {'judge':'判断', 'select':'选择', 'multi':'多选'};
+            const currentQuestion = this.questionList[this.currentQuestionNum];
+            if (currentQuestion) {
+                return '第 ' + (this.currentQuestionNum + 1) + ' 题、[' + typeList[currentQuestion.type] + '] ' + currentQuestion.topic + ' (' + currentQuestion.score + '分)';
+            }
+            return '';
+        },
+        initCurrentTime() {
+            this.inter = setInterval(() => {
+                if (this.allTime > 0) {
+                    this.allTime--;
+                    let seconds = this.allTime % 60;
+                    let minutes = (this.allTime - this.allTime % 60) / 60;
+                    minutes = minutes > 9 ? minutes : '0' + minutes;
+                    seconds = seconds > 9 ? seconds : '0' + seconds;
+                    this.currentTime = '00:' + minutes + ':' + seconds;
+                } else {
+                    clearInterval(this.inter);
+                    const submitData = Object.values(this.hasAnswerList);
+                    this.submitConfirmExam(submitData);
+                }
+            }, 1000);
+        },
+        covertWrong() {
+            const typeList = {'judge':'判断', 'select':'选择', 'multi':'多选'};
+            const WrongQuestion = this.theoryExamWrongList[this.wrongQuestionNum];
+            if (WrongQuestion) {
+                return (this.wrongQuestionNum + 1) + '、[' + typeList[WrongQuestion.question.type] + '] ' + WrongQuestion.question.topic + ' (' + WrongQuestion.question.score + '分)';
+            }
+            return '';
+        },
+        changeQuestion(num) {
+            this.isSelect = false;
+            this.currentQuestionNum = num - 1;
+            this.checkCurrentData(this.currentQuestionNum);
+        },
+        changeWrongQuestion(num) {
+            this.wrongQuestionNum = num;
+            this.getWrongDataOption();
+        },
+        judgeQuestionType(type, currentQuestion) {
+            if (currentQuestion && type == 'radio') {
+                return currentQuestion.type == 'judge' || currentQuestion.type == 'select';
+            } else if (currentQuestion && type == 'multi') {
+                return currentQuestion.type == 'multi';
+            } else {
+                return false;
+            }
+        },
+        prevQuestion() {
+            if (this.currentQuestionNum > 0) {
+                this.currentQuestionNum -= 1;
+                this.isSelect = false;
+                this.checkCurrentData(this.currentQuestionNum);
+            }
+
+        },
+        nextQuestion() {
+            if (this.currentQuestionNum < this.questionList.length) {
+                this.currentQuestionNum += 1;
+                this.isSelect = false;
+                this.checkCurrentData(this.currentQuestionNum);
+            }
+        },
+        checkCurrentData(currentQuestionNum) {
+            if (this.hasAnswerList[currentQuestionNum]) {
+                const answerObj = this.hasAnswerList[currentQuestionNum].answerContents;
+                if (answerObj.length > 0) {
+                    const question = this.questionList[currentQuestionNum];
+                    if (question.type == 'judge' || question.type == 'select') {
+                        this.currentRadioAnswer = answerObj[0].optionId;
+                    } else {
+                        const list = [];
+                        answerObj.forEach(item => {
+                            list.push(item.optionId);
+                        });
+                        this.currentSelectAnswer = list;
+                    }
+                } else {
+                    this.currentSelectAnswer = [];
+                    this.currentRadioAnswer = '';
+                }
+            } else {
+                this.currentSelectAnswer = [];
+                this.currentRadioAnswer = '';
+            }
+        },
+        commitExam() {
+            const submitData = Object.values(this.hasAnswerList);
+            let submitWriteLength = 0;
+            submitData.forEach(each=>{
+                if (each.answerContents.length > 0) {
+                    submitWriteLength++;
+                }
+            });
+            if (submitWriteLength < this.questionList.length) {
+                this.$confirm(`测试未完成，是否确认交卷?`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消'
+                }).then(() => {
+                    this.submitConfirmExam(submitData);
+                });
+            } else {
+                this.submitConfirmExam(submitData);
+            }
+        },
+        submitConfirmExam(submitData) {
+            this.loading = true;
+            submitPracticeQuestionData('DRTS', {mode:'02', theoryAnswers:submitData}).then(res=>{
+                this.loading = false;
+                this.isResult = true;
+                this.$message.success('提交成功');
+                this.resultScore = 0;
+                this.theoryExamWrongList = [];
+                res.data.forEach(item => {
+                    this.resultScore += (item.score || 0);
+                    if (item.answerOptionId && item.answerOptionId.length && !item.score) {
+                        this.theoryExamWrongList.push(item);
+                    }
+                });
+                // const writeList = res.data.filter(wrong=>{
+                //     return wrong.answerContents && wrong.answerContents.length > 0;
+                // });
+                // this.theoryExamWrongList = writeList.filter(wrong=>{
+                //     return wrong.correct == false;
+                // });
+                // if (writeList.length > 0) {
+                //     if (writeList.length >= 2) {
+                //         this.resultScore = writeList.reduce((prev, cur, index, arr)=>{
+                //             return prev.score == undefined ? prev + cur.score : prev.score + cur.score;
+                //         });
+                //     } else {
+                //         this.resultScore = writeList[0].score;
+                //     }
+                // } else {
+                //     this.resultScore = 0;
+                // }
+                // if (this.theoryExamWrongList.length > 0) {
+                //     this.getWrongDataOption();
+                // }
+
+            }).catch(()=>{
+                this.$message.error('提交失败，请稍后再试');
+            });
+        },
+        getWrongDataOption() {
+            const wrongList = this.theoryExamWrongList[this.wrongQuestionNum].answerOptionId;
+            if (wrongList.length > 1) {
+                this.currentSelectAnswer = wrongList;
+            } else {
+                this.currentRadioAnswer = wrongList[0];
+            }
+        },
+        wrongCorrectAnswer() {
+            let correctAnswer = '';
+            const wrongList = this.theoryExamWrongList[this.wrongQuestionNum].question.optionList;
+            wrongList.forEach((choice, index)=>{
+                if (choice.correct) {
+                    correctAnswer += this.choiceTypeList[index] + '、' + choice.content + ' ';
+                }
+            });
+            return correctAnswer;
+        },
+        checkNextButton() {
+            if (this.questionList.length > 0) {
+                return this.currentQuestionNum == this.questionList.length - 1;
+            }
+            return true;
+        },
+        commitQuestion() {
+            if (this.mode == 'practice') {
+                const currentCorrectAnswer = [];
+                this.correctAnswer = '';
+                this.answerIsCorrect = false;
+                const question = this.questionList[this.currentQuestionNum];
+                if (question) {
+                    const options = this.questionList[this.currentQuestionNum].optionList;
+                    options.forEach((choice, index)=>{
+                        if (choice.correct) {
+                            this.correctAnswer += this.choiceTypeList[index] + '、' + choice.content + ' ';
+                            currentCorrectAnswer.push(choice.id);
+                        }
+                    });
+                    if (this.currentRadioAnswer) {
+                        if (this.currentRadioAnswer == currentCorrectAnswer.toString()) {
+                            this.answerIsCorrect = true;
+                        } else {
+                            this.answerIsCorrect = false;
+                        }
+                    }
+                    if (this.currentSelectAnswer.length > 0) {
+                        if (currentCorrectAnswer.toString() == this.currentSelectAnswer.sort().toString()) {
+                            this.answerIsCorrect = true;
+                        } else {
+                            this.answerIsCorrect = false;
+                        }
+                    }
+                    this.isSelect = true;
+                    updatePracticeQuestionProgress('DRTS', {index:this.currentQuestionNum}).then(res=>{
+                    }).catch(error=>{
+                        console.log(error.message);
+                    });
+                }
+            }
+        },
+        changeAnswer(data) {
+            if (this.isTest) {
+                let answerContents = [];
+                if (data instanceof Array) {
+                    data.forEach(item => {
+                        answerContents.push({optionId: item, answerContent: ''});
+                    });
+                } else {
+                    answerContents = [{optionId: data, answerContents: ''}];
+                }
+                this.hasAnswerList[this.currentQuestionNum].answerContents = answerContents;
+                document.querySelector('#eachQuestionNum' + this.currentQuestionNum).classList.add('hasSelect');
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.theoryExamBody{
+    width: 800px;
+    height: 460px;
+    border: 1px #ccc solid;
+    position: absolute;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    border-radius: 6px;
+    top: 39%;
+    padding: 10px;
+    box-shadow: 0px 0px 10px #ccc;
+    background:#fff;
+}
+.theoryExamBodyL{
+    width: 500px;
+    display: inline-block;
+    float: left;
+    height: 100%;
+    position: relative;
+}
+.theoryExamQuestion{
+    padding: 5px 15px 0px 10px;
+}
+.theoryExamBodyR{
+    width: 277px;
+    display: inline-block;
+    height: 100%;
+}
+.theoryExamBodyRT{margin-top: 5px;margin-left: 25px;}
+.theoryExamQuestionList{
+    margin-top: 10px;
+    height: 360px;
+    overflow:auto;
+    padding-left: 10px;
+    width: 256px;
+}
+.theoryExamWrongQuestionList{
+    height: 320px;
+    overflow:auto;
+    padding-left: 10px;
+    width: 256px;
+    border: 1px #ececec solid;
+    border-radius: 5px;
+}
+.eachQuestionNum{
+    color: #8f7f70;
+    border-radius: 4px;
+    border: 1px #cfcfcf solid;
+    display: inline-block;
+    width: 30px;
+    height: 30px;
+    text-align: center;
+    line-height: 28px;
+    margin-right: 25px;
+    margin-top: 10px;
+    cursor: pointer;
+}
+.noAnswer{
+    position: relative;
+}
+.hasAnswer,.hasSign{
+    position: relative;
+    margin-left: 25px;
+}
+.noAnswer::before{
+    content: '';
+    width: 10px;
+    height: 10px;
+    border-radius: 20px;
+    background: #fff;
+    border: 1px #606266 solid;
+    position: absolute;
+    left: -15px;
+    top: 4px;
+}
+.hasSign::before{
+    content: '';
+    width: 10px;
+    height: 10px;
+    border-radius: 20px;
+    background: #ff4d4f;
+    position: absolute;
+    left: -15px;
+    top: 4px;
+}
+.hasAnswer::before{
+    content: '';
+    width: 10px;
+    height: 10px;
+    border-radius: 20px;
+    background: #40a9ff;
+    position: absolute;
+    left: -15px;
+    top: 4px;
+}
+.QuestionName{
+    font-weight: bold;
+    line-height: 160%;
+}
+.choiceList{
+    margin-top:10px;
+    display: inline-block;
+    margin-left: 15px;
+}
+.eachChoice{
+    display: block;
+    margin-top: 15px;
+}
+.correctAnswer{
+    margin-top: 20px;
+}
+.buttonList{
+    position: absolute;
+    bottom: 30px;
+    left: 20px;
+}
+.prevAndNext{
+    float: left;
+    display: inline-block;
+}
+.commitExam{margin-left: 30px;}
+.commitQuestion{
+    float: left;
+    margin-right: 200px;
+}
+.practiceIconTips{
+    font-size: 25px;
+    display: inline-block;
+    float: left;
+    margin-left:10px;
+}
+.practicecorrectAnswer{
+    vertical-align: top;
+    line-height: 131%;
+    display: inline-block;
+    width: 375px;
+    margin-left: 8px;
+    margin-top: 3px;
+}
+.hasSelect{
+    background: #409eff;
+    color: #fff;
+}
+.theoryExamScore{
+    margin-left: 20px;
+    margin-top: 10px;
+    font-size: 15px;
+}
+.theoryExamScore1{
+    text-align: center;
+    font-size: 17px;
+    margin-top: 20px;
+}
+.theoryExamEnd{
+    font-size: 90px;
+    color: #007b00;
+    margin-left: 340px;
+    margin-top: 115px;
+}
+.theoryExamWrongList{}
+.theoryExamWrongListL{
+    width: 500px;
+    display: inline-block;
+    float: left;
+    height: 100%;
+    position: relative;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 5px;
+}
+.theoryExamWrongListR{
+    width: 277px;
+    display: inline-block;
+    height: 100%;
+}
+.theoryExamWrongListName{
+    margin-left: 20px;
+    margin-top: 15px;
+    font-size: 15px;
+    font-weight: bold;
+    color: #ff3737;
+    margin-bottom: 5px;
+}
+.eachQuestionNum.active{
+    background: #67c23a;
+    color: #fff;
+}
+.resultScoreStyle{
+    color: #f00;
+    font-size: 17px;
+}
+.examTips{
+    position: absolute;
+    bottom: 5px;
+    left: 22px;
+    color:#000;
+}
+/deep/.el-dialog__headerbtn {
+	font-size: 25px;
+
+}
+	/deep/.el-dialog__close {
+		color: #000;
+	}
+</style>
+<style lang="scss">
+.theoryExam .el-dialog.is-fullscreen{
+    background:#eeeeee
+}
+</style>
diff --git a/src/views/newMap/display/theoryExamSelect.vue b/src/views/newMap/display/theoryExamSelect.vue
new file mode 100644
index 000000000..e9955bda5
--- /dev/null
+++ b/src/views/newMap/display/theoryExamSelect.vue
@@ -0,0 +1,49 @@
+<template>
+  <el-dialog
+    title="选择考试类型"
+    :visible.sync="dialogVisible"
+    :close-on-click-modal="false"
+    width="350px"
+    :before-do-close="close"
+  >
+    <div>
+      <el-form ref="ruleForm" :model="form" label-width="30px">
+        <el-form-item label="" prop="role">
+          <el-select v-model="form.type" style="width:260px">
+            <el-option label="练习模式" value="practice" />
+            <el-option label="测验模式" value="test" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">{{ $t('global.cancel') }}</el-button>
+      <el-button type="primary" @click="confirm">{{ $t('global.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+export default {
+    name:'TheoryExamSelect',
+    data() {
+        return {
+            dialogVisible:false,
+            form:{
+                type:'practice'
+            }
+        };
+    },
+    methods:{
+        doShow() {
+            this.dialogVisible = true;
+        },
+        close() {
+            this.dialogVisible = false;
+        },
+        confirm() {
+            this.dialogVisible = false;
+            this.$emit('startTheoryExam', this.form);
+        }
+    }
+};
+</script>
diff --git a/src/views/newMap/display/thirdJump.vue b/src/views/newMap/display/thirdJump.vue
new file mode 100644
index 000000000..d1460fff1
--- /dev/null
+++ b/src/views/newMap/display/thirdJump.vue
@@ -0,0 +1,46 @@
+<template>
+  <div v-loading="loading" style="width: 100%;height: 100%;" />
+</template>
+
+<script>
+import { createSimulation } from '@/api/simulation';
+import { launchFullscreen } from '@/utils/screen';
+export default {
+    name: 'ThirdJump',
+    data() {
+        return {
+            loading: true
+        };
+    },
+    mounted() {
+        this.enterSimulation();
+    },
+    methods: {
+        enterSimulation() {
+            createSimulation(this.$route.query.systemId).then(resp => {
+                const query = {
+                    lineCode: this.$route.query.lineCode,
+                    group: resp.data,
+                    mapId: this.$route.query.mapId,
+                    simType: this.$route.query.simType,
+                    project:  this.$route.query.project,
+                    labels: this.$route.query.labels
+                };
+                this.$router.push({ path: `/display/demon`, query: query });
+                launchFullscreen();
+            }).catch(error=>{
+                if (error.code == 10003) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                } else {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                }
+                this.disabled = false;
+            });
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/trainingManage/create.vue b/src/views/newMap/display/trainingDesign/createDraftTraining.vue
similarity index 65%
rename from src/views/trainingManage/create.vue
rename to src/views/newMap/display/trainingDesign/createDraftTraining.vue
index 5d0f7e5c8..c4375cfb0 100644
--- a/src/views/trainingManage/create.vue
+++ b/src/views/newMap/display/trainingDesign/createDraftTraining.vue
@@ -1,7 +1,20 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :modal="false" :before-close="doClose" center>
+  <div style="padding: 0 50px;">
+    <div style="text-align: center;padding: 30px 20px;font-size: 16px;font-weight: bold;">{{ title }}</div>
+    <div style="text-align: right;padding-right: 10px;margin-bottom: 10px;">
+      <el-button size="small" type="text" @click="doCreate">{{ isCreate?'创建':'修改' }}</el-button>
+      <el-divider direction="vertical" />
+      <el-button size="small" type="text" @click="doClose">返回</el-button>
+    </div>
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-    <el-form ref="form" :model="tagForm" label-width="60px">
+    <el-form ref="form" :model="tagForm" size="small" label-width="90px" :rules="formRules">
+      <el-form-item v-if="formModel.type === 'SINGLE'" label="客户端" prop="client">
+        <el-select v-model="tagForm.client" placeholder="请选择客户端">
+          <el-option label="行调客户端" value="dispatchWork" />
+          <el-option label="现地客户端" value="localWork" />
+          <el-option label="轨道详览" value="troDetailWork" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="标签">
         <el-tag
           v-for="tag in tagForm.dynamicTags"
@@ -24,11 +37,7 @@
         <el-button v-else class="button-new-tag" size="small" @click="showInput">+ New Tag</el-button>
       </el-form-item>
     </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -40,18 +49,18 @@ export default {
     props: {},
     data() {
         return {
-            dialogVisible: false,
             isCreate: true,
             formModel: {
                 name: '',
                 mapId: '',
                 description:'',
-                type: ''
-                // labelJson: ''
+                type: '',
+                client: ''
             },
             inputVisible: false,
             inputValue: '',
             tagForm: {
+                client: '',
                 dynamicTags: []
             }
         };
@@ -66,13 +75,11 @@ export default {
         },
         form() {
             const form = {
-                labelWidth: '60px',
+                labelWidth: '90px',
                 items: [
                     { prop: 'name', label: '名称', type: 'text' },
                     { prop: 'description', label: '描述', type: 'textarea' },
                     { prop: 'type', label: '类型', type: 'select', options: ConstConfig.ConstSelect.trainingType }
-                    // { prop: 'labelJson', label: '标签', type: 'text', placeholder: '多个请用逗号隔开' }
-
                 ]
             };
             return form;
@@ -90,6 +97,11 @@ export default {
                 ]
             };
             return crules;
+        },
+        formRules() {
+            return {
+                client: [{ required: true, message: '请选择客户端', trigger: 'blur' }]
+            };
         }
     },
     methods: {
@@ -126,7 +138,7 @@ export default {
                 return callback();
             }
         },
-        doShow(data) {
+        initData(data) {
             if (data) {
                 this.isCreate = false;
                 this.formModel = {...data};
@@ -134,42 +146,47 @@ export default {
                     this.formModel[key] = data[key];
                 });
                 this.tagForm.dynamicTags = data.labelJson ? JSON.parse(data.labelJson) : [];
+                this.tagForm.client = data.client;
             } else {
                 this.isCreate = true;
                 this.formModel = {
                     name: '',
                     mapId: this.$route.query.mapId,
                     description:'',
-                    type: ''
-                    // labelJson: ''
+                    type: '',
+                    client: ''
                 };
                 this.tagForm.dynamicTags = [];
             }
-            this.dialogVisible = true;
         },
         doCreate() {
             this.$refs.dataform.validateForm(() => {
-                const cpData = Object.assign({}, this.formModel);
-                cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags);
-                let api = updateTraining;
-                let mes = '编辑';
-                if (this.isCreate) {
-                    api = createTraining;
-                    mes = '创建';
-                }
-                api(cpData).then(res => {
-                    this.$message.success(`${mes}实训成功！`);
-                    this.$emit('edit');
-                    this.doClose();
-                }).catch(err => {
-                    this.$message.error('获取实训详情信息失败！');
-                    this.$message.error(`${mes}实训失败！，${err.message}`);
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        const cpData = Object.assign({}, this.formModel);
+                        cpData.client = this.tagForm.client;
+                        cpData.labelJson = JSON.stringify(this.tagForm.dynamicTags);
+                        let api = updateTraining;
+                        let mes = '编辑';
+                        if (this.isCreate) {
+                            api = createTraining;
+                            mes = '创建';
+                        }
+                        api(cpData).then(res => {
+                            this.$message.success(`${mes}实训成功！`);
+                            this.$emit('edit');
+                            this.doClose();
+                        }).catch(err => {
+                            this.$message.error('获取实训详情信息失败！');
+                            this.$message.error(`${mes}实训失败！，${err.message}`);
+                        });
+                    }
                 });
             });
         },
         doClose() {
-            this.$refs.dataform.resetForm();
-            this.dialogVisible = false;
+            this.$refs.dataform && this.$refs.dataform.resetForm();
+            this.$emit('cancel');
         }
     }
 };
diff --git a/src/views/newMap/display/trainingDesign/designPane.vue b/src/views/newMap/display/trainingDesign/designPane.vue
new file mode 100644
index 000000000..1173e0cc5
--- /dev/null
+++ b/src/views/newMap/display/trainingDesign/designPane.vue
@@ -0,0 +1,511 @@
+<template>
+  <div id="designPane" class="editContent" :class="{'active': dialogVisible}" :style="{height: paneHeight + 'px'}">
+    <div class="editContentTab">
+      <div class="editContentTabLable" @click="minisize">
+        <span class="titleStyle">实训设计</span>
+      </div>
+    </div>
+    <div v-show="showMode === 'draftTrainingList'">
+      <draft-training-list
+        ref="draftTrainingList"
+        @createDraftTraining="createDraftTraining"
+        @editDraftTraining="editDraftTraining"
+        @updateDetails="updateDetails"
+        @editGradeRules="editGradeRules"
+        @draftTracK="showDraftTracK"
+      />
+    </div>
+    <div v-show="showMode === 'editOperate'">
+      <div class="editContentTitle" style="margin-top: 40px;">
+        <span>实训名称：{{ editData.name || '' }}</span>
+      </div>
+      <edit-operate ref="editOperate" @backDesignPane="backDesignPane" />
+    </div>
+    <div v-show="showMode === 'createDraftTraining'">
+      <create-draft-training ref="createDraftTraining" @edit="getListData" @cancel="backTrainingList" />
+    </div>
+    <div v-show="showMode === 'gradeRules'">
+      <grade-rules ref="gradeRules" @cancel="backTrainingList" />
+    </div>
+    <div v-show="showMode === 'trackList'">
+      <track-list ref="trackList" @cancel="backTrainingList" />
+    </div>
+    <div v-show="showMode === 'designPane'" class="editContentBox">
+      <div class="editContentTitle">
+        <span>实训名称：{{ editData.name || '' }}</span>
+      </div>
+      <div style="text-align: right;padding-right: 10px;">
+        <el-button size="small" type="text" @click="editGradeRules(editData)">评分</el-button>
+        <el-divider direction="vertical" />
+        <el-button size="small" type="text" @click="previewTraining">预览</el-button>
+        <el-divider direction="vertical" />
+        <el-button size="small" type="text" @click="publishTraining">发布</el-button>
+        <el-divider direction="vertical" />
+        <el-button size="small" type="text" @click="resetTraining">重置</el-button>
+        <el-divider direction="vertical" />
+        <el-button size="small" type="text" @click="showMode = 'draftTrainingList'">返回列表</el-button>
+      </div>
+      <div>
+        <el-divider content-position="center">实训背景</el-divider>
+        <el-button class="text-button-position" type="text" @click="saveScenesStage">背景保存</el-button>
+        <div style="display: flex;font-size: 14px;text-align: left;">
+          <div style="width: 100px;margin-left: 40px;">更新时间：</div>
+          <div>{{ bgSceneObj.systemTime || '' }}</div>
+        </div>
+        <el-divider content-position="center">实训定位</el-divider>
+        <el-button class="text-button-position" type="text" @click="updateMapLocation">定位</el-button>
+        <div style="display: flex;font-size: 14px;text-align: left;">
+          <div style="width: 100px;margin-left: 40px;">X坐标：</div>
+          <div>{{ mapLocationObj.x || '' }}</div>
+        </div>
+        <div style="display: flex;font-size: 14px;text-align: left;margin-top: 10px;">
+          <div style="width: 100px;margin-left: 40px;">Y坐标：</div>
+          <div>{{ mapLocationObj.y || '' }}</div>
+        </div>
+        <div style="display: flex;font-size: 14px;text-align: left;margin-top: 10px;">
+          <div style="width: 100px;margin-left: 40px;">缩放：</div>
+          <div>{{ mapLocationObj.scale || '' }}</div>
+        </div>
+        <el-divider content-position="center">实训步骤</el-divider>
+        <div class="text-button-position">
+          <el-button type="text" @click="addStep">新增步骤</el-button>
+          <el-divider direction="vertical" />
+          <el-button type="text" @click="saveStepData">保存</el-button>
+        </div>
+        <el-table
+          style="position: relative;top: -40px;"
+          :data="tableData"
+          :max-height="tableHeight"
+        >
+          <el-table-column type="index" label="序号" width="50" />
+          <el-table-column :label="$t('trainingManage.roleSelect')" width="200">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.memberId" placeholder="请选择" :disabled="!!(scope.$index && editData.type === 'SINGLE')" size="mini" @change="memberChange">
+                <el-option
+                  v-for="item in roleList"
+                  :key="item.id"
+                  :disabled="computedRoleDisabled(item)"
+                  :label="item.label"
+                  :value="item.id"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('trainingManage.stepDescription')">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.description" placeholder="请输入步骤描述" size="mini" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('trainingManage.operateCondition')" width="90">
+            <template slot-scope="scope">
+              <el-button size="mini" type="primary" @click="handleEditOperate(scope.$index, scope.row)">{{ $t('global.edit') }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('global.operate')" width="90">
+            <template slot-scope="scope">
+              <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">{{ $t('global.delete') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { updateTrainingStep, getTrainingAll, updateTrainingBackgroud, getTrainingStepList, updateTrainingMaplocation, clearDesignTraining} from '@/api/trainingManage';
+import { assignUsersPlayRoles } from '@/api/jointSimulation';
+import Vue from 'vue';
+import {covertMemberData} from '@/views/newMap/displayNew/utils';
+import DraftTrainingList from './draftTrainingList';
+import EditOperate from './editOperate';
+import CreateDraftTraining from './createDraftTraining';
+import GradeRules from './gradeRules';
+import TrackList from './trackList';
+
+export default {
+    name: 'DesignIndex',
+    components:{
+        DraftTrainingList,
+        EditOperate,
+        CreateDraftTraining,
+        GradeRules,
+        TrackList
+    },
+    data() {
+        return {
+            editData: {},
+            dialogWidth: '1100px',
+            dialogVisible: false,
+            roleList: [],
+            tableData: [],
+            activeName: 'stepList',
+            mapLocationObj: {},
+            bgSceneObj: {},
+            showMode: 'draftTrainingList'
+        };
+    },
+    computed: {
+        tableHeight() {
+            return this.$store.state.app.height - 385;
+        },
+        paneHeight() {
+            return this.$store.state.app.height - 55;
+        },
+        group() {
+            return this.$route.query.group;
+        },
+        trainingSwitch() {
+            return this.$store.state.trainingNew.trainingSwitch;
+        }
+    },
+    watch: {
+        '$store.state.training.roles': function(val) {
+            this.getRoleList();
+        },
+        '$store.state.training.memberList': function(val) {
+            if (val && val.length) {
+                this.getRoleList();
+            }
+        },
+        editData() {
+            this.mapLocationObj = {};
+            if (this.editData['mapLocationJson']) {
+                this.mapLocationObj = JSON.parse(this.editData['mapLocationJson']);
+            }
+            this.bgSceneObj = {};
+            if (this.editData['bgSceneJson']) {
+                this.bgSceneObj = JSON.parse(this.editData['bgSceneJson']);
+            }
+        },
+        '$store.state.map.activeTrainListChange': function () {
+            const activeTrainList = this.$store.state.map.activeTrainList;
+            const memberData = this.$store.state.training.memberData;
+            // 获取仿真成员列表
+            const result = covertMemberData(activeTrainList, Object.values(memberData));
+            let list = [];
+            result.deviceListData.forEach(item => {
+                list = list.concat(item);
+            });
+            this.roleList = list;
+        }
+    },
+    mounted() {
+        const designPaneDom = document.getElementById('designPane');
+        designPaneDom.addEventListener('click', (e) => {
+            e.stopPropagation();
+        });
+    },
+    methods: {
+        computedRoleDisabled(role) {
+            if (!this.editData.client) {
+                return false;
+            } else {
+                return (this.editData.client === 'dispatchWork' && role.type !== '行调') || (this.editData.client === 'localWork' && role.type !== '行值') ||
+					(this.editData.client === 'troDetailWork' && role.type !== '行调');
+            }
+        },
+        getRoleList() {
+            const memberData = this.$store.state.training.memberData;
+            const activeTrainList = this.$store.state.map.activeTrainList;
+            // 获取仿真成员列表
+            const result = covertMemberData(activeTrainList, Object.values(memberData));
+            let list = [];
+            result.deviceListData.forEach(item => {
+                list = list.concat(item);
+            });
+            this.roleList = list;
+        },
+        updateDetails(data) {
+            this.editData = data;
+            this.getStepList(data);
+            this.showMode = 'designPane';
+        },
+        publishTraining() {
+            console.log('发布实训');
+            this.$refs.draftTrainingList.publishScript(null, this.editData);
+        },
+        previewTraining() {
+            console.log('预览实训');
+            this.$refs.draftTrainingList.previewScript(null, this.editData);
+        },
+        resetTraining() {
+            this.$confirm('确定重置草稿实训?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                clearDesignTraining(this.editData.id, this.group).then(res => {
+                    console.log(res, '重置草稿实训成功！');
+                    this.editData.bgSceneJson = '{}';
+                    this.editData.mapLocationJson = '{}';
+                    this.mapLocationObj = {};
+                    this.bgSceneObj = {};
+                    this.getStepList(this.editData);
+                }).catch(err => {
+                    console.log(err, '重置草稿实训失败！');
+                });
+            });
+        },
+        getRoleSelect(v) {
+            let name = '';
+            const colObj = this.roleList.find(item => {
+                return item.value == v;
+            });
+            if (colObj) {
+                name = colObj.label;
+            }
+            return name;
+        },
+        addStep() {
+            if (this.bgSceneObj.systemTime) {
+                const lastIndex = this.tableData.length - 1;
+                let mId = '';
+                if (this.tableData[lastIndex]) {
+                    mId = this.tableData[lastIndex].memberId || '';
+                }
+                const obj = {
+                    memberId: mId,
+                    description: '',
+                    operations: [],
+                    simCommands: [],
+                    tipPosition: {}
+                };
+                this.tableData.push(obj);
+            } else {
+                this.$messageBox('请先保存实训背景！');
+            }
+        },
+        backDesignPane(data) {
+            this.showMode = 'designPane';
+            this.$store.dispatch('trainingNew/editDraftStepList', null);
+        },
+        handleDelete(index, row) {
+            console.log('删除', index, row);
+            this.$confirm('确定删除该条步骤数据?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.tableData.splice(index, 1);
+            }).catch(e => {});
+        },
+        handleEditOperate(index, row) {
+            if (!row.memberId) {
+                this.$message.info('请先选择角色！');
+                return;
+            }
+            if (this.trainingSwitch) {
+                this.$message.info('请先结束当前实训再编制！');
+                return;
+            }
+            this.$store.dispatch('trainingNew/setTrainingDetail', null);
+            const list = [];
+            this.tableData.forEach((item, ind) => {
+                const obj = {
+                    ...item,
+                    isActive: ind === index
+                };
+                list.push(obj);
+            });
+            this.$store.dispatch('trainingNew/editDraftStepList', list);
+            const member = this.$store.state.training.memberData[row.memberId];
+            if (!member.userId) {
+                assignUsersPlayRoles([{ userId: this.$store.state.user.id, memberId: member.id}], this.$route.query.group).then(resp => {
+                }).catch(() => { this.$message.error('调整角色失败！'); });
+            }
+            this.$refs.editOperate.initData({ index: index, data: row, type: this.editData.type });
+            this.showMode = 'editOperate';
+        },
+        minisize() {
+            this.dialogVisible = !this.dialogVisible;
+        },
+        doShow(data) {
+            this.dialogVisible = true;
+        },
+        async saveStepData() {
+            try {
+                const list = [];
+                this.tableData.forEach((item, index) => {
+                    const obj = {
+                        ...item
+                    };
+                    delete obj.isEdit;
+                    list.push(obj);
+                });
+                await updateTrainingStep(this.group, this.editData.id, list);
+                this.$message.success('保存实训成功！');
+            } catch {
+                this.$message.error('保存实训失败');
+            }
+        },
+        doClose() {
+            this.dialogVisible = false;
+        },
+        getStepList(data) { // 获取步骤
+            getTrainingStepList(data.id).then(res => {
+                console.log(res, '获取步骤成功');
+                this.tableData = res.data;
+            }).catch(err => {
+                console.log(err, '获取步骤失败');
+                this.tableData = [];
+            });
+        },
+        getTrainingAllInfo(id) {
+            return new Promise((resolve, reject) => {
+                getTrainingAll(id).then(res => {
+                    console.log(res, '获取详细信息成功');
+                    const data = {
+                        ...res.data
+                    };
+                    const objArr = ['bgSceneJson', 'mapLocationJson'];
+                    objArr.forEach(key => {
+                        data[key] = res.data[key] ? JSON.parse(res.data[key]) : {};
+                    });
+                    const arr = ['labelJson', 'memberJson', 'playerIdJson', 'stepJson'];
+                    arr.forEach(key => {
+                        data[key] = res.data[key] ? JSON.parse(res.data[key]) : [];
+                    });
+                    resolve(data);
+                }).catch(err => {
+                    console.log(err, '获取详细信息失败');
+                    reject(err);
+                });
+            });
+        },
+        updateMapLocation() {
+            if (!Vue.prototype.$jlmap) {
+                this.$message.warning('请切换到站场图定位！');
+                return;
+            }
+            const data = Vue.prototype.$jlmap.$options;
+            const params = {scale: data.scaleRate, x: data.offsetX, y: data.offsetY};
+            updateTrainingMaplocation({id: this.editData.id, mapLocationJson: JSON.stringify(params)}).then(res => {
+                console.log('保存地图定位成功！', res);
+                this.$message.success('保存地图定位成功！');
+                this.mapLocationObj = params;
+            }).catch(err => {
+                console.log('保存地图定位失败', err);
+                this.$message.error('保存地图定位失败');
+            });
+        },
+        saveScenesStage() {
+            if (this.tableData && this.tableData.length) {
+                this.$confirm('已添加实训步骤，保存背景可能导致步骤执行失败，是否继续？', '提 示', {
+                    confirmButtonText: '确 定',
+                    cancelButtonText: '取 消',
+                    type: 'warning'
+                }).then(() => {
+                    this.saveBg();
+                }).catch( () => { });
+            } else {
+                this.saveBg();
+            }
+        },
+        saveBg() {
+            updateTrainingBackgroud({id: this.editData.id, groupId: this.group}).then(res => {
+                console.log('保存背景', res);
+                this.$message.success('保存背景成功！');
+                this.getTrainingAllInfo(this.editData.id).then(suc => {
+                    this.bgSceneObj = suc.bgSceneJson;
+                }).catch(() => {
+                    this.bgSceneObj = {};
+                });
+            }).catch(err => {
+                console.log('保存背景失败', err);
+                this.$message.error('保存背景失败');
+            });
+        },
+        getListData() {
+            this.$refs.draftTrainingList.getListData();
+        },
+        backTrainingList(source) {
+            this.showMode = source || 'draftTrainingList';
+        },
+        createDraftTraining() {
+            this.showMode = 'createDraftTraining';
+            this.$refs.createDraftTraining.initData();
+        },
+        editDraftTraining(data) {
+            this.showMode = 'createDraftTraining';
+            this.$refs.createDraftTraining.initData(data);
+        },
+        editGradeRules(data) {
+            this.$refs.gradeRules.initData(data, this.showMode);
+            this.showMode = 'gradeRules';
+        },
+        showDraftTracK(data) {
+            this.showMode = 'trackList';
+            this.$refs.trackList.initData(data);
+        },
+        memberChange(val) {
+            if (this.editData.type === 'SINGLE') {
+                this.tableData.forEach(elem => {
+                    elem.memberId = val;
+                });
+            }
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.editContent {
+	position: fixed;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	// height: 100%;
+	width: 800px;
+	transform: translateX(800px);
+	transition: all 0.4s;
+	z-index: 2001;
+	background: #fff;
+	&.active{
+		transform: translateX(0px);
+	}
+}
+.editContentBox {
+	padding: 20px;
+}
+.editContentTab{
+	position: absolute;
+	z-index: 10;
+	left: -12px;
+	// top: calc(45% + 200px);
+	top: 200px;
+}
+.editContentTabLable{
+	position: absolute;
+	background: #fff;
+	border-radius: 5px 0px 0px 5px ;
+	padding: 5px 0px;
+	width: 24px;
+	text-align: center;
+	left: 50%;
+	transform: translateX(-50%);
+	cursor: pointer;
+	top: 0px;
+}
+.tabPaneBox {
+	padding: 0 20px;
+	.tabPaneHead, .tabPaneFooter {
+		padding: 10px 0;
+	}
+	.tabPaneFooter {
+		display: flex;
+		justify-content: center;
+	}
+}
+.editContentTitle {
+	height: 30px;
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+}
+.text-button-position{
+	float: right;
+	margin-right: 20px;
+	position: relative;
+	top: -30px;
+}
+</style>
diff --git a/src/views/trainingManage/trainingList.vue b/src/views/newMap/display/trainingDesign/draftTrainingList.vue
similarity index 84%
rename from src/views/trainingManage/trainingList.vue
rename to src/views/newMap/display/trainingDesign/draftTrainingList.vue
index 6bfe4de52..73d6cc6b9 100644
--- a/src/views/trainingManage/trainingList.vue
+++ b/src/views/newMap/display/trainingDesign/draftTrainingList.vue
@@ -1,15 +1,21 @@
 <template>
-  <el-dialog v-dialogDrag title="实训管理" :visible.sync="dialogVisible" width="1250px" :before-close="doClose" center>
-    <div>
-      <div class="trainingHeader">
-        <div class="trainingList">实训草稿列表</div>
-        <div class="flexNull" />
-        <el-button size="small" type="primary" class="createScript" @click="handleCreate">{{ $t('trainingManage.create') }}</el-button>
-      </div>
-      <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-      <Create ref="create" v-dialogDrag @edit="getListData" />
+  <div class="main">
+    <div class="trainingHeader">
+      <div class="trainingList">实训草稿列表</div>
     </div>
-  </el-dialog>
+    <div style="text-align: right;padding: 10px;margin-bottom: 10px;">
+      <el-button size="small" type="text" class="createScript" @click="handleCreate">新建</el-button>
+    </div>
+    <QueryListPage
+      ref="queryListPage"
+      :style="{maxHeight: tableHeight + 'px'}"
+      style="overflow-y: scroll;"
+      :card-padding="10"
+      :pager-config="pagerConfig"
+      :query-form="queryForm"
+      :query-list="queryList"
+    />
+  </div>
 </template>
 
 <script>
@@ -17,20 +23,18 @@ import { getTrainingList, getTrainingAll } from '@/api/trainingManage';
 import { loadTrainingBg } from '@/api/jmap/training';
 import Cookies from 'js-cookie';
 import ConstConfig from '@/scripts/ConstConfig';
-import Create from './create.vue';
 import { loadDraftTraining } from '@/api/jmap/training';
 import { deleteTraining, publishTraining } from '@/api/trainingManage';
 import { OperateMode } from '@/scripts/ConstDic';
 
 export default {
-    name: 'TrainingList',
+    name: 'List',
     components:{
-        Create
     },
     props: {},
     data() {
         return {
-            dialogVisible: false,
+            // dialogVisible: false,
             pagerConfig: {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
@@ -50,10 +54,8 @@ export default {
                 RAIL_CTC: '10'
             },
             queryList: {
-                height: 500,
                 query: this.queryFunction,
                 selectCheckShow: false,
-                indexShow: true,
                 columns: [
                     {
                         title: this.$t('trainingManage.name'),
@@ -73,7 +75,7 @@ export default {
                     },
                     {
                         title: this.$t('trainingManage.labelJson'),
-                        width: '200',
+                        width: '150',
                         prop: 'labelJson',
                         type: 'tagMore',
                         columnValue: (row) => { return this.labelJsonData(row); },
@@ -82,48 +84,48 @@ export default {
                     {
                         type: 'button',
                         title: this.$t('trainingManage.operate'),
-                        width: '500',
+                        width: '300',
                         buttons: [
                             {
                                 name: this.$t('trainingManage.record'),
                                 handleClick: this.drawUp,
-                                type: 'success',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             },
                             {
                                 name: this.$t('trainingManage.modify'),
                                 handleClick: this.handleModify,
-                                type: 'primary',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             },
                             {
                                 name: this.$t('trainingManage.delete'),
                                 handleClick: this.deleteScript,
-                                type: 'danger',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             },
                             {
                                 name: this.$t('trainingManage.publish'),
                                 handleClick: this.publishScript,
-                                type: 'primary',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             },
                             {
                                 name: this.$t('trainingManage.preview'),
                                 handleClick: this.previewScript,
-                                type: 'primary',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             },
                             {
                                 name: this.$t('trainingManage.gradeRules'),
                                 handleClick: this.gradeRules,
-                                type: 'success',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             },
                             {
                                 name: this.$t('trainingManage.publishTrack'),
                                 handleClick: this.publishTrack,
-                                type: 'primary',
+                                type: 'text',
                                 showControl:(row) => { return row.id; }
                             }
                         ]
@@ -144,6 +146,9 @@ export default {
         },
         trainingSwitch() {
             return this.$store.state.trainingNew.trainingSwitch;
+        },
+        tableHeight() {
+            return this.$store.state.app.height - 180;
         }
     },
     methods: {
@@ -156,13 +161,9 @@ export default {
         },
         doShow() {
             this.getListData();
-            this.dialogVisible = true;
-        },
-        doClose() {
-            this.dialogVisible = false;
         },
         handleCreate() {
-            this.$refs.create.doShow(null);
+            this.$emit('createDraftTraining');
         },
         covertData(row) {
             const releaseReview = ConstConfig.ConstSelect.trainingType;
@@ -203,10 +204,9 @@ export default {
                 this.$store.dispatch('trainingNew/setTrainingDetail', null);
                 if (resp.data && resp.data.mapLocationJson) {
                     const mapLocation = JSON.parse(resp.data.mapLocationJson);
-                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                    this.$jlmap && this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
                 }
                 this.$emit('updateDetails', resp.data);
-                this.doClose();
             }).catch((e) => {
                 console.error(e);
                 this.$emit('updateDetails', {});
@@ -221,7 +221,7 @@ export default {
         handleModify(index, row) {
             console.log('修改', index, row);
             if (!row.id) { return; }
-            this.$refs.create.doShow(row);
+            this.$emit('editDraftTraining', row);
         },
         deleteScript(index, row) {
             console.log('删除', index, row);
@@ -281,7 +281,7 @@ export default {
                 this.training = detailResp.data;
                 if (detailResp.data.mapLocationJson) {
                     const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
-                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                    this.$jlmap && this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
                 }
                 if (detailResp.data.playerIdJson) {
                     const playerId = JSON.parse(detailResp.data.playerIdJson)[0];
@@ -293,7 +293,6 @@ export default {
                 }
                 this.$emit('closeAllDialog');
                 this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
-                this.$store.dispatch('trainingNew/setTrainingScore', '');
                 await loadDraftTraining(this.group, data.id, {mode: this.teachMode});
                 this.$message.success('加载实训成功！');
             } catch (e) {
@@ -303,9 +302,7 @@ export default {
         },
         // 打分
         gradeRules(index, row) {
-            this.doClose();
-            this.$emit('gradeRules', row);
-            // this.$refs.gradeRules.doShow();
+            this.$emit('editGradeRules', row);
         },
         publishTrack(index, row) {
             this.$emit('draftTracK', row);
@@ -317,16 +314,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .el-dialog--center .el-dialog__body{
-    padding: 10px 25px 10px 25px;
+.main {
+	padding: 20px;
 }
 .trainingHeader {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	padding: 10px 5px;
-	.flexNull {
-		flex: 1;
-	}
+	text-align: center;
+	padding: 10px;
+	font-size: 16px;
+	font-weight: bold;
 }
 </style>
diff --git a/src/views/newMap/display/trainingDesign/editOperate.vue b/src/views/newMap/display/trainingDesign/editOperate.vue
new file mode 100644
index 000000000..00978c44f
--- /dev/null
+++ b/src/views/newMap/display/trainingDesign/editOperate.vue
@@ -0,0 +1,147 @@
+<template>
+  <div>
+    <div style="text-align: right;padding-right: 10px;">
+      <el-button size="small" type="text" @click="clearOperation">清空</el-button>
+      <el-divider direction="vertical" />
+      <el-button size="small" type="text" @click="backDesignPane">返回</el-button>
+    </div>
+    <el-divider content-position="center">步骤描述</el-divider>
+    <div style="display: flex;font-size: 14px;text-align: left;">
+      <div style="width: 100px;margin-left: 40px;">描述：</div>
+      <div>{{ stepDetail.description }}</div>
+    </div>
+    <el-divider content-position="center">关联操作编辑</el-divider>
+    <div style="display: flex;font-size: 14px;text-align: left;">
+      <div style="width: 100px;margin-left: 40px;">
+        <span>操作详情</span>
+        <el-tooltip class="item" effect="dark" content="绿色操作为默认步骤提示位置，点击操作以切换" placement="top-start">
+          <i class="el-icon-info" />
+        </el-tooltip>
+        <span>：</span>
+      </div>
+      <div>
+        <template v-for="(item, index) in stepDetail.operations || []">
+          <div :key="index">
+            <el-tag :type="tagIndex === index? 'success':''" closable @close="deleteOperation(index)" @click="changeTagIndex(index)">
+              {{ covertString(item) }}
+            </el-tag>
+          </div>
+        </template>
+      </div>
+      <div />
+    </div>
+  </div>
+</template>
+
+<script>
+import CMD from '@/scripts/cmdPlugin/CommandEnum';
+export default {
+    name: 'EditOperateNew',
+    data() {
+        return {
+            tagIndex: 0,
+            editMode: false,
+            cmdMap: {},
+            stepDetail: {},
+            trainingType: '',
+            stepIndex: ''
+        };
+    },
+    watch: {
+        '$store.state.trainingNew.trainingOperate': function (val) {
+            if (val && this.editMode) {
+                const data = {
+                    id: Date.now(),
+                    deviceCode: val.code || '',
+                    val:val.val || '',
+                    subType: '',
+                    userOperationType: val.userOperationType || '',
+                    domId: val.operation || '',
+                    operationType: val.cmdType ? val.cmdType.value : '',
+                    params: val.param || {}
+                };
+                if (['trainSetButton', 'light', 'button', 'preReset', 'substation', 'center', 'emergency', 'interconnected'].includes(val.subType)) {
+                    data.subType = val.subType;
+                }
+                this.stepDetail.operations.push(data);
+            }
+        },
+        '$store.state.trainingNew.simCommand': function (val) {
+            if (val && this.editMode && this.stepDetail.operations && this.stepDetail.operations.length) {
+                this.stepDetail.simCommands.push(val);
+                this.stepDetail.operations[this.stepDetail.operations.length - 1].commandId = val.id;
+            }
+        }
+    },
+    mounted() {
+        for (const key in CMD) {
+            for (const mapKey in CMD[key]) {
+                this.cmdMap[CMD[key][mapKey].value] = CMD[key][mapKey].label;
+            }
+        }
+    },
+    beforeDestroy() {
+        this.$store.dispatch('trainingNew/editDraftStepList', null);
+    },
+    methods: {
+        initData(data) {
+            this.editMode = true;
+            this.stepIndex = data.index;
+            this.stepDetail = data.data;
+            this.trainingType = data.type;
+        },
+        clearOperation() {
+            this.$confirm('清除操作将清除所有关联操作', '提示', {
+                confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel')
+            }).then(() => {
+                this.tagIndex = 0;
+                this.stepDetail.operations = [];
+                this.stepDetail.simCommands = [];
+                this.stepDetail.tipPosition = {};
+            });
+        },
+        deleteOperation(index) {
+            if (this.tagIndex === index) {
+                this.tagIndex = 0;
+            }
+            if (this.stepDetail.operations[index] && this.stepDetail.operations[index].commandId) {
+                const commandIndex = this.stepDetail.simCommands.findIndex(command => command.id === this.stepDetail.operations[index].commandId);
+                this.stepDetail.simCommands.splice(commandIndex, 1);
+            }
+            this.stepDetail.operations.splice(index, 1);
+        },
+        changeTagIndex(index) {
+            this.tagIndex = index;
+        },
+        backDesignPane() {
+            if (this.stepDetail.operations[this.tagIndex] && this.trainingType === 'SINGLE') {
+                this.stepDetail.tipPosition.domId = this.stepDetail.operations[this.tagIndex].domId;
+                this.stepDetail.tipPosition.deviceCode = this.stepDetail.operations[this.tagIndex].deviceCode;
+                this.stepDetail.tipPosition.operateIndex = this.tagIndex;
+                if (this.stepDetail.operations[this.tagIndex].subType) {
+                    this.stepDetail.tipPosition.subType = this.stepDetail.operations[this.tagIndex].subType;
+                }
+            }
+            this.$emit('backDesignPane');
+            this.tagIndex = 0;
+            this.editMode = false;
+        },
+        covertString(data) {
+            if (data.userOperationType) {
+                return data.userOperationType + data.domId;
+            } else if (data.domId) {
+                return data.domId;
+            } else if (data.operationType && this.cmdMap[data.operationType]) {
+                return this.cmdMap[data.operationType];
+            } else {
+                return '';
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/trainingDesign/gradeRules.vue b/src/views/newMap/display/trainingDesign/gradeRules.vue
new file mode 100644
index 000000000..88b16b1c7
--- /dev/null
+++ b/src/views/newMap/display/trainingDesign/gradeRules.vue
@@ -0,0 +1,178 @@
+<template>
+  <div style="padding: 0 50px;">
+    <div style="text-align: center;padding: 30px 20px;font-size: 16px;font-weight: bold;">评分</div>
+    <div style="text-align: right;padding-right: 10px;margin-bottom: 10px;">
+      <el-button size="small" type="text" @click="commit">保存</el-button>
+      <el-divider direction="vertical" />
+      <el-button size="small" type="text" @click="cancel">返回</el-button>
+    </div>
+    <el-form ref="form" :model="addModel" label-width="70px" :rules="rules">
+      <el-form-item label="角色:" prop="memberId" style="display:inline-block">
+        <el-select v-model="addModel.memberId" placeholder="" style="width:145px" size="mini" @change="changeMember">
+          <el-option
+            v-for="item in memberList"
+            :key="item.id"
+            :label="item.label"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="总分:" prop="fullMarks" style="display:inline-block">
+        <el-input-number v-model="addModel.fullMarks" style="width:145px" :min="0" size="mini" :step="1" />
+      </el-form-item>
+    </el-form>
+    <el-table
+      id="gradeRules"
+      ref="gradeRules"
+      :data="allStepList"
+      border
+      :max-height="tableHeight"
+    >
+      <el-table-column
+        type="index"
+        label="序号"
+        width="80"
+      />
+      <el-table-column
+        prop="description"
+        label="步骤描述"
+      />
+      <el-table-column
+        prop="score"
+        label="分值"
+        width="200"
+      >
+        <template v-if="addModel.memberId == scope.row.memberId" slot-scope="scope">
+          <el-input-number v-model="currentStepMap[scope.row.id]" style="width:145px" :min="0" size="mini" :step="1" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center;font-size: 12px;margin-top: 10px;">
+      <i class="el-icon-info" />
+      <span>角色切换前需对编辑数据进行保存</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import {handleMemberList} from '@/views/newMap/displayNew/utils';
+import { getTrainingStepList, getTrainingPlayers, updateTrainingGradeRules, getTrainingGradeRules } from '@/api/trainingManage';
+export default {
+    name: 'GradeRulesN',
+    data() {
+        return {
+            source: '',
+            trainingId:'',
+            loading:false,
+            allStepList:[],
+            memberList:[],
+            currentStepMap:{}, // 当前角色下各步骤评分 key stepId value 得分
+            gradeRulesMap:{}, // 评分规则map key：memberId value 评分规则
+            addModel:{
+                memberId:'',
+                fullMarks:''
+            },
+            rules:{
+                memberId: [
+                    { required: true, message: '请选择角色', trigger: 'change' }
+                ],
+                fullMarks: [
+                    { required: true, message: '请输入总分', trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+        tableHeight() {
+            const s = 250;
+            const h = this.$store.state.app.height;
+            return h - s;
+        }
+    },
+    methods:{
+        async initData(data, source) {
+            try {
+                this.trainingId = data.id;
+                this.source = source;
+                const stepResp = await getTrainingStepList(data.id);
+                this.allStepList = stepResp.data || [];
+                const gradeResp = await getTrainingGradeRules(data.id);
+                this.gradeRulesMap = {};
+                gradeResp.data.forEach(gradeRule=> {
+                    this.gradeRulesMap[gradeRule.memberId] = gradeRule;
+                });
+                const playerResp = await getTrainingPlayers(data.id);
+                this.memberList = handleMemberList(playerResp.data);
+                if (this.memberList.length > 0) {
+                    this.changeMember(this.memberList[0].id, stepResp);
+                }
+            } catch (e) {
+                console.error(e);
+                this.$message.error('初始化数据失败！');
+            }
+        },
+        changeMember(memberId) {
+            const currentStepMap = {};
+            this.allStepList.forEach(each=>{
+                if (each.memberId == memberId) {
+                    currentStepMap[each.id] = 0;
+                }
+            });
+            if (this.gradeRulesMap[memberId]) {
+                this.addModel.fullMarks = this.gradeRulesMap[memberId].fullMarks;
+                this.gradeRulesMap[memberId].details.forEach(each=>{
+                    currentStepMap[each.elementId] = each.score;
+                });
+            } else {
+                this.addModel.fullMarks = 0;
+            }
+            this.currentStepMap = Object.assign({}, currentStepMap);
+            this.addModel.memberId = memberId;
+        },
+        cancel() {
+            this.addModel.fullMarks = 0;
+            this.addModel.memberId = '';
+            this.gradeRulesMap = {};
+            this.currentStepMap = {};
+            this.allStepList = [];
+            this.trainingId = '';
+            this.$emit('cancel', this.source);
+        },
+        commit() {
+            const that = this;
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    const scoreDetails = [];
+                    let totalScore = 0;
+                    for (const key in this.currentStepMap) {
+                        totalScore += this.currentStepMap[key];
+                        scoreDetails.push({elementId: key, score: this.currentStepMap[key]});
+                    }
+                    if (totalScore !== this.addModel.fullMarks) {
+                        this.$message.error('步骤分总和不等于总分！');
+                        return;
+                    } else if (this.addModel.fullMarks === 0) {
+                        this.$message.error('规则无评分项！');
+                        return;
+                    }
+                    this.gradeRulesMap[this.addModel.memberId] = { memberId: this.addModel.memberId, details: scoreDetails, fullMarks: this.addModel.fullMarks };
+                    this.loading = true;
+                    const gradeRulesList = Object.values(that.gradeRulesMap);
+                    updateTrainingGradeRules(this.trainingId, gradeRulesList).then(resp => {
+                        this.loading = false;
+                        this.$message.success('更新实训评分规则成功！');
+                    }).catch((e) => {
+                        this.loading = false;
+                        console.error(e);
+                        this.$message.error('更新实训评分规则失败！');
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/trainingManage/trackList.vue b/src/views/newMap/display/trainingDesign/trackList.vue
similarity index 87%
rename from src/views/trainingManage/trackList.vue
rename to src/views/newMap/display/trainingDesign/trackList.vue
index b9ab419a0..b5bccf2b3 100644
--- a/src/views/trainingManage/trackList.vue
+++ b/src/views/newMap/display/trainingDesign/trackList.vue
@@ -1,9 +1,11 @@
 <template>
-  <el-dialog v-dialogDrag title="草稿发布轨迹" :visible.sync="dialogVisible" width="1050px" :before-close="doClose" center>
-    <div>
-      <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  <div style="padding: 0 10px;">
+    <div style="text-align: center;padding: 30px 20px;font-size: 16px;font-weight: bold;">草稿发布轨迹</div>
+    <div style="text-align: right;padding-right: 10px;margin-bottom: 10px;">
+      <el-button size="small" type="text" @click="cancel">返回</el-button>
     </div>
-  </el-dialog>
+    <QueryListPage ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </div>
 </template>
 
 <script>
@@ -15,8 +17,6 @@ export default {
     props: {},
     data() {
         return {
-            dialogVisible: false,
-            training: {},
             draftId: '',
             pagerConfig: {
                 pageSize: 'pageSize',
@@ -95,14 +95,13 @@ export default {
             };
             return draftPubTrace(params);
         },
-        doShow(row) {
-            console.log(row);
-            this.draftId = row.id;
+        initData(data) {
+            this.draftId = data.id;
             this.getListData();
-            this.dialogVisible = true;
         },
-        doClose() {
-            this.dialogVisible = false;
+        cancel() {
+            this.draftId = '';
+            this.$emit('cancel');
         },
         covertData(row, key) {
             let s = '否';
diff --git a/src/views/newMap/display/trainingList/poptip.vue b/src/views/newMap/display/trainingList/poptip.vue
new file mode 100644
index 000000000..8a4baa76f
--- /dev/null
+++ b/src/views/newMap/display/trainingList/poptip.vue
@@ -0,0 +1,190 @@
+<template>
+  <div id="pop_tip_dialog" class="pop-dialog" :style="{ height: 'auto', left: tPosition.x+'px', top: tPosition.y+'px' }">
+    <div ref="tipRef" class="pop-content" :style="{ width: width + 'px',textAlign: textAlign }">
+      <p style="color: black;" v-html="tip" />
+      <div v-show="tPosition.align === 'top'" x-arrow class="popper__arraw_top" :style="{left: arrawLeft+'px'}" />
+      <div v-show="tPosition.align === 'bottom'" x-arrow class="popper__arraw_bottom" :style="{left: arrawLeft+'px'}" />
+      <div v-show="tPosition.align === 'right'" x-arrow class="popper__arraw_right"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+    name: 'PopTip',
+    props: {
+        position: {
+            type: Object,
+            required: true,
+            default: function () {
+                return {
+                    x: 0,
+                    y: 0
+                };
+            }
+        },
+        tip: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            defaultFontSize: 14,
+            maxWidth: 300,
+            tPosition: {
+                x: -300,
+                y: -300,
+                align: 'bottom'
+            },
+            offset: 7,
+            textAlign: 'center'
+        };
+    },
+    computed: {
+        width() {
+            let width = this.tip.length * this.defaultFontSize + 40;
+            if (width > this.maxWidth) {
+                width = this.maxWidth;
+            }
+            let parentWidth = 0;
+            if (this.position.fontNumber) {
+                parentWidth = this.position.fontNumber * this.defaultFontSize + 40;
+            }
+            return parentWidth || width;
+        },
+        arrawLeft() {
+            return this.width / 5;
+        }
+    },
+    watch: {
+        'position.x': function (val) {
+            this.resetShowPosition();
+        },
+        'position.y': function (val) {
+            this.resetShowPosition();
+        },
+        'tip': function (val) {
+            this.resetShowPosition();
+        }
+    },
+    mounted() {
+        this.resetShowPosition();
+    },
+    methods: {
+        resetShowPosition() {
+            this.$nextTick(() => {
+                // 位置
+                const height = this.$el.clientHeight;
+
+                this.tPosition.align = this.position.align || 'bottom';
+                this.tPosition.x = this.position.x - (this.arrawLeft + this.offset);
+
+                this.textAlign = this.position.textAlign || 'center';
+                if (this.tPosition.align == 'top') {
+                    const distance = 47;
+                    this.tPosition.y = this.position.y + (distance);
+                } else if (this.tPosition.align == 'bottom') {
+                    const distance = 5;
+                    this.tPosition.y = this.position.y - (height + distance);
+                } else if (this.tPosition.align == 'right') {
+                    this.tPosition.x = this.position.x + (this.width / 2) + 5;
+                }
+                if (this.tPosition.x < 0) this.tPosition.x = 0;
+                if (this.tPosition.y < 0) this.tPosition.y = 0;
+            });
+        },
+        reset() {
+            this.tPosition = {
+                x: -300,
+                y: -300
+            };
+        }
+    }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+    $bg: #FFDD00;
+    $hoverBg: #f5f7fa;
+
+    .pop-dialog {
+        background-color: $bg;
+        border-radius: 6px;
+        position: fixed;
+        padding: 7px 0px;
+        z-index: 9998;
+
+        .pop-content {
+            .popper__arraw_bottom {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+
+            .popper__arraw_top {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                top: -7px;
+				background: $bg;
+				-moz-transform: rotate(45deg);
+				-webkit-transform: rotate(45deg);
+				-o-transform: rotate(45deg);
+				transform: rotate(45deg);
+            }
+			.popper__arraw_right {
+				position: absolute;
+				height: 14px;
+				width: 14px;
+				left: -8px;
+				top: 10px;
+				background: $bg;
+				-moz-transform: rotate(45deg);
+				-webkit-transform: rotate(45deg);
+				-o-transform: rotate(45deg);
+				transform: rotate(45deg);
+			}
+            .popper__arraw_left {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                left: -7px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+
+            .popper__arraw_right {
+                position: absolute;
+                height: 14px;
+                width: 14px;
+                right: -7px;
+                background: $bg;
+                -moz-transform: rotate(45deg);
+                -webkit-transform: rotate(45deg);
+                -o-transform: rotate(45deg);
+                transform: rotate(45deg);
+            }
+        }
+
+        .dsp-block {
+            display: block;
+            text-align: left;
+            padding: 6px 15px;
+            width: 100%;
+            border-radius: unset;
+        }
+
+        .dsp-block:hover {
+            background-color: $hoverBg;
+        }
+    }
+</style>
diff --git a/src/views/designPlatform/scenePlayRole.vue b/src/views/newMap/display/trainingList/scenePlayRole.vue
similarity index 90%
rename from src/views/designPlatform/scenePlayRole.vue
rename to src/views/newMap/display/trainingList/scenePlayRole.vue
index 8669a667d..0505431f1 100644
--- a/src/views/designPlatform/scenePlayRole.vue
+++ b/src/views/newMap/display/trainingList/scenePlayRole.vue
@@ -67,12 +67,13 @@ export default {
         doShow() {
             const playerList = JSON.parse(this.trainingDetail.playerIdJson);
             const memberData = this.$store.state.training.memberData;
-            const activeTrainList = this.$store.state.map.activeTrainList || [];
             const newMemberData = {};
             playerList.forEach(playerId => {
-                newMemberData[playerId] = memberData[playerId];
+                if (memberData[playerId] && (memberData[playerId].type === 'STATION_SUPERVISOR' || memberData[playerId].type === 'DISPATCHER')) {
+                    newMemberData[playerId] = memberData[playerId];
+                }
             });
-            const result = covertMemberData(activeTrainList, Object.values(newMemberData));
+            const result = covertMemberData([], Object.values(newMemberData));
             let list = [];
             result.deviceListData.forEach(item => {
                 list = list.concat(item);
diff --git a/src/views/newMap/display/trainingList/testResult.vue b/src/views/newMap/display/trainingList/testResult.vue
new file mode 100644
index 000000000..710dc6874
--- /dev/null
+++ b/src/views/newMap/display/trainingList/testResult.vue
@@ -0,0 +1,62 @@
+<template>
+  <el-dialog
+    title="测试成绩"
+    :visible.sync="dialogVisible"
+    width="30%"
+    append-to-body
+    :before-close="handleClose"
+  >
+    <el-table :data="tableData" border show-summary style="width: 100%">
+      <el-table-column prop="desc" label="步骤" />
+      <el-table-column prop="totalScore" label="总分" width="100" />
+      <el-table-column prop="score" label="得分" width="100" />
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'TestResult',
+    data() {
+        return {
+            dialogVisible: false,
+            scoreList: [],
+            stepList: [],
+            scoringRuleList: [],
+            tableData: []
+        };
+    },
+    methods: {
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        doShow(scoreList, stepList, scoringRuleList) {
+            this.scoreList = scoreList;
+            this.stepList = stepList;
+            this.scoringRuleList = scoringRuleList;
+            this.tableData = [];
+            this.scoringRuleList.forEach(item => {
+                const desc = this.handleStepInfo(item.elementId);
+                const score = this.handleScore(item.elementId);
+                this.tableData.push({ desc: desc, score: score, totalScore: item.score });
+            });
+            this.dialogVisible = true;
+        },
+        handleStepInfo(stepId) {
+            const stepInfo = this.stepList.find(step => stepId == step.id);
+            return stepInfo ? stepInfo.description : '';
+        },
+        handleScore(stepId) {
+            const rule = this.scoreList.find(item => stepId == item.elementId);
+            return rule ? rule.score : 0;
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/newMap/display/trainingList/trainingLeftSlider.vue b/src/views/newMap/display/trainingList/trainingLeftSlider.vue
new file mode 100644
index 000000000..ee14299c6
--- /dev/null
+++ b/src/views/newMap/display/trainingList/trainingLeftSlider.vue
@@ -0,0 +1,161 @@
+<template>
+  <div id="leftSlider" class="left-slider">
+    <div class="tip-title">
+      <span>实训列表</span>
+    </div>
+    <div class="handleShow">
+      <span v-if="!show" class="el-icon-arrow-left" style="cursor:pointer" @click="handleSliderShow(false)" />
+    </div>
+    <div class="slider-tree">
+      <el-scrollbar wrap-class="scrollbar-wrapper" style="background: #fff;">
+        <template v-for="(training, index) in trainingList">
+          <div :key="training.id" class="training-name-box" :class="{'active': trainingDetail && trainingDetail.id === training.id}" @click="loadScript(training)">
+            <span>{{ `${index + 1}、${training.name}` }}</span>
+          </div>
+        </template>
+      </el-scrollbar>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getPublishTrainingListInOrg, getPublishTrainingDetail, loadPublishTraining } from '@/api/jmap/training';
+import { EventBus } from '@/scripts/event-bus';
+export default {
+    name: 'LeftSlider',
+    data() {
+        return {
+            show: true,
+            treeList: [],
+            defaultProps: '',
+            trainingList: ''
+        };
+    },
+    computed: {
+        mapId () {
+            return this.$route.query.mapId;
+        },
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        },
+        group () {
+            return this.$route.query.group;
+        },
+        trainingSwitch() {
+            return this.$store.state.trainingNew.trainingSwitch;
+        }
+    },
+    mounted() {
+        EventBus.$on('handleSliderShow', () => {
+            if (!this.trainingList || !this.trainingList.length) {
+                this.initLoadPage();
+            }
+            this.handleSliderShow(true);
+        });
+    },
+    methods: {
+        initLoadPage() {
+            const trainingType = this.$store.state.training.domConfig ? this.$store.state.training.domConfig.trainingType : '';
+            // labels: ['车站', '控制权']
+            const data = {mapId: this.mapId, type: trainingType.toLowerCase()};
+            if (this.$route.query.labels) {
+                const labels = this.$route.query.labels.split('-');
+                const labelMap = { loc: '现地', dis: '行调', section: '区段', signal: '信号机', switch: '道岔', stand: '站台', station: '车站', control: '控制权' };
+                const newLabels = [];
+                labels.forEach(item => newLabels.push(labelMap[item]));
+                data.labels = newLabels;
+            }
+            getPublishTrainingListInOrg(data).then(response => {
+                this.trainingList = response.data;
+                EventBus.$emit('setTrainingList', this.trainingList);
+            }).catch(error => {
+                this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
+            });
+        },
+        handleSliderShow(flag) {
+            this.$emit('overallTranslation', flag);
+            const slider = document.getElementById('leftSlider');
+            if (flag) {
+                slider.style.transform = 'translateX(0)';
+                this.show = false;
+            } else {
+                slider.style.transform = '';
+                this.show = true;
+            }
+        },
+        async loadScript(training) {
+            if (this.trainingSwitch) {
+                this.$message.error('请先结束当前实训后再加载新的实训！');
+                return;
+            }
+            try {
+                const detailResp = await getPublishTrainingDetail(training.id);
+                this.training = detailResp.data;
+                if (detailResp.data.mapLocationJson) {
+                    const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                }
+                this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
+                await loadPublishTraining(this.group, training.id, {mode: ''});
+                this.$message.success('加载实训成功！');
+            } catch (e) {
+                this.$message.error('加载实训失败！');
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+.left-slider{
+	z-index: 900;
+	width: 400px;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+	transform: translateX(-400px);
+}
+.training-name-box{
+	padding: 5px;
+	font-size: 16px;
+	color: green;
+	margin-left: 10px;
+	cursor: pointer;
+}
+.training-name-box :hover{
+	color: red;
+}
+.active {
+	color: red;
+}
+.slider-tree{
+	height: calc(100% - 40px);
+	border: 2px solid #409EFF;
+}
+.handleShow{
+	position: absolute;
+	left: 395px;
+	top: 50%;
+	background: #fff;
+	color: #000;
+	border-radius: 3px;
+	box-shadow: 3px 1px 5px #000;
+	padding: 3px;
+}
+.tip-title {
+	width: 100%;
+	overflow: hidden;
+	height: 40px;
+	display: flex;
+	align-items: center;
+	flex-direction: row-reverse;
+	background-color: #409EFF;
+	border-radius: 5px 5px 0 0;
+	justify-content: center;
+	padding: 0 10px;
+	color: #fff;
+	font-size: 18px;
+	text-align: center;
+}
+</style>
diff --git a/src/views/designPlatform/trainingMenu.vue b/src/views/newMap/display/trainingList/trainingMenu.vue
similarity index 65%
rename from src/views/designPlatform/trainingMenu.vue
rename to src/views/newMap/display/trainingList/trainingMenu.vue
index 07c6f9114..4f199b557 100644
--- a/src/views/designPlatform/trainingMenu.vue
+++ b/src/views/newMap/display/trainingList/trainingMenu.vue
@@ -3,14 +3,15 @@
   <div v-quickMenuDrag class="reminder-drag" :style="{bottom: offsetBottom + 'px'}">
     <div ref="drapBox" class="reminder-box">
       <div class="tip-title">
-        <div>
-          <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
-          <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
+        <div style="display: flex;justify-content: center;align-items: center;">
+          <i v-if="!trainingDesign" class="icon el-icon-document" @click="trainingListShow" />
           <i v-show="!isShrink && !trainingSwitch && trainingDetail" class="icon el-icon-video-play" @click="handlerStart" />
           <i v-show="!isShrink && trainingSwitch" class="icon el-icon-switch-button" @click="handlerEnd" />
+          <i v-show="isShrink" class="icon el-icon-minus" @click="shrink" />
+          <i v-show="!isShrink" class="icon el-icon-plus" @click="shrink" />
         </div>
         <p style="color: #fff;">
-          <span>{{ trainingDetail.name }}</span>
+          <span>{{ trainingDetail ?trainingDetail.name:'' }}</span>
         </p>
       </div>
       <div v-if="isShrink" class="reminder-box-content">
@@ -20,11 +21,7 @@
             <el-scrollbar wrap-class="scrollbar-wrapper">
               <p class="list-item">
                 <span class="list-label">{{ $t('display.training.trainingName') }}</span>
-                <span class="list-elem">{{ trainingDetail.name }}</span>
-              </p>
-              <p v-if="demoMode === TrainingMode.TEST" class="list-item">
-                <span class="list-label">{{ $t('display.lesson.score') }}</span>
-                <span class="list-elem">{{ trainingScore }}</span>
+                <span class="list-elem">{{ trainingDetail ?trainingDetail.name:'' }}</span>
               </p>
               <p class="list-item">
                 <span class="list-label">实训模式：</span>
@@ -38,7 +35,7 @@
               </p>
               <p class="list-item">
                 <span class="list-label" style="vertical-align: top;"> {{ $t('display.training.trainingInstructions') }}</span>
-                <span class="list-elem elem-span">{{ trainingDetail.description }}</span>
+                <span class="list-elem elem-span">{{ trainingDetail ?trainingDetail.description:'' }}</span>
               </p>
               <p class="list-item">
                 <span class="list-label">操作按钮：</span>
@@ -47,6 +44,14 @@
                   <el-button v-if="trainingSwitch" size="small" type="danger" @click="handlerEnd">结束</el-button>
                 </span>
               </p>
+              <p class="list-item">
+                <span class="list-label">上 一 题：</span>
+                <span class="list-elem elem-span training-box" @click="loadTraining(previousTraining)">{{ previousTraining? previousTraining.name: '' }}</span>
+              </p>
+              <p class="list-item">
+                <span class="list-label">下 一 题：</span>
+                <span class="list-elem elem-span training-box" @click="loadTraining(nextTraining)">{{ nextTraining? nextTraining.name:'' }}</span>
+              </p>
             </el-scrollbar>
           </div>
           <div class="drag-right" />
@@ -57,18 +62,20 @@
       </div>
     </div>
     <scene-play-role ref="scenePlayRole" @startTraining="startTraining" />
+    <test-result ref="testResult" />
   </div>
 </template>
 
 <script>
 import { ScriptMode } from '@/scripts/ConstDic';
-import { clearSimulation } from '@/api/simulation';
-import { startTraining, endTraining } from '@/api/jmap/training';
+import { startTraining, endTraining, getPublishTrainingDetail, loadPublishTraining } from '@/api/jmap/training';
 import ScenePlayRole from './scenePlayRole';
-
+import TestResult from './testResult';
+import { EventBus } from '@/scripts/event-bus';
 export default {
     name: 'TipTrainingDetail',
     components: {
+        TestResult,
         ScenePlayRole
     },
     props: {
@@ -80,18 +87,20 @@ export default {
     data() {
         return {
             isShrink: true,
-            showSumbit: false,
             demoMode: ScriptMode.TEACH,
-            TrainingMode: ScriptMode
+            TrainingMode: ScriptMode,
+            activeName: 'first',
+            training: {},
+            trainingDesign: false,
+            trainingList: [],
+            nextTraining: null,
+            previousTraining: null
         };
     },
     computed: {
         trainingSwitch() {
             return this.$store.state.trainingNew.trainingSwitch;
         },
-        trainingScore() {
-            return this.$store.state.trainingNew.trainingScore;
-        },
         trainingDetail() {
             return this.$store.state.trainingNew.trainingDetail;
         },
@@ -100,15 +109,28 @@ export default {
         },
         teachMode() {
             return this.$store.state.trainingNew.teachMode;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    watch: {
+        '$store.state.trainingNew.trainingDetail': function(val) {
+            this.initAdjacentTraining();
         }
     },
-    watch: {},
     mounted() {
-        this.loadInitData();
+        EventBus.$on('setTrainingList', (trainingList) => {
+            this.trainingList = trainingList;
+            this.initAdjacentTraining();
+        });
+        this.trainingDesign = this.$store.state.training.domConfig.trainingDesign;
     },
     methods: {
-        loadInitData() {
-            this.showSumbit = false;
+        initAdjacentTraining() {
+            const index = this.trainingList.findIndex(training => this.trainingDetail && training.id === this.trainingDetail.id);
+            this.previousTraining = this.trainingList[index - 1];
+            this.nextTraining = this.trainingList[index + 1];
         },
         shrink() {
             if (this.isShrink) {
@@ -138,25 +160,43 @@ export default {
             this.$store.dispatch('trainingNew/changeTeachMode', this.demoMode);
             startTraining(this.group, {mode: this.demoMode}).then(() => {
                 this.$store.dispatch('trainingNew/trainingStart');
-                this.$store.dispatch('trainingNew/setTrainingScore', '');
             }).catch(() => {
                 this.$message.error('开始实训失败！');
             });
         },
         handlerEnd() {
-            endTraining(this.group).then((resp) => {
+            const scoreList = this.$store.state.trainingNew.scoreList;
+            if (this.demoMode === ScriptMode.TEST) {
+                const scoringRules = this.$store.state.trainingNew.scoringRules;
+                const scoringRule = scoringRules.find(rule => rule.memberId == this.$store.state.training.myMemberId);
+                this.$refs.testResult.doShow(scoreList, this.$store.state.trainingNew.stepList, scoringRule ? scoringRule.details : []);
+            }
+            endTraining(this.group, scoreList).then((resp) => {
                 this.$store.dispatch('trainingNew/trainingEnd');
-                this.$store.dispatch('socket/clearTrainingStepTip');
-                this.$store.dispatch('trainingNew/clearStepOrder');
-                this.$store.dispatch('trainingNew/clearOperateOrder');
-                this.$store.dispatch('trainingNew/setTrainingScore', resp.data);
             }).catch(() => {
                 this.$message.error('结束实训失败！');
             });
         },
-        back() {
-            if (this.group) {
-                clearSimulation(this.group);
+        trainingListShow() {
+            EventBus.$emit('handleSliderShow');
+        },
+        async loadTraining(training) {
+            if (this.trainingSwitch) {
+                this.$message.error('请先结束当前实训后再加载新的实训！');
+                return;
+            }
+            try {
+                const detailResp = await getPublishTrainingDetail(training.id);
+                this.training = detailResp.data;
+                if (detailResp.data.mapLocationJson) {
+                    const mapLocation = JSON.parse(detailResp.data.mapLocationJson);
+                    this.$jlmap.updateTransform(mapLocation.scale, {x:mapLocation.x, y:mapLocation.y});
+                }
+                this.$store.dispatch('trainingNew/setTrainingDetail', detailResp.data);
+                await loadPublishTraining(this.group, training.id, {mode: ''});
+                this.$message.success('加载实训成功！');
+            } catch (e) {
+                this.$message.error('加载实训失败！');
             }
         }
     }
@@ -164,7 +204,16 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 @import "src/styles/mixin.scss";
-
+.list-item{
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+.training-box{
+	cursor: pointer;
+}
+.training-box:hover{
+	color: dodgerblue;
+}
 .tip-body-box {
 	height: 260px;
 	position: absolute;
@@ -175,9 +224,9 @@ export default {
 
 .reminder-drag{
 	position: absolute;
-	bottom: 0px;
+	bottom: 0;
 	left: 15px;
-	z-index: 10;
+	z-index: 40;
 }
 
 .elem-span{
@@ -204,7 +253,7 @@ export default {
 	border-radius: 5px;
 	overflow: hidden;
 	z-index: 10;
-	font-size: 18px;
+	font-size: 16px;
 
 	.tip-title {
 		width: 500px;
diff --git a/src/views/newMap/display/trainingList/trainingPositionTip.vue b/src/views/newMap/display/trainingList/trainingPositionTip.vue
new file mode 100644
index 000000000..bbdb0907a
--- /dev/null
+++ b/src/views/newMap/display/trainingList/trainingPositionTip.vue
@@ -0,0 +1,251 @@
+<template>
+  <div v-if="tipShow">
+    <pop-tip v-show="popShow" :position="position" :tip="tip" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import PopTip from './poptip';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { getDomOffset } from '@/utils/index';
+import { ScriptMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+export default {
+    name: 'TrainingTips',
+    components: { PopTip },
+    data() {
+        return {
+            tipShow: false,
+            popShow: false,
+            position: {
+                x: 0,
+                y: 0
+            },
+            tip: ''
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'canvasWidth',
+            'canvasHeight'
+        ]),
+        trainingDetail() {
+            return this.$store.state.trainingNew.trainingDetail;
+        },
+        teachMode() {
+            return this.$store.state.trainingNew.teachMode;
+        },
+        myMemberId() {
+            return this.$store.state.training.myMemberId;
+        }
+    },
+    watch: {
+        '$store.state.trainingNew.stepInfo': function(val) {
+            let awaitOperateFlag = false;
+            if (val && val.tipPosition && val.tipPosition.domId === OperationEvent.StationControl.requestStationControl.awaitAlarm.operation) {
+                awaitOperateFlag = !document.getElementById(OperationEvent.StationControl.requestStationControl.awaitAlarm.domId);
+            }
+            if (val && this.trainingDetail && this.trainingDetail.type === 'SINGLE' && val.memberId == this.myMemberId && !awaitOperateFlag) {
+                this.tipInit();
+            } else {
+                this.tip = '';
+                this.popShow = false;
+                this.tipShow = false;
+            }
+        },
+        '$store.state.trainingNew.voiceStepIndex': function(val) {
+            if (val > -1 && this.trainingDetail && this.trainingDetail.type === 'SINGLE') {
+                this.tipInit();
+            } else {
+                this.tip = '';
+                this.popShow = false;
+                this.tipShow = false;
+            }
+        },
+        '$store.state.socket.trainingOverCount': function(val) {
+            this.tip = '';
+            this.popShow = false;
+            this.tipShow = false;
+            this.position = { x: 0, y: 0 };
+        },
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            this.tip = '';
+            this.popShow = false;
+            this.tipShow = false;
+            this.position = { x: 0, y: 0 };
+        },
+        '$store.state.training.tipEvent': function (val) {
+            setTimeout(() => {
+                if (this.tip) {
+                    this.tipInit();
+                }
+            }, 10);
+        },
+        '$store.state.socket.msgHead': function (val) {
+            if (val && val.success) {
+                const stepInfo = this.$store.state.trainingNew.stepInfo;
+                const domId = OperationEvent.StationControl.requestStationControl.awaitAlarm.operation;
+                if (val && val.sourceMemberId == this.$store.state.training.myMemberId && stepInfo && stepInfo.tipPosition && stepInfo.tipPosition.domId === domId) {
+                    setTimeout(() => { this.tipInit(); }, 10);
+                }
+            }
+        }
+    },
+    methods: {
+        async tipInit() {
+            if (this.teachMode === ScriptMode.TEACH) {
+                this.tipShow = true;
+                const offset = this.$store.state.config.canvasOffset;
+                let stepInfo = {};
+                if (this.$store.state.trainingNew.voiceStepIndex > -1) {
+                    stepInfo = this.$store.state.trainingNew.voiceStepList[this.$store.state.trainingNew.voiceStepIndex];
+                    if (!stepInfo) { return; }
+                } else {
+                    stepInfo = this.$store.state.trainingNew.stepInfo;
+                }
+                const distance = 5;
+                this.tip = stepInfo ? stepInfo.description : '';
+                if (stepInfo.tipPosition && stepInfo.tipPosition.deviceCode) {
+                    const position = this.getShapeTipPoint(stepInfo.tipPosition);
+                    if (position) {
+                        this.position = {
+                            x: position.x + offset.x,
+                            y: position.y + offset.y - distance
+                        };
+                        this.popTipShow();
+                    }
+                } else if (stepInfo.tipPosition && stepInfo.tipPosition.domId) {
+                    const position = await this.getOtherTipPoint(stepInfo.tipPosition);
+                    if (position) {
+                        this.position = position;
+                        this.position.y -= distance;
+                        this.popTipShow();
+                    }
+                } else {
+                    this.popTipHide();
+                }
+            } else {
+                this.tipShow = false;
+            }
+        },
+        popTipShow() {
+            this.popShow = true;
+        },
+        popTipHide() {
+            this.popShow = false;
+        },
+        // 获取地图设备提示位置
+        getShapeTipPoint(tipPosition) {
+            var position = null;
+            // 单独处理 自动折返
+            const newTipPosition = Object.assign({}, tipPosition);
+            if (newTipPosition.deviceCode.includes('Cycle')) {
+                const buttonList = this.$store.state.map.map.cycleButtonList;
+                if (buttonList && buttonList.length > 0) {
+                    buttonList.forEach(element => {
+                        if (element.cycleCode == newTipPosition.code) {
+                            newTipPosition.deviceCode = element.code;
+                        }
+                    });
+                }
+            }
+            let subDeviceType = '';
+            if (newTipPosition.subType) { subDeviceType = newTipPosition.subType; } else { subDeviceType = newTipPosition.type; }
+            position = this.$jlmap.getShapeTipPoint({
+                code: newTipPosition.deviceCode,
+                subDeviceType: subDeviceType
+            });
+            if (position) {
+                if (position.x < 0) {
+                    position.x = 0;
+                }
+                if (position.x > this.canvasWidth) {
+                    position.x = this.canvasWidth;
+                }
+                if (position.y < 0) {
+                    position.y = 0;
+                }
+                if (position.y > this.canvasHeight) {
+                    position.y = this.canvasHeight;
+                }
+            }
+            return position;
+        },
+        // 获取地图菜单按钮和对话框按钮提示显示位置
+        getOtherTipPoint(tipPosition) {
+            const domId = OperationHandler.getDomIdByOperation(tipPosition.domId);
+            if (!domId) { return null; }
+            return new Promise(async(resolve, reject) => {
+                try {
+                    let btnDom = document.getElementById(domId);
+                    if (!btnDom) {
+                        btnDom = await this.getAwaitDom(domId);
+                    }
+                    if (btnDom) {
+                        const offset = getDomOffset(btnDom);
+                        if (offset.x == 0 && offset.y == 0) {
+                            resolve(null);
+                        }
+
+                        let align = 'bottom';
+                        if (/{RIGHT}/.test(domId)) {
+                            align = 'right';
+                        } else if (this.tipAlignIsTop(tipPosition, domId)) {
+                            align = 'top';
+                        }
+                        // const width = align === 'right' ? 0 : btnDom.clientWidth / 2;
+                        resolve({
+                            align: align,
+                            x: offset.x + btnDom.clientWidth / 2,
+                            y: offset.y
+                        });
+                    } else {
+                        resolve(null);
+                    }
+                } catch (err) {
+                    resolve(null);
+                }
+            });
+        },
+        getAwaitDom(domId) {
+            return new Promise((resolve) => {
+                setTimeout(() => {
+                    const btnDom = document.getElementById(domId);
+                    if (btnDom) {
+                        resolve(btnDom);
+                    } else {
+                        resolve(null);
+                    }
+                }, 300);
+            });
+        },
+        tipAlignIsTop(step, domId) {
+            // 如果是tip框则箭头朝上
+            // if (step.type.toUpperCase() === 'bar'.toUpperCase()) {
+            //     return true;
+            // }
+            const Dom = document.getElementById(domId);
+            if (Dom.parentElement.id == 'menuButtons_box') { // 现地操作按钮提示位置判断
+                return false;
+            }
+
+            if (/{TOP}/.test(domId)) {
+                return true;
+            }
+            if (/{BOTTOM}/.test(domId)) {
+                return false;
+            }
+            // 如果domId中不含以下关键字，则箭头朝上
+            const keyList = ['choose', 'select'];
+            for (var key in keyList) {
+                if (domId.toUpperCase().indexOf(keyList[key].toUpperCase()) !== -1) {
+                    return false;
+                }
+            }
+            // 其他情况默认朝下
+            return true;
+        }
+    }
+};
+</script>
diff --git a/src/views/designPlatform/trainingTip.vue b/src/views/newMap/display/trainingList/trainingTip.vue
similarity index 66%
rename from src/views/designPlatform/trainingTip.vue
rename to src/views/newMap/display/trainingList/trainingTip.vue
index 94c54fc22..bf1292129 100644
--- a/src/views/designPlatform/trainingTip.vue
+++ b/src/views/newMap/display/trainingList/trainingTip.vue
@@ -18,19 +18,17 @@ export default {
         },
         trainingDetail() {
             return this.$store.state.trainingNew.trainingDetail;
+        },
+        myMemberId() {
+            return this.$store.state.training.myMemberId;
         }
     },
     watch: {
-        '$store.state.socket.trainingStepTip': function(val) {
-            if (val && this.trainingDetail.type === 'SCENE') {
-                const member = this.$store.state.training.memberData[val.memberId];
-                this.$nextTick(function() {
-                    this.$store.dispatch('trainingNew/clearOperateOrder');
-                    this.$store.dispatch('trainingNew/stepOrderIncrease');
-                    if (member.userId == this.$store.state.user.id && (this.teachMode === ScriptMode.TEACH || this.teachMode === ScriptMode.PRACTICE)) {
-                        this.trainingTipMessage = val.content;
-                    }
-                });
+        '$store.state.trainingNew.stepInfo': function(val) {
+            if (val && val.memberId == this.myMemberId && this.trainingDetail.type === 'SCENE' && (this.teachMode === ScriptMode.TEACH || this.teachMode === ScriptMode.PRACTICE)) {
+                this.trainingTipMessage = val.description;
+            } else {
+                this.trainingTipMessage = '';
             }
         },
         '$store.state.trainingNew.trainingSwitch': function(val) {
@@ -38,15 +36,12 @@ export default {
                 this.trainingTipMessage = '';
             }
         },
-        '$store.state.socket.trainingStepFinishCount': function(val) {
-            this.trainingTipMessage = '';
-        },
         '$store.state.socket.trainingOverCount': function(val) {
-            if (this.teachMode === ScriptMode.TEACH) {
+            if (this.teachMode === ScriptMode.TEACH || this.teachMode === ScriptMode.PRACTICE) {
                 this.trainingTipMessage = '实训完成，请点击结束按钮。';
             }
         },
-        '$store.state.training.operateErrMsg': function (val) {
+        '$store.state.trainingNew.operateErrMsg': function (val) {
             this.tipInfo({ color: val.color, message: val.errMsg });
         }
     },
@@ -77,7 +72,7 @@ export default {
 	color: #000;
 	line-height: 180%;
 	// z-index: 1501;
-	z-index: 35;
+	z-index: 39;
 	font-size: 14px;
 }
 </style>
diff --git a/src/views/newMap/displayBaSiDi/baSiDiNew.vue b/src/views/newMap/displayBaSiDi/baSiDiNew.vue
deleted file mode 100644
index be5ff9da0..000000000
--- a/src/views/newMap/displayBaSiDi/baSiDiNew.vue
+++ /dev/null
@@ -1,353 +0,0 @@
-<template>
-  <div v-dialogDrag>
-    <div style="height: 130px;width: 100%;" class="el-dialog">
-      <div class="el-dialog__header" />
-      <div class="haerbin-01__systerm nav el-dialog__body">
-        <el-row style="padding: 3px;">
-          <el-col :span="20">
-            <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;height: 132px;">
-              <el-row style="padding: 4px;">
-                <div class="tip-content-box">
-                  <div v-if="tipContent[0]">{{ `${tipContent[0].level}` }}</div>
-                  <div v-if="tipContent[0]">{{ `${tipContent[0].time}` }}</div>
-                  <div v-if="tipContent[0]">{{ `${tipContent[0].confirm ? '确认': '未确认'}` }}</div>
-                </div>
-                <div class="tip-content-box">
-                  <div v-if="tipContent[1]">{{ `${tipContent[1].level}` }}</div>
-                  <div v-if="tipContent[1]">{{ `${tipContent[1].time}` }}</div>
-                  <div v-if="tipContent[1]">{{ `${tipContent[1].confirm ? '确认': '未确认'}` }}</div>
-                </div>
-                <div class="tip-content-box">
-                  <div v-if="tipContent[2]">{{ `${tipContent[2].level}` }}</div>
-                  <div v-if="tipContent[2]">{{ `${tipContent[2].time}` }}</div>
-                  <div v-if="tipContent[2]">{{ `${tipContent[2].confirm ? '确认': '未确认'}` }}</div>
-                </div>
-              </el-row>
-              <div style="padding: 5px;height:20px;line-height: 20px;border-top: 2px solid #DDD9CA;display: flex;justify-content: space-between;">
-                <div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('rpsDialog')">背投</div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('carPack')">车场</div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('troDialog')">轨道</div>
-                  <div class="div-simulate-button" style="width: 40px;">系统</div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('traDialog')">列车</div>
-                </div>
-                <div>
-                  <div class="div-simulate-button" style="width: 40px;">联锁</div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('tmtDialog')">列监</div>
-                  <div class="div-simulate-button" style="width: 40px;">运图</div>
-                  <div class="div-simulate-button" style="width: 55px;" @click="handleDialogShow('ttlDialog')">时刻表</div>
-                  <div class="div-simulate-button" style="width: 40px;">编表</div>
-                  <div class="div-simulate-button" style="width: 40px;" @click="handleDialogShow('atrDialog')">调度</div>
-                  <div class="div-simulate-button" style="width: 40px;">站控</div>
-                  <div class="div-simulate-button" style="width: 40px;">计划</div>
-                </div>
-                <div>
-                  <div class="div-simulate-button" style="width: 40px;">SDM</div>
-                </div>
-                <div>
-                  <div class="div-simulate-button" style="width: 55px;">管理员</div>
-                  <div class="div-simulate-button" style="width: 40px;">职权</div>
-                </div>
-                <div>
-                  <div class="div-simulate-button" style="width: 40px;">拷屏</div>
-                  <div class="div-simulate-button" style="width: 40px;">录放</div>
-                  <div class="div-simulate-button" style="width: 40px;">布局</div>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :span="2">
-            <div style="width: calc(100% - 10px);border: 2px solid #DDD9CA;border-radius: 1px;">
-              <el-row style="margin-top: 20px;margin-bottom: 18px;">
-                <el-col :span="16">
-                  <el-row class="button-row">
-                    <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelA || isNoConfirmLevelA?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelA}" @click="showHimAlarm('A')">A</div>
-                    <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelB || isNoConfirmLevelB?'#F00':'#DDD' }" :class="{'headerBox' :isNoConfirmLevelB}" @click="showHimAlarm('B')">B</div>
-                    <div style="width: 25px;" class="div-simulate-button" :style="{background:isNoRecoverLevelC?'#F00':'#DDD' }" @click="showHimAlarm('C')">C</div>
-                  </el-row>
-                  <el-row class="button-row" style="margin-top: 20px;">
-                    <div style="width: 40px;" class="div-simulate-button" @click="showDiary">日记</div>
-                    <div style="width: 40px;" class="div-simulate-button" @click="showDiary">命令</div>
-                  </el-row>
-                </el-col>
-                <el-col :span="8">
-                  <div style="width: 40px;height: 60px;line-height: 60px;" class="div-simulate-button" @click="controlAudio(false)">静音</div>
-                </el-col>
-              </el-row>
-              <el-row class="button-row" style="margin: 10px 0;">
-                <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">档案</div>
-                <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">归档</div>
-                <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">统计</div>
-              </el-row>
-            </div>
-          </el-col>
-          <el-col :span="2" style="border: 2px solid #DDD9CA;border-radius: 1px;">
-            <el-row style="height: 88px;">
-              <div style="font-size: 15px;color: #000;display: flex;justify-content: space-around;align-items: center;margin-top: 40px;">
-                <span>{{ dateString }}</span>
-                <span>{{ time }}</span>
-              </div>
-            </el-row>
-            <el-row class="button-row" style="margin: 10px 0;">
-              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">锁屏</div>
-              <div style="width: 40px;" class="div-simulate-button" @click="undeveloped">退出</div>
-            </el-row>
-          </el-col>
-        </el-row>
-      </div>
-      <alarm-table-hmi ref="alarmTableHmi" />
-      <log-detail ref="logDetail" />
-      <audio id="buzzer" controls loop="loop" style="width: 0;height: 0">
-        <source :src="buzzerAudio" type="audio/mpeg">
-      </audio>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import BuzzerAudio from '@/assets/buzzer.mp3';
-import AlarmTableHmi from '@/jmapNew/theme/nanjing_02/menus/menuDialog/alarmTableHmi';
-import LogDetail from '@/jmapNew/theme/nanjing_02/menus/menuDialog/logDetail';
-import { timestampFormat } from '@/utils/date';
-export default {
-    name: 'BaSiDi',
-    components: {
-        AlarmTableHmi,
-        LogDetail
-    },
-    data() {
-        return {
-            dialogVisible: true,
-            tipContent: [],
-            buzzerAudio: BuzzerAudio,
-            sound: false,
-            noConfirmMapA: {},
-            noConfirmMapB: {},
-            confirmNoRecoverMapA: {},
-            confirmNoRecoverMapB: {},
-            confirmNoRecoverMapC: {},
-            noConfirmMapAString: '{}',
-            noConfirmMapBString: '{}',
-            confirmNoRecoverMapAString: '{}',
-            confirmNoRecoverMapBString: '{}',
-            confirmNoRecoverMapCString: '{}',
-            time: '00:00:00',
-            dateString: '00.00.0000'
-        };
-    },
-    computed: {
-        ...mapGetters('training', [
-            'mode',
-            'started',
-            'steps',
-            'order'
-        ]),
-        ...mapGetters('map', [
-            'stationList',
-            'trainList'
-        ]),
-        userId() {
-            return this.$store.state.user ? this.$store.state.user.id : '';
-        },
-        isNoConfirmLevelA() {
-            return this.noConfirmMapAString !== '{}';
-        },
-        isNoConfirmLevelB() {
-            return this.noConfirmMapBString !== '{}';
-        },
-        isNoRecoverLevelA() {
-            return this.confirmNoRecoverMapAString !== '{}';
-        },
-        isNoRecoverLevelB() {
-            return this.confirmNoRecoverMapBString !== '{}';
-        },
-        isNoRecoverLevelC() {
-            return this.confirmNoRecoverMapCString !== '{}';
-        }
-    },
-    watch: {
-        '$store.state.training.initTime': function (initTime) {
-            this.initDate(initTime);
-        },
-        '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新
-            this.$store.dispatch('training/setInitTime', time);
-        },
-        '$store.state.socket.simulationAlarmInfo': function(val) {
-            (val || []).forEach(item => {
-                if (!item.confirmed) {
-                    this.tipContent.push(item);
-                    // this.handleAlarm(item);
-                    if (this.tipContent.length > 3) {
-                        this.tipContent.shift();
-                    }
-                    if (item.level === 'A') {
-                        this.noConfirmMapA[item.code] = item;
-                        this.noConfirmMapAString = JSON.stringify(this.noConfirmMapA);
-                    } else if (item.level === 'B') {
-                        this.noConfirmMapB[item.code] = item;
-                        this.noConfirmMapBString = JSON.stringify(this.noConfirmMapB);
-                    }
-                } else if (!item.recovered) {
-                    if (item.level === 'A') {
-                        delete this.noConfirmMapA[item.code];
-                        this.confirmNoRecoverMapA[item.code] = item;
-                        this.noConfirmMapAString = JSON.stringify(this.noConfirmMapA);
-                        this.confirmNoRecoverMapAString = JSON.stringify(this.confirmNoRecoverMapA);
-                    } else if (item.level === 'B') {
-                        delete this.noConfirmMapB[item.code];
-                        this.confirmNoRecoverMapB[item.code] = item;
-                        this.noConfirmMapBString = JSON.stringify(this.noConfirmMapB);
-                        this.confirmNoRecoverMapBString = JSON.stringify(this.confirmNoRecoverMapB);
-                    } else if (item.level === 'C') {
-                        this.confirmNoRecoverMapC[item.code] = item;
-                        this.confirmNoRecoverMapCString = JSON.stringify(this.confirmNoRecoverMapC);
-                    }
-                } else {
-                    if (item.level === 'A') {
-                        delete this.noConfirmMapA[item.code];
-                        delete this.confirmNoRecoverMapA[item.code];
-                        this.noConfirmMapAString = JSON.stringify(this.noConfirmMapA);
-                        this.confirmNoRecoverMapAString = JSON.stringify(this.confirmNoRecoverMapA);
-                    } else if (item.level === 'B') {
-                        delete this.noConfirmMapB[item.code];
-                        delete this.confirmNoRecoverMapB[item.code];
-                        this.noConfirmMapBString = JSON.stringify(this.noConfirmMapB);
-                        this.confirmNoRecoverMapBString = JSON.stringify(this.confirmNoRecoverMapB);
-                    } else if (item.level === 'C') {
-                        delete this.confirmNoRecoverMapC[item.code];
-                        this.confirmNoRecoverMapCString = JSON.stringify(this.confirmNoRecoverMapC);
-                    }
-                }
-            });
-        }
-    },
-    methods: {
-        undeveloped() {
-            this.doClose();
-            this.$alert(this.$t('menu.menuBar.implemented'), this.$t('global.tips'), {
-                confirmButtonText: this.$t('global.confirm'),
-                callback: action => {
-                }
-            });
-        },
-        showHimAlarm(level) {
-            this.$refs.alarmTableHmi.doShow(level);
-        },
-        showDiary() {
-            this.$refs.logDetail.doShow();
-        },
-        controlAudio(val) {
-            const audio = document.getElementById('buzzer');
-            this.sound = val;
-            if (audio !== null) {
-                if (val) {
-                    audio.play();
-                } else if (val === false) {
-                    audio.pause();
-                }
-            }
-        },
-        handleDialogShow(type) {
-            this.$emit('handleDialogShow', type);
-        },
-        selectBeginTime() {
-            this.$emit('selectBeginTime');
-        },
-        end() {
-            this.$emit('end');
-        },
-        back() {
-            this.$emit('back');
-        },
-        initDate(date) {
-            this.time = timestampFormat('HH:mm:ss', date)
-            this.dateString = timestampFormat('YYYY.MM.DD', date)
-        },
-    }
-};
-</script>
-
-<style scoped rel="stylesheet/scss" lang="scss">
-	@import "src/styles/mixin.scss";
-	$width: 30px;
-	$height: 90px;
-	$menuPadding: 10px;
-	$menuItemHeight: 30px;
-	$menuItemWidth: 190px;
-	$menuItemPadding: 5px;
-
-	.nav {
-		display: block;
-		cursor: pointer;
-		color: #0000;
-		background: -webkit-linear-gradient(#FDFDFE, #DEE3F3);
-		background: -o-linear-gradient(#FDFDFE, #DEE3F3);
-		background: -moz-linear-gradient(#FDFDFE, #DEE3F3);
-		background: linear-gradient(#FDFDFE, #DEE3F3);
-		border: 1px solid #B6BCCC !important;
-		border-bottom: 2px solid #B6BCCC !important;
-		list-style: none;
-	}
-
-	.div-simulate-button{
-		height: 20px;
-		line-height: 20px;
-		display: inline-block;
-		font-size: 14px;
-		color: #303030;
-		border: 1px solid #44556D;
-		background: #DDD;
-		text-align: center;
-		border-radius: 1px;
-		width: 80px;
-	}
-	.tip-content-box{
-		height: 30px;
-		width: 100%;
-		line-height: 30px;
-		background: #001528;
-		color: #C20F29;
-		font-size: 14px;
-		display: flex;
-		justify-content: space-around;
-	}
-	.button-row{
-		height: 20px;
-		line-height: 20px;
-		display: flex;
-		justify-content:space-between;
-	}
-	@keyframes fade {
-		from {
-			opacity: 1.0;
-		}
-		50% {
-			opacity: 0.4;
-		}
-		to {
-			opacity: 1.0;
-		}
-	}
-
-	@-webkit-keyframes fade {
-		from {
-			opacity: 1.0;
-		}
-		50% {
-			opacity: 0.4;
-		}
-		to {
-			opacity: 1.0;
-		}
-	}
-
-	.headerBox {
-		background: #f00;
-		animation: fade 600ms infinite;
-		-webkit-animation: fade 600ms infinite;
-	}
-	/deep/.el-dialog__body{
-		padding: 0;
-	}
-</style>
diff --git a/src/views/newMap/displayBaSiDi/index.vue b/src/views/newMap/displayBaSiDi/index.vue
deleted file mode 100644
index 19dcc9384..000000000
--- a/src/views/newMap/displayBaSiDi/index.vue
+++ /dev/null
@@ -1,483 +0,0 @@
-<template>
-  <div class="main" :style="{width: '100%',height:'100%',position:'absolute',overflow:'hidden'}" style="background: #000;">
-    <ba-si-di ref="baSiDi" @handleDialogShow="handleDialogShow" />
-    <rps-dialog ref="rpsDialog" :is-run-plan="isRunPlan" :train-list="trainList" />
-    <tro-dialog ref="troDialog" :is-run-plan="isRunPlan" :train-list="trainList" :station-list="stationList" />
-    <car-pack ref="carPack" />
-    <tro-detail ref="troDetail" :is-run-plan="isRunPlan" :train-list="trainList" :station-list="stationList" @goTroDialog="troClick" />
-    <tra-dialog ref="traDialog" @openTrainTrunkDetail="openTrainTrunkDetail" />
-    <ttl-dialog ref="ttlDialog" />
-    <tmt-dialog ref="tmtDialog" />
-    <atr-dialog ref="atrDialog" />
-    <train-trunk-detail ref="trainTrunkDetail" @openTra="openTra" />
-    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
-    <div class="display-draft">
-      <el-button-group class="button-group-box">
-        <template v-if="!dataError">
-          <el-button type="success" :disabled="isRunPlan" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
-          <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
-        </template>
-        <el-button type="primary" size="small" @click="back">{{ $t('display.demon.back') }}</el-button>
-      </el-button-group>
-    </div>
-  </div>
-</template>
-<script>
-import { getSessionStorage } from '@/utils/auth';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import { getToken } from '@/utils/auth';
-import { creatSubscribe, clearSubscribe, displayTopic, getTopic } from '@/utils/stomp';
-import SetTime from '@/views/newMap/displayNew/demon/setTime';
-import { clearSimulation, getSimulationInfoNew, ranAsPlan, exitRunPlan } from '@/api/simulation';
-import { loadMapDataById } from '@/utils/loaddata';
-import { EventBus } from '@/scripts/event-bus';
-import { getSimulationMemberList, getAllSimulationUser } from '@/api/simulation';
-import { getMemberListCommon, getUserListCommon } from '@/api/rtSimulation';
-import BaSiDi from './baSiDiNew';
-import RpsDialog from './rps';
-import TroDialog from './tro';
-import CarPack from './carPack';
-import TroDetail from './troDetail';
-import TraDialog from './tra';
-import TtlDialog from './ttl';
-import TmtDialog from './tmt';
-import AtrDialog from './atr';
-import TrainTrunkDetail from './trainTrunkDetail';
-import parseStatus from '@/utils/parseStatus';
-
-export default {
-    name: 'DisplayDraft',
-    components: {
-        BaSiDi,
-        SetTime,
-        RpsDialog,
-        CarPack,
-        TroDialog,
-        TroDetail,
-        TraDialog,
-        TtlDialog,
-        TmtDialog,
-        AtrDialog,
-        TrainTrunkDetail
-    },
-    data() {
-        return {
-            offset: 15,
-            offsetBottom: 15,
-            tipBottom: 0,
-            textStatusHeight: 0,
-            planRunning:false,
-            dataError: false,
-            group:''
-        };
-    },
-    computed:{
-        ...mapGetters([
-            'canvasWidth'
-        ]),
-        ...mapGetters('map', [
-            'stationList',
-            'trainList'
-        ]),
-        mode() {
-            return this.$route.params.mode;
-        },
-        project() {
-            return getSessionStorage('project');
-        },
-        isDemon() {
-            return this.mode === 'demon' && !(this.project.includes('drts') || this.$route.query.thirdDrts);
-        },
-        isContest() {
-            return this.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        },
-        projectDevice() {
-            return this.$route.query.projectDevice;
-        },
-        isRunPlan() {
-            return this.$store.state.training.started;
-        }
-    },
-    watch:{
-        '$store.state.socket.permissionOver': function () {
-            this.$alert('用户权限已被收回', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                    this.back();
-                }
-            });
-        },
-        '$store.state.socket.equipmentStatus': function (val) {
-            if (val.length) {
-                this.statusMessage(val);
-            }
-        },
-        '$store.state.socket.deviceStateMessages': function (val) {
-            if (val) {
-                this.statusMessageNew(val);
-            }
-        },
-        '$store.state.config.menuBarLoadedCount': function (val) { // menuBar加载完成
-            this.setPosition();
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.setWindowSize();
-        },
-        '$store.state.training.prdType': function (val) { // 根据权限类型计算高度
-            this.setPosition();
-        },
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            if (this.planRunning) {
-                this.$store.dispatch('training/simulationStart');
-            }
-        },
-        '$store.state.socket.memberChangeCount': function () { // 仿真成员变更
-            this.initMemberUserInfo();
-        },
-        '$store.state.socket.simulationStart':function(val) {
-            if (val) {
-                this.$store.dispatch('training/simulationStart');
-            }
-        },
-        $route() {
-            if (!this.isLesson && !this.isExam) {
-                this.initLoadData();
-            }
-        },
-        '$store.state.menuOperation.selectedCount':function(em) {
-            const device = this.$store.state.menuOperation.selected;
-            if (device && device._type === 'Station' && this.$store.state.menuOperation.subType === 'troButton') {
-                this.$refs.troDialog.doClose();
-                this.$refs.troDetail.doShow(device.code);
-            }
-        }
-    },
-    beforeDestroy() {
-        this.clearSubscribe();
-        this.clearSubscribeNew();
-        clearSimulation(this.group);
-        this.$store.dispatch('training/reset');
-    },
-    async mounted() {
-        const _that = this;
-        window.onbeforeunload = () => { _that.clearSubscribe(); _that.clearSubscribeNew(); };
-        this.setWindowSize();
-        this.initLoadData();
-        this.initMemberUserInfo(true);
-        this.$store.dispatch('app/animationsClose');
-        this.$refs.troDialog.doClose();
-    },
-    methods:{
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        // 仿真错误时，被动退出时调用
-        async back() {
-            this.$router.go(-1);
-        },
-        async statusMessage(list) {
-            if (this.$jlmap) {
-                await this.$store.dispatch('training/updateMapState', list);
-            } else {
-                this.$store.commit('map/updateMapDevice', list);
-            }
-            await this.$store.dispatch('socket/setEquipmentStatus');
-        },
-        async statusMessageNew(deviceStatus) {
-            const list = parseStatus(deviceStatus);
-            await this.$store.dispatch('training/updateMapState', list);
-            await this.$store.dispatch('socket/setDeviceStateMessages');
-        },
-        async subscribe() {
-            this.clearSubscribe();
-            const header = { group: this.$route.query.group || '', 'X-Token': getToken() };
-            creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
-            await this.$store.dispatch('training/setHasSubscribed');
-        },
-        async subscribeNew() {
-            this.clearSubscribeNew();
-            const header = { 'X-Token': getToken() };
-            creatSubscribe(getTopic('ATS', this.$route.query.group), header);
-            creatSubscribe(getTopic('SYSTIME', this.$route.query.group), header);
-            creatSubscribe(getTopic('STATE', this.$route.query.group), header);
-            await this.$store.dispatch('training/setHasSubscribed');
-        },
-        clearSubscribeNew() {
-            clearSubscribe(getTopic('ATS', this.$route.query.group));
-            clearSubscribe(getTopic('SYSTIME', this.$route.query.group));
-            clearSubscribe(getTopic('STATE', this.$route.query.group));
-        },
-        clearSubscribe() {
-            clearSubscribe(`${displayTopic}\/${this.groupModel}`);
-        },
-        openTra() {
-            this.$refs.traDialog.doShow();
-        },
-        initMemberUserInfo(isFirst = false) {
-            if (this.$route.query.newApi + '' === 'true') {
-                getMemberListCommon(this.$route.query.group).then(resp => {
-                    this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.$store.state.user.id });
-                    getUserListCommon(this.$route.query.group).then(res => {
-                        this.$store.dispatch('training/setSimulationUserList', res.data);
-                        if (isFirst) { this.subscribeNew(); }
-                    }).catch(() => {
-                        this.$messageBox('获取所有仿真用户失败！');
-                    });
-                }).catch(() => {
-                    this.$messageBox('获取仿真成员列表失败！');
-                });
-            } else {
-                // 获取仿真成员列表
-                getSimulationMemberList(this.$route.query.group).then(resp => {
-                    this.$store.dispatch('training/setMemberList', { memberList: resp.data, userId: this.$store.state.user.id });
-                    getAllSimulationUser(this.$route.query.group).then(res => {
-                        this.$store.dispatch('training/setSimulationUserList', res.data);
-                        if (isFirst) {
-                            this.subscribe();
-                        }
-                    }).catch(() => {
-                        this.$messageBox('获取所有仿真用户失败！');
-                    });
-                }).catch(() => {
-                    this.$messageBox('获取仿真成员列表失败！');
-                });
-            }
-        },
-        // 设置各个按钮的定位
-        setPosition() {
-            this.$nextTick(() => {
-                this.offset = 10;
-                this.offsetBottom = 15;
-                const menuBar = document.getElementById('menuBar');
-                const menuTool = document.getElementById('menuTool');
-                const menuBottom = document.getElementById('menuButton');
-                const menuButtonsBox = document.getElementById('menuButtons_box');
-                const textStatus = document.getElementById('textStatus');
-                if (menuBar) {
-                    this.offset = (menuBar.offsetHeight || 0) + 15;
-                }
-                if (menuTool) {
-                    this.offset = (menuTool.offsetHeight || 0) + 15;
-                }
-                const buttonWidth = this.width - 1200; // B box widht
-                if (menuBottom && buttonWidth < 780) {
-                    this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
-                }
-                if (menuButtonsBox) {
-                    this.tipBottom = (menuButtonsBox.offsetHeight || 0) + 15;
-                }
-                if (textStatus) {
-                    this.textStatusHeight = textStatus.offsetHeight || 0;
-                    textStatus.style.top = this.offset - 15 + 'px';
-                }
-            });
-        },
-        // 缩放设置
-        setWindowSize() {
-            const width = this.width;
-            const height = this.height;
-            this.$store.dispatch('config/resize', { width, height });
-            // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-        },
-        //  初始化
-        initLoadData() {
-            this.group = this.$route.query.group;
-            this.$store.dispatch('training/reset');
-            this.loadSimulationInfo();
-            this.loadMapData();
-        },
-        // 新版地图根据仿真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', resp.data.systemTime);
-                    this.$store.dispatch('training/countTime');
-                    this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
-                    this.planRunning = resp.data.planRunning;
-                    if (resp.data.planRunning) {
-                        this.$store.commit('training/start');
-                    }
-                } else {
-                    this.$messageBox('此地图数据正在维护中,无法运行！');
-                }
-                this.dataError = resp.data.dataError;
-            }
-        },
-        selectBeginTime() {
-            this.$refs.setTime.doShow();
-        },
-        // 加载地图数据
-        loadMapData() {
-            if (parseInt(this.mapId)) {
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-                loadMapDataById(this.mapId, 'simulation');
-            } else {
-                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', model.initTime);
-                this.$store.dispatch('training/setInitTime', model.timestamp);
-            }).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'));
-            });
-        },
-        troClick() {
-            this.$refs.troDialog.doShow();
-        },
-        openTrainTrunkDetail(index) {
-            this.$refs.trainTrunkDetail.doShow(index);
-        },
-        handleDialogShow(type) {
-            this.$refs[type].doShow();
-        }
-    }
-};
-</script>
-<style scoped rel="stylesheet/scss" lang="scss">
-	.display-draft {
-		position: fixed;
-		right: 10px;
-		bottom: 15px;
-		.button-group-box{
-			float: right;
-		}
-	}
-</style>
-<style>
-.nanjing-02__systerm .el-dialog {
-    background: #d8d8d8;
-    border: 2px solid rgba(144, 144, 144, 0.8);
-    border-radius: 6px;
-    color: #000;
-    font-size: 14px;
-}
-.nanjing-02__systerm .el-dialog .el-dialog__header {
-    padding: 5px;
-    height: 30px;
-	background-image: linear-gradient(#A5A5BA, #FDFEFD);
-	border-radius: 4px 4px 0 0;
-}
-.nanjing-02__systerm .el-dialog .el-dialog__title {
-    position: absolute;
-    top: 4px;
-    color: #000;
-    border-radius: 4px;
-    padding: 0px 2px;
-    height: 20px;
-    line-height: 24px;
-	font-size: 15px;
-}
-.nanjing-02__systerm .el-dialog .el-dialog__headerbtn {
-    background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-    border: 1px solid #fff;
-    border-radius: 4px;
-    top: 6px;
-    right: 5px;
-    line-height: 16px;
-}
-.nanjing-02__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close{
-	color: #fff;
-}
-.nanjing-02__systerm .el-dialog .el-dialog__body {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 5px;
-    padding-right: 5px;
-    margin: 0px 1px 1px;
-	border: 2px solid rgb(212 212 212);
-    box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
-    background: #E6E6E6;
-    opacity: 1;
-}
-.nanjing-02__systerm .el-dialog .el-button {
-    height: 26px;
-    line-height: 24px;
-	font-size: 13px;
-    padding: 0px;
-    width: 80px;
-    border: 1px solid #8B958A;
-    border-radius: 0px !important;
-    color: #000;
-    background: #E6E6E6;
-}
-.nanjing-02__systerm .el-dialog .el-button.disabled {
-    border: 1px solid #B1B1B1;
-    color: #ABABAB;
-}
-</style>
diff --git a/src/views/newMap/displayBaSiDi/rps.vue b/src/views/newMap/displayBaSiDi/rps.vue
deleted file mode 100644
index 4224c1c2e..000000000
--- a/src/views/newMap/displayBaSiDi/rps.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<template>
-  <el-dialog
-    :modal="false"
-    :title="title"
-    :visible.sync="show"
-    :fullscreen="true"
-    :before-close="doClose"
-    :z-index="2003"
-  >
-    <map-system-draft ref="mapCanvas" :no-menu="true" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import MapSystemDraft from '@/views/newMap/mapsystemNew/common/index';
-import Vue from 'vue';
-
-export default {
-    name: 'RPS',
-    components: {
-        MapSystemDraft
-    },
-    props: {
-        trainList: {
-            type: Array,
-            required: true
-        },
-        isRunPlan: {
-            type: Boolean,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            mapData: null,
-            selfJmap: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '背投系统';
-        },
-        width() {
-            return this.$store.state.app.width - 5;
-        },
-        height() {
-            return this.$store.state.app.height - 50;
-        },
-        ...mapGetters('map', [
-            'bigScreenConfig'
-        ])
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            if (this.dialogShow) {
-                this.handleUpdateScreen();
-                this.$refs.mapCanvas && this.$refs.mapCanvas.mapViewLoaded(false);
-            }
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.$store.dispatch('config/resize', { width:this.width, height: this.height });
-        }
-    },
-    beforeDestroy() {
-        if (this.selfJmap && this.selfJmap._disposeFlag) {
-            this.destroy();
-        }
-    },
-    methods: {
-        doShow() {
-            this.dialogShow = true;
-            if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-            this.$store.dispatch('config/resize', { width:this.width, height: this.height });
-            this.$nextTick(function() {
-                this.$refs.mapCanvas.setMap(this.$store.state.map.map);
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
-                }
-                this.$jlmap.updateShowMode(list, '02');
-                this.$store.dispatch('training/updateMapState', list);
-                !this.isRunPlan && this.$jlmap.clearTrainView();
-            });
-        },
-        destroy() {
-            this.selfJmap.dispose();
-        },
-        handleUpdateScreen() {
-            this.maskOpen = false;
-            if (this.bigScreenConfig.bigScreenSplitConfig && this.bigScreenConfig.bigScreenSplitConfig.length) {
-                const offsetList = this.bigScreenConfig.offsetList;
-                const width = this.bigScreenConfig.width;
-                const height = this.bigScreenConfig.height;
-                const size = {
-                    width: (this.$store.state.app.width - 2) * width,
-                    height: this.$store.state.app.height * height,
-                    list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position),
-                    offsetList: offsetList
-                };
-                this.$jlmap.setUpdateScreen(size);
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
-                }
-                this.$jlmap.updateShowMode(list, '02');
-            } else {
-                this.maskOpen = true;
-                // this.$messageBox('该线路没有大屏切割位置信息, 请前往地图绘制编辑');
-            }
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            // this.$jlmap && this.$jlmap.clearTrainView();
-            this.selfJmap = Vue.prototype.$jlmap;
-        }
-    }
-};
-</script>
-<style scoped>
-	/deep/ .el-dialog {
-		background: rgba(100, 100, 100, 1);
-		position: relative;
-		border: 2px solid rgba(144, 144, 144, 0.8);
-		border-radius: 6px;
-		font-size: 14px;
-	}
-	/deep/ .el-dialog .el-dialog__body{
-		background: rgba(100, 100, 100, 1);
-		border: 0;
-		padding: 0;
-	}
-	/deep/ .el-dialog .el-dialog__header {
-		padding: 5px;
-		height: 30px;
-	}
-	/deep/ .el-dialog .el-dialog__title {
-		color: #fff;
-	}
-	/deep/ .el-dialog .el-dialog__headerbtn {
-		background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-		border: 1px solid #fff;
-		border-radius: 4px;
-		top: 4px;
-		right: 5px;
-		line-height: 16px;
-	}
-	/deep/ .el-dialog__headerbtn .el-dialog__close{
-		color: #fff;
-	}
-</style>
diff --git a/src/views/newMap/displayBaSiDi/tro.vue b/src/views/newMap/displayBaSiDi/tro.vue
deleted file mode 100644
index 07e9f9544..000000000
--- a/src/views/newMap/displayBaSiDi/tro.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <el-dialog
-    :modal="false"
-    :title="title"
-    :visible.sync="show"
-    :fullscreen="true"
-    :before-close="doClose"
-    :z-index="2003"
-  >
-    <div>
-      <map-system-draft ref="mapCanvas" :no-menu="true" @back="back" />
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import MapSystemDraft from '@/views/newMap/mapsystemNew/common/index';
-import { mapGetters } from 'vuex';
-import ButtonDbupIcon from '@/assets/baSiDi/dbup.png';
-import ButtonRightIcon from '@/assets/baSiDi/right.png';
-import ButtonLeftIcon from '@/assets/baSiDi/left.png';
-import Vue from 'vue';
-
-export default {
-    name: 'TRO',
-    components: {
-        MapSystemDraft
-    },
-    props: {
-        stationList: {
-            type: Array,
-            required: true
-        },
-        trainList: {
-            type: Array,
-            required: true
-        },
-        isRunPlan: {
-            type: Boolean,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            mapData: null,
-            deviceCode: '',
-            selfJmap: null,
-            buttonDbup: ButtonDbupIcon,
-            buttonRight: ButtonRightIcon,
-            buttonLeft: ButtonLeftIcon
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '轨道总览';
-        },
-        width() {
-            return this.$store.state.app.width - 5;
-        },
-        height() {
-            return this.$store.state.app.height - 50;
-        },
-        ...mapGetters('map', [
-            'bigScreenConfig'
-        ])
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            if (this.dialogShow) {
-                this.showTroMode();
-                this.$refs.mapCanvas && this.$refs.mapCanvas.mapViewLoaded(false);
-            }
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.$store.dispatch('config/resize', { width:this.width, height: this.height });
-        }
-    },
-    beforeDestroy() {
-        if (this.selfJmap && this.selfJmap._disposeFlag) {
-            this.destroy();
-        }
-    },
-    methods: {
-        doShow() {
-            this.dialogShow = true;
-            if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-            this.$store.dispatch('config/resize', { width:this.width, height: this.height });
-            this.$nextTick(function() {
-                this.$refs.mapCanvas.setMap(this.$store.state.map.map);
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
-                }
-                this.$jlmap.updateShowMode(list, '05');
-                this.$store.dispatch('training/updateMapState', list);
-                !this.isRunPlan && this.$jlmap.clearTrainView();
-            });
-        },
-        destroy() {
-            this.selfJmap.dispose();
-        },
-        showTroMode() {
-            const mapDevice = this.$store.state.map.mapDevice;
-            const list = [];
-            for (const key in mapDevice) {
-                list.push(mapDevice[key]);
-            }
-            this.handleUpdateScreen();
-            this.$jlmap.updateShowMode(list, '05'); // 二次过滤
-        },
-        handleUpdateScreen() {
-            this.maskOpen = false;
-            if (this.bigScreenConfig.bigScreenSplitConfig && this.bigScreenConfig.bigScreenSplitConfig.length) {
-                const offsetList = this.bigScreenConfig.offsetList;
-                const width = this.bigScreenConfig.width;
-                const height = this.bigScreenConfig.height;
-                const size = {
-                    width: (this.$store.state.app.width - 2) * width,
-                    height: this.$store.state.app.height * height,
-                    list: this.bigScreenConfig.bigScreenSplitConfig.map(ele => ele.position),
-                    offsetList: offsetList
-                };
-                this.$jlmap.setUpdateScreen(size);
-            } else {
-                this.maskOpen = true;
-            }
-        },
-        back() {},
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$jlmap && this.$jlmap.clearTrainView();
-            this.selfJmap = Vue.prototype.$jlmap;
-        }
-    }
-};
-</script>
-<style scoped>
-	/deep/ .el-dialog {
-		background: rgba(100, 100, 100, 1);
-		position: relative;
-		border: 2px solid rgba(144, 144, 144, 0.8);
-		border-radius: 6px;
-		font-size: 14px;
-	}
-	/deep/ .el-dialog .el-dialog__body{
-		background: rgba(100, 100, 100, 1);
-		border: 0;
-		padding: 0;
-	}
-	/deep/ .el-dialog .el-dialog__header {
-		padding: 5px;
-		height: 30px;
-	}
-	/deep/ .el-dialog .el-dialog__title {
-		color: #fff;
-	}
-	/deep/ .el-dialog .el-dialog__headerbtn {
-		background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-		border: 1px solid #fff;
-		border-radius: 4px;
-		top: 4px;
-		right: 5px;
-		line-height: 16px;
-	}
-	/deep/ .el-dialog__headerbtn .el-dialog__close{
-		color: #fff;
-	}
-	.arrow-button{
-		width: 45px;
-		height: 30px;
-		cursor: pointer;
-		background-size: 45px 30px;
-		background-repeat: no-repeat;
-	}
-</style>
diff --git a/src/views/newMap/displayBaSiDi/troDetail.vue b/src/views/newMap/displayBaSiDi/troDetail.vue
deleted file mode 100644
index 684e79b40..000000000
--- a/src/views/newMap/displayBaSiDi/troDetail.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <el-dialog
-    :modal="false"
-    :title="title"
-    :visible.sync="show"
-    :fullscreen="true"
-    :before-close="doClose"
-    :z-index="2000"
-  >
-    <div style="text-align: center;">
-      <map-system-draft ref="mapCanvas" />
-      <el-button size="small" class="fault-button" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式':'切换到故障模式' }}</el-button>
-      <div class="button-box" style="">
-        <div class="arrow-button" :style="{backgroundImage: 'url(' + buttonLeft + ')' }" @click="changeStation(-1)" />
-        <div class="arrow-button" :style="{backgroundImage: 'url(' + buttonDbup + ')' }" @click="goTroDialog" />
-        <div class="arrow-button" :style="{backgroundImage: 'url(' + buttonRight + ')' }" @click="changeStation(1)" />
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import MapSystemDraft from '@/views/newMap/mapsystemNew/common/index';
-import ButtonDbupIcon from '@/assets/baSiDi/dbup.png';
-import ButtonRightIcon from '@/assets/baSiDi/right.png';
-import ButtonLeftIcon from '@/assets/baSiDi/left.png';
-import { OperateMode } from '@/scripts/ConstDic';
-import Vue from 'vue';
-
-export default {
-    name: 'TRO',
-    components: {
-        MapSystemDraft
-    },
-    props: {
-        stationList: {
-            type: Array,
-            required: true
-        },
-        trainList: {
-            type: Array,
-            required: true
-        },
-        isRunPlan: {
-            type: Boolean,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            mapData: null,
-            deviceCode: '',
-            buttonDbup: ButtonDbupIcon,
-            buttonRight: ButtonRightIcon,
-            buttonLeft: ButtonLeftIcon,
-            selfJmap: null,
-            faultMode: false
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '轨道详览';
-        },
-        width() {
-            return this.$store.state.app.width - 10;
-        },
-        height() {
-            return this.$store.state.app.height - 40;
-        }
-    },
-    watch: {
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            if (this.dialogShow) {
-                const list = [];
-                const mapDevice = this.$store.state.map.mapDevice;
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
-                }
-                Vue.prototype.$jlmap.updateShowMode(list, '02');
-                this.$refs.mapCanvas && this.$refs.mapCanvas.setCenter(this.deviceCode);
-                this.$refs.mapCanvas && this.$refs.mapCanvas.mapViewLoaded(false);
-            }
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.$store.dispatch('config/resize', { width:this.width, height: this.height });
-        }
-    },
-    beforeDestroy() {
-        if (this.selfJmap && !this.selfJmap._disposeFlag) {
-            this.destroy();
-        }
-    },
-    methods: {
-        doShow(deviceCode) {
-            this.dialogShow = true;
-            if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
-            this.$store.dispatch('config/resize', { width:this.width, height: this.height });
-            this.deviceCode = deviceCode;
-            this.$nextTick(function() {
-                this.$refs.mapCanvas.setMap(this.$store.state.map.map);
-                this.$jlmap.off('pan');
-                this.faultMode = this.$store.state.training.operatemode === OperateMode.FAULT;
-                const mapDevice = this.$store.state.map.mapDevice;
-                const list = [];
-                for (const key in mapDevice) {
-                    list.push(mapDevice[key]);
-                }
-                this.$jlmap.updateShowMode(list, '02');
-                this.$store.dispatch('training/updateMapState', list);
-                !this.isRunPlan && this.$jlmap.clearTrainView();
-            });
-        },
-        changeOperateMode() {
-            this.faultMode = !this.faultMode;
-            let mode = OperateMode.NORMAL;
-            if (this.faultMode) {
-                mode = OperateMode.FAULT;
-            }
-            this.$store.dispatch('training/changeOperateMode', { mode: mode });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.selfJmap = Vue.prototype.$jlmap;
-        },
-        destroy() {
-            this.selfJmap.dispose();
-        },
-        goTroDialog() {
-            this.doClose();
-            this.$emit('goTroDialog');
-        },
-        changeStation(value) {
-            this.deviceCode = this.deviceCode || this.stationList[0].code;
-            const device = this.$store.getters['map/getDeviceByCode'](this.deviceCode);
-            const stationSn = device.sn + value;
-            const station = this.stationList.find((item) => {
-                return item.sn === stationSn;
-            });
-            if (station && station.depot) {
-                this.changeStation(value * 2);
-            } else if (station) {
-                this.deviceCode = station.code;
-                this.$jlmap && this.$jlmap.setCenterOffset(this.deviceCode, { x: 200, y:0 });
-            }
-        }
-    }
-};
-</script>
-<style scoped>
-	/deep/ .el-dialog {
-		background: rgba(100, 100, 100, 1);
-		position: relative;
-		border: 2px solid rgba(144, 144, 144, 0.8);
-		border-radius: 6px;
-		font-size: 14px;
-	}
-	/deep/ .el-dialog .el-dialog__body{
-		background: rgba(100, 100, 100, 1);
-		border: 0;
-		padding: 0;
-	}
-	/deep/ .el-dialog .el-dialog__header {
-		padding: 5px;
-		height: 30px;
-	}
-	/deep/ .el-dialog .el-dialog__title {
-		color: #fff;
-	}
-	/deep/ .el-dialog .el-dialog__headerbtn {
-		background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
-		border: 1px solid #fff;
-		border-radius: 4px;
-		top: 4px;
-		right: 5px;
-		line-height: 16px;
-	}
-	/deep/ .el-dialog__headerbtn .el-dialog__close{
-		color: #fff;
-	}
-	.arrow-button{
-		width: 45px;
-		height: 30px;
-		cursor: pointer;
-		background-size: 45px 30px;
-		background-repeat: no-repeat;
-	}
-	.button-box{
-		width: 150px;
-		height: 35px;
-		display: flex;
-		position: absolute;
-		bottom: 60px;
-		left: calc(50% - 75px);
-		z-index: 9999;
-		justify-content: space-between;
-		justify-items: center;
-	}
-	.fault-button{
-		position: absolute;
-		top: 32px;
-		right: 32px;
-	}
-</style>
diff --git a/src/views/newMap/displayCity/demon/addFault.vue b/src/views/newMap/displayCity/demon/addFault.vue
deleted file mode 100644
index 53d807221..000000000
--- a/src/views/newMap/displayCity/demon/addFault.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<template>
-  <div class="addRules">
-    <div class="addRulesInner">
-      <div class="addRulesInnerTitle">新增故障</div>
-      <div class="closeAddRulesInner" @click="addRulesClose">
-        <span class="el-icon-close closeAddRulesIn" />
-      </div>
-      <el-form ref="form" :model="faultRule" label-width="100px" style="margin-left:15px;">
-        <el-form-item label="目标设备">
-          <!-- faultRule.targetDeviceCode -->
-          <el-input v-model="targetDevice.name" disabled size="small" class="inputModelClass" />
-          <!--<el-button :type="field === 'targetActive' ? 'danger' : 'primary'" size="small" @click="hover('targetActive')">{{ $t('map.activate') }}</el-button>-->
-        </el-form-item>
-        <el-form-item label="触发方式">
-          <el-select v-model="triggerMode" @change="changeTriggerMode">
-            <el-option
-              v-for="item in triggerModeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="故障类型">
-          <el-select v-model="faultRule.faultType" placeholder="请选择" class="inputModelClass">
-            <el-option
-              v-for="item in faultTypeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="triggerMode === 'DEVICE'" label="触发设备">
-          <!-- faultRule.condition.triggerDeviceCode -->
-          <el-input v-model="triggerDevice" size="small" disabled class="inputModelClass" />
-          <el-button :type="field === 'triggerActive' ? 'danger' : 'primary'" size="small" @click="hover('triggerActive')">{{ $t('map.activate') }}</el-button>
-        </el-form-item>
-        <el-form-item v-if="triggerMode === 'DEVICE'" label="触发状态">
-          <!-- <el-input v-model="faultRule.condition.triggerDeviceStatus" size="small" class="inputModelClass" /> -->
-          <el-select v-model="faultRule.condition.triggerDeviceStatus" placeholder="请选择" class="inputModelClass">
-            <el-option
-              v-for="item in triggerStatusList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="triggerMode === 'DEVICE'" label="关联设备">
-          <el-input v-model="triggerAssociatedDevice" size="small" disabled class="inputModelClass" />
-          <el-button :type="field === 'triggerAssociated'? 'danger': 'primary'" size="small" @click="hover('triggerAssociated')">{{ $t('map.activate') }}</el-button>
-        </el-form-item>
-        <el-form-item v-if="triggerMode === 'TIME'" label="触发时间">
-          <el-date-picker
-            v-model="faultRule.condition.triggeringTime"
-            type="datetime"
-            placeholder="选择日期时间"
-          />
-        </el-form-item>
-      </el-form>
-      <span class="addRulesFooter">
-        <el-button size="medium" type="primary" @click="addRulesCreate">{{ $t('global.confirm') }}</el-button>
-        <el-button size="medium" @click="addRulesClose">{{ $t('global.cancel') }}</el-button>
-      </span>
-    </div>
-  </div>
-</template>
-<script>
-import { FaultStatusEnum } from '@/scripts/FaultDicNew';
-import { setFailureModeNew} from '@/api/simulation';
-import { deviceFaultType} from '@/scripts/cmdPlugin/Config';
-// 添加故障
-export default {
-    name: 'AddChoose',
-    props: {
-        targetDevice: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            field:'',
-            triggerStatusList:[],
-            faultTypeList:[],
-            faultRule:{
-                targetDeviceCode:'',
-                targetDeviceType:'',
-                faultType:'',
-                condition:{
-                    triggerDeviceCode:'',
-                    triggerDeviceStatus:'',
-                    triggerDeviceType :'',
-                    type:'DEVICE',
-                    triggeringTime: '',
-                    triggerAssociatedDeviceCode: ''
-                }
-            },
-            // targetDevice:'',
-            triggerDevice:'',
-            triggerAssociatedDevice: '',
-            triggerMode: 'DEVICE',
-            triggerModeList: [
-                {label: '设备触发', value: 'DEVICE'},
-                {label: '时间触发', value: 'TIME'}
-            ]
-            // rules:{
-            //     targetDevice:[
-            //         { required: true, message:'请选择目标设备', trigger: 'blur' }
-            //     ],
-            //     triggerDevice:[
-            //         { required: true, message:'请选择触发设备', trigger: 'blur' }
-            //     ],
-            //     faultRule:{
-            //         faultType:[
-            //             { required: true, message:'请选择故障类型', trigger: 'blur' },
-            //             { required: true, message:'请选择故障类型', trigger: 'change' }
-            //         ]
-            //     }
-            // }
-        };
-    },
-    watch: {
-        '$store.state.menuOperation.selectedCount':function(em) {
-            const device = this.$store.state.menuOperation.selected;
-            if (device.code) {
-                this.deviceSelect(device);
-            }
-        }
-    },
-    mounted() {
-    },
-    methods:{
-        deviceSelect(em) {
-            if (this.field.toUpperCase() === 'triggerAssociated'.toUpperCase()) {
-                // if (em._type == 'Station') {
-                //     em = this.$store.getters['map/getDeviceByCode'](em.zcCode);
-                // }
-                // this.faultRule.targetDeviceType = this.covertType(em._type);
-                // this.faultRule.targetDeviceCode = em.code;
-                if (em._type.toUpperCase() === 'Section'.toUpperCase() && em.parentName) {
-                    this.triggerAssociatedDevice = em._type + '-' + em.parentName + '-' + em.name;
-                } else {
-                    this.triggerAssociatedDevice = em._type + '-' + em.name;
-                }
-                this.faultRule.condition.triggerAssociatedDeviceCode = em.code;
-            } else if (this.field.toUpperCase() === 'triggerActive'.toUpperCase()) {
-                this.faultRule.condition.triggerDeviceType = this.covertType(em._type);
-                this.faultRule.condition.triggerDeviceCode = em.code;
-                if (em._type.toUpperCase() === 'Section'.toUpperCase() && em.parentName) {
-                    this.triggerDevice = em._type + '-' + em.parentName + '-' + em.name;
-                } else if (em._type.toUpperCase() === 'Train'.toUpperCase()) {
-                    this.triggerDevice = em._type + '-' + em.code;
-                } else {
-                    this.triggerDevice = em._type + '-' + em.name;
-                }
-                this.triggerStatusList = [];
-                const faultStatus = FaultStatusEnum[this.faultRule.condition.triggerDeviceType];
-                if (faultStatus) {
-                    const list = Object.keys(faultStatus);
-                    list.forEach(key=>{
-                        this.triggerStatusList.push({label:faultStatus[key], value:key});
-                    });
-                }
-                this.field = '';
-                this.faultRule.condition.triggerDeviceStatus = '';
-            }
-        },
-        covertType(type) {
-            switch (type) {
-            case 'Section':return 'SECTION';
-            case 'Signal':return 'SIGNAL';
-            case 'Switch':return 'SWITCH';
-            case 'Station':return 'STATION';
-            case 'ZcControl':return 'ZC';
-            case 'StationStand':return 'STAND';
-            case 'Train':return 'TRAIN';
-            }
-        },
-        hover(field) {
-            if (this.field == '') {
-                this.field = field;
-            } else {
-                this.field = '';
-            }
-        },
-        addRulesCreate() {
-            if (this.triggerDevice == '') {
-                this.$messageBox('请选择触发设备');
-                return;
-            }
-            if (this.faultRule.condition.triggerDeviceStatus == '') {
-                this.$messageBox('请选择触发状态');
-                return;
-            }
-            if (this.faultRule.faultType == '') {
-                this.$messageBox('请选择故障类型');
-                return;
-            }
-            console.log(this.faultRule, '-------------');
-            setFailureModeNew(this.faultRule, this.$route.query.group).then(res=>{
-                this.$emit('closeAddRules');
-                this.$emit('reload');
-            }).catch((error)=>{
-                this.$messageBox('创建故障失败: ' + error.message);
-            });
-        },
-        addRulesClose() {
-            this.resetForm();
-            this.$emit('closeAddRules');
-        },
-
-        initValue() {
-            this.faultTypeList = deviceFaultType[this.targetDevice._type];
-            this.faultRule.targetDeviceCode = this.targetDevice.code;
-            this.faultRule.targetDeviceType = this.covertType(this.targetDevice._type);
-        },
-        resetForm() {
-            this.triggerDevice = '';
-            this.faultRule = {
-                targetDeviceCode:'',
-                targetDeviceType:'',
-                faultType:'',
-                condition:{
-                    triggerDeviceCode:'',
-                    triggerDeviceStatus:'',
-                    triggerDeviceType :'',
-                    type:'DEVICE',
-                    triggeringTime: '',
-                    triggerAssociatedDeviceCode: ''
-                }
-            };
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-    .addRules{
-        position: absolute;
-        width: 100%;
-        left: 0;
-        top: 40px;
-    }
-    .addRulesInner{
-        position: relative;
-        width: 380px;
-        margin-top:6px;
-        background: #fff;
-        border-radius: 10px;
-        border: 1px #ccc solid;
-        margin-left: auto;
-        margin-right: auto;
-        box-shadow: 3px 3px 3px #a0a0a0;
-        z-index:2;
-    }
-    .queryList{
-        height: 300px;
-        overflow: auto;
-    }
-    .inputModelClass{
-        width:150px;
-    }
-    .addRulesInnerTitle{
-        padding: 10px;
-        font-size: 14px;
-    }
-    .closeAddRulesInner{
-        position: absolute;
-        right: 10px;
-        top: 9px;
-        width: 19px;
-        height: 19px;
-        cursor: pointer;
-    }
-    .closeAddRulesIn{
-        font-size: 19px;
-    }
-    .addRulesFooter{
-        margin-left: 116px;
-        display: inline-block;
-		margin-bottom: 20px;
-    }
-</style>
diff --git a/src/views/newMap/displayCity/demon/faultChoose.vue b/src/views/newMap/displayCity/demon/faultChoose.vue
deleted file mode 100644
index 23c550f25..000000000
--- a/src/views/newMap/displayCity/demon/faultChoose.vue
+++ /dev/null
@@ -1,600 +0,0 @@
-<template>
-  <div v-if="dialogShow" id="faultChoose">
-    <div class="falutChooseTitle">{{ title }}</div>
-    <div class="closeFalutChoose" @click="closeFaultChoose">
-      <span class="el-icon-close closeFalutChooseIn" />
-    </div>
-    <el-card class="triggerFaultInfo">
-      <el-button type="primary" size="small" style="margin-bottom:10px;" @click="isTableShow=!isTableShow">{{ isTableShow?'隐藏列表':'显示列表' }}</el-button>
-      <el-table v-if="isTableShow" :data="faultList" height="300" border style="width: 100%;font-size:13px;">
-        <el-table-column prop="targetDeviceCode" label="目标设备" width="220">
-          <template slot-scope="scope">
-            <span>{{ `${deviceMap[scope.row.targetDeviceType]}${formatNameByCode(scope.row.targetDeviceCode)}` }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="faultType" label="故障类型">
-          <template slot-scope="scope">
-            <span>{{ covertFaultType(scope.row) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="condition" label="列车" width="100">
-          <template slot-scope="scope">
-            <span>{{ `${deviceMap[scope.row.condition.triggerDeviceType] || ''}${formatNameByCode(scope.row.condition.triggerDeviceCode)}` }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="condition" label="到达区段" width="180">
-          <template slot-scope="scope">
-            <span>{{ `${formatNameByCode(scope.row.condition.triggerAssociatedDeviceCode)}` }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="condition.condition.triggerTime" label="触发时间" width="150" />
-        <el-table-column prop="triggeringTime" label="故障状态">
-          <template slot-scope="scope">
-            <span>{{ scope.row.triggeringTime? '已触发': '未触发' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button v-if="!scope.row.triggeringTime" type="text" size="small" @click="handleDelete(scope.row)">取消</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <div class="targetCard">
-      <div class="targetCardHead">
-        <el-button style="padding:3px 0" type="text" @click="addRulesCreate">新增</el-button>
-      </div>
-      <div>
-        <el-form ref="form" :model="faultRule" :inline="true" label-width="100px" style="margin-left:15px;">
-          <el-form-item label="目标设备" class="targetFormItem">
-            <el-input v-model="targetDeviceName" disabled size="small" class="inputModelClass" style="width: 300px;" />
-          </el-form-item>
-          <el-form-item label="故障类型" class="targetFormItem">
-            <el-select v-model="faultRule.faultType" placeholder="请选择" class="inputModelClass" size="small" style="width: 300px;">
-              <el-option
-                v-for="item in faultTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="triggerMode === 'DEVICE'" label="列车" class="targetFormItem">
-            <el-input v-model="triggerDevice" size="small" disabled class="inputModelClass" style="width: 240px;" />
-            <el-button :type="field === 'triggerActive' ? 'danger' : 'primary'" size="small" @click="hover('triggerActive')">{{ $t('map.activate') }}</el-button>
-          </el-form-item>
-          <el-form-item v-if="triggerMode === 'DEVICE'" label="到达区段" class="targetFormItem">
-            <el-input v-model="triggerAssociatedDevice" size="small" disabled class="inputModelClass" style="width: 240px;" />
-            <el-button :type="field === 'triggerAssociated'? 'danger': 'primary'" size="small" @click="hover('triggerAssociated')">{{ $t('map.activate') }}</el-button>
-          </el-form-item>
-          <el-form-item v-if="triggerMode === 'TIME'" label="触发时间" class="targetFormItem">
-            <el-date-picker
-              v-model="faultRule.condition.triggerTime"
-              size="small"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              placeholder="选择日期时间"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getSimulationFaultRules, setFailureModeNew, deleteFailureRule, cancelFailureModeNew } from '@/api/simulation';
-import ConstConfig from '@/scripts/ConstConfig';
-import { FaultStatusEnum } from '@/scripts/FaultDicNew';
-import ModelType from '@/jmapNew/constant/deviceType';
-import { deviceFaultType } from '@/scripts/cmdPlugin/Config';
-
-// 故障列表
-export default {
-    name: 'FaultChoose',
-    props: {
-        group: {
-            type: String,
-            required: true
-        },
-        offset: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            isAdd:false,
-            isTableShow:true,
-            deviceMap: {},
-            simulationFault:{},
-            faultList: [],
-            faultRule:{
-                targetDeviceCode:'',
-                targetDeviceType:'',
-                faultType:'',
-                condition:{
-                    triggerDeviceCode:'',
-                    triggerDeviceStatus:'',
-                    triggerDeviceType :'',
-                    type:'DEVICE',
-                    triggerTime: '',
-                    triggerAssociatedDeviceCode: ''
-                }
-            },
-            triggerDevice:'',
-            triggerAssociatedDevice: '',
-            triggerMode: 'DEVICE',
-            triggerModeList: [
-                {label: '设备触发', value: 'DEVICE'},
-                {label: '时间触发', value: 'TIME'}
-            ],
-            field:'',
-            triggerStatusList:[],
-            faultTypeList:[],
-            targetDeviceName: ''
-        };
-    },
-    computed: {
-        title() {
-            return '自动故障设置';
-        },
-        lineCode() {
-            return this.$route.query.lineCode;
-        },
-        targetDevice() {
-            return this.$store.state.training.triggerFaultDevice;
-        }
-    },
-    watch:{
-        '$store.state.socket.autoFaultTrigger':function(val) {
-            this.dialogShow && this.getSimulationFaultRules();
-        },
-        '$store.state.menuOperation.selectedCount':function(em) {
-            const device = this.$store.state.menuOperation.selected;
-            if (device && device.code) {
-                this.deviceSelect(device);
-            }
-        },
-        targetDevice: function(device) {
-            this.targetDeviceName = this.targetDevice.name || this.targetDevice.code;
-        }
-    },
-    mounted() {
-        this.deviceMap = [];
-        ConstConfig.ConstSelect.simulationDeviceList.forEach(elem => {
-            this.deviceMap[elem.value] = elem.label;
-        });
-    },
-    methods: {
-        formatNameByCode(code) {
-            let name = '';
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            if (device) {
-                switch (device._type) {
-                case ModelType.Signal:
-                case ModelType.Switch:
-                case ModelType.Station:
-                case ModelType.Section: {
-                    if (device.parentName) {
-                        name += device.parentName + '-' + device.name;
-                    } else {
-                        name += device.name;
-                    }
-
-                    break;
-                }
-                case ModelType.Train:
-                    name = device.code;
-                    break;
-                }
-                if (device.stationCode) {
-                    const station = this.$store.getters['map/getDeviceByCode'](device.stationCode);
-                    if (station) {
-                        name += '【' + station.name + '】';
-                    }
-                }
-            }
-
-            return name;
-        },
-        hover(field) {
-            if (this.field == '') {
-                this.field = field;
-            } else {
-                this.field = '';
-            }
-        },
-        handleDelete(row) {
-            cancelFailureModeNew(row.id, this.$route.query.group).then(resp => {
-                this.getSimulationFaultRules();
-            }).catch(() => {
-                this.$message.error('取消故障失败！');
-            });
-        },
-        covertType(type) {
-            switch (type) {
-            case 'SECTION':return 'Section';
-            case 'SIGNAL':return 'Signal';
-            case 'SWITCH':return 'Switch';
-            case 'STATION':return 'Station';
-            case 'ZC':return 'ZcControl';
-            case 'STAND':return 'StationStand';
-            case 'TRAIN':return 'Train';
-            case 'Section':return 'SECTION';
-            case 'Signal':return 'SIGNAL';
-            case 'Switch':return 'SWITCH';
-            case 'Station':return 'STATION';
-            case 'ZcControl':return 'ZC';
-            case 'StationStand':return 'STAND';
-            case 'Train':return 'TRAIN';
-            }
-        },
-        covertFaultType(row) {
-            let faultType = '';
-            if (row && row.id) {
-                let type = this.covertType(row.targetDeviceType);
-                if (type == 'Station') {
-                    type = 'ZcControl';
-                }
-                const currentList = deviceFaultType[type];
-                currentList.forEach(temp=>{
-                    if (temp.value === row.faultType) {
-                        faultType = temp.label;
-                    }
-                });
-            }
-            return faultType;
-        },
-        closeFaultChoose() {
-            this.dialogShow = false;
-            this.isAdd = false;
-            if (this.$refs.addFault) {
-                this.$refs.addFault.resetForm();
-            }
-        },
-        closeAddRules() {
-            this.isAdd = false;
-        },
-        getSimulationFaultRules() {
-            if (this.dialogShow) {
-                getSimulationFaultRules(this.$route.query.group).then(resp => {
-                    this.faultList = resp.data;
-                }).catch(() => {
-                    this.$messageBox('获取数据异常');
-                });
-            }
-        },
-        changeTriggerMode(val) {
-            this.resetForm();
-            this.triggerMode = val;
-            this.faultRule.condition.type = val;
-        },
-        doShow() {
-            this.dialogShow = true;
-            this.getSimulationFaultRules();
-            this.resetForm();
-            this.faultTypeList = deviceFaultType[this.targetDevice._type];
-            this.faultRule.targetDeviceCode = this.targetDevice.code;
-            this.faultRule.targetDeviceType = this.covertType(this.targetDevice._type);
-            this.faultRule.faultType = (this.faultTypeList[0] || {}).value;
-            this.$nextTick(()=>{
-                this.dragEvent();
-            });
-        },
-        resetForm() {
-            this.getSimulationFaultRules();
-            this.field = '';
-            this.triggerDevice = '';
-            this.triggerAssociatedDevice = '';
-            this.faultRule = {
-                targetDeviceCode:this.targetDevice.code,
-                targetDeviceType:this.covertType(this.targetDevice._type),
-                faultType:'',
-                condition:{
-                    triggerDeviceCode:'',
-                    triggerDeviceStatus:'',
-                    triggerDeviceType :'',
-                    type:'DEVICE',
-                    triggerTime: '',
-                    triggerAssociatedDeviceCode: ''
-                }
-            };
-        },
-        doClose() {
-            this.dialogShow = false;
-        },
-        handleAdd() {
-            this.isAdd = true;
-            this.$nextTick(() => {
-                this.$refs.addFault.initValue();
-            });
-        },
-        deleteFailure(index, row) {
-            event.cancelBubble = true;
-            this.$confirm('删除故障规则，是否继续？', '提 示', {
-                confirmButtonText: '确 定',
-                cancelButtonText: '取 消',
-                type: 'warning'
-            }).then(() => {
-                deleteFailureRule(row.id).then(resp => {
-                }).catch(error => {
-                    this.$message.error(`删除故障规则失败: ${error.message}`);
-                });
-            }).catch( () => { });
-        },
-        settingFailure(index, row, idx) {
-            const faultModel = {ruleId: row.id, auto:true};
-            // row['loading' + idx] = true;
-            setFailureModeNew(faultModel, this.group).then(() => {
-                this.getSimulationFaultRules();
-                this.$message.success('设置自动故障成功');
-            }).catch(() => {
-                this.$messageBox('设置自动故障失败');
-            });
-        },
-        cancleAutoFault() {
-            const faultModel = {auto:false};
-            setFailureModeNew(faultModel, this.group).then(() => {
-                this.getSimulationFaultRules();
-                this.$message.success('取消自动故障成功');
-            }).catch(() => {
-                this.$messageBox('取消自动故障失败');
-            });
-        },
-        addRulesCreate() {
-            if (this.triggerMode === 'DEVICE' && this.triggerDevice == '') {
-                this.$messageBox('请选择触发设备');
-                return;
-            }
-            if (this.triggerMode === 'DEVICE' && this.faultRule.condition.triggerDeviceStatus == '') {
-                this.$messageBox('请选择触发状态');
-                return;
-            }
-            if (this.faultRule.faultType == '') {
-                this.$messageBox('请选择故障类型');
-                return;
-            }
-            if (this.triggerMode === 'TIME' && this.faultRule.condition.triggerTime == '') {
-                this.$messageBox('请选择触发时间');
-                return;
-            }
-            if (this.triggerMode === 'DEVICE' && this.faultRule.condition.triggerDeviceType === 'TRAIN' && this.faultRule.condition.triggerDeviceStatus === 'Section' && this.faultRule.condition.triggerAssociatedDeviceCode == '') {
-                this.$messageBox('请选择关联设备');
-                return;
-            }
-            const param = {
-                targetDeviceCode:this.targetDevice.code,
-                targetDeviceType:this.covertType(this.targetDevice._type),
-                faultType: this.faultRule.faultType,
-                condition:{
-                    triggerDeviceCode: this.faultRule.condition.triggerDeviceCode || null,
-                    triggerDeviceStatus:this.faultRule.condition.triggerDeviceStatus || null,
-                    triggerDeviceType :this.faultRule.condition.triggerDeviceType || null,
-                    type:this.faultRule.condition.type,
-                    triggerTime: this.faultRule.condition.triggerTime || null,
-                    triggerAssociatedDeviceCode: this.faultRule.condition.triggerAssociatedDeviceCode || null
-                }
-            };
-            setFailureModeNew(param, this.$route.query.group).then(res=>{
-                this.$message.success('创建故障成功！');
-                this.resetForm();
-            }).catch((error)=>{
-                this.$messageBox('创建故障失败: ' + error.message);
-            });
-        },
-        deviceSelect(em) {
-            if (this.field.toUpperCase() === 'triggerAssociated'.toUpperCase() && em._type.toUpperCase() === 'Section'.toUpperCase()) {
-                if (em._type.toUpperCase() === 'Section'.toUpperCase() && em.parentName) {
-                    this.triggerAssociatedDevice = em._type + '-' + em.parentName + '-' + em.name;
-                } else {
-                    this.triggerAssociatedDevice = em._type + '-' + em.name;
-                }
-                this.faultRule.condition.triggerAssociatedDeviceCode = em.code;
-            } else if (this.field.toUpperCase() === 'triggerActive'.toUpperCase() && em._type.toUpperCase() === 'Train'.toUpperCase()) {
-                this.faultRule.condition.triggerDeviceType = this.covertType(em._type);
-                this.faultRule.condition.triggerDeviceCode = em.code;
-                if (em._type.toUpperCase() === 'Section'.toUpperCase() && em.parentName) {
-                    this.triggerDevice = em._type + '-' + em.parentName + '-' + em.name;
-                } else if (em._type.toUpperCase() === 'Train'.toUpperCase()) {
-                    this.triggerDevice = em._type + '-' + em.code;
-                } else {
-                    this.triggerDevice = em._type + '-' + em.name;
-                }
-                this.triggerStatusList = [];
-                const faultStatus = FaultStatusEnum[this.faultRule.condition.triggerDeviceType];
-                if (faultStatus) {
-                    const list = Object.keys(faultStatus);
-                    list.forEach(key=>{
-                        this.triggerStatusList.push({label:faultStatus[key], value:key});
-                    });
-                }
-                this.field = '';
-                this.faultRule.condition.triggerDeviceStatus = (this.triggerStatusList[0] || {}).value;
-            }
-        },
-        dragEvent() {
-            const offset = this.offset;
-            const dialogHeaderEl = document.querySelector('.falutChooseTitle');
-            const dragDom = document.querySelector('#faultChoose');
-            dialogHeaderEl.style.cursor = 'move';
-
-            /** 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);*/
-            const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
-
-            dialogHeaderEl.onmousedown = (e) => {
-                /**  鼠标按下，计算当前元素距离可视区的距离*/
-                const disX = e.clientX - dialogHeaderEl.offsetLeft;
-                const disY = e.clientY - dialogHeaderEl.offsetTop;
-
-                /**  获取到的值带px 正则匹配替换*/
-                let styL, styT;
-
-                /**  注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px*/
-                if (sty.left.includes('%')) {
-                    // eslint-disable-next-line no-useless-escape
-                    styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
-                    styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
-                } else {
-                    // eslint-disable-next-line no-useless-escape
-                    styL = +sty.left.replace(/\px/g, '');
-                    // eslint-disable-next-line no-useless-escape
-                    styT = +sty.top.replace(/\px/g, '');
-                }
-
-                document.onmousemove = function (e) {
-                    /** 通过事件委托，计算移动的距离*/
-                    const l = e.clientX - disX;
-                    const t = e.clientY - disY;
-
-                    /** 移动当前元素*/
-                    // dragDom.style.left = `${l + styL}px`;
-                    // dragDom.style.top = `${t + styT}px`;
-
-                    /** 移动当前元素*/
-                    if (l + styL < 0) {
-                        dragDom.style.left = `0px`;
-                    } else if (l + styL > document.body.clientWidth - dragDom.clientWidth - 10) {
-                        dragDom.style.left = `${document.body.clientWidth - dragDom.clientWidth - 10}px`;
-                    } else {
-                        dragDom.style.left = `${l + styL}px`;
-                    }
-                    if (t + styT <= offset) {
-                        dragDom.style.top = offset + `px`;
-                    } else if (t + styT > document.body.clientHeight - dragDom.clientHeight - 10) {
-                        dragDom.style.top = `${document.body.clientHeight - dragDom.clientHeight - 10}px`;
-                    } else {
-                        dragDom.style.top = `${t + styT}px`;
-                    }
-
-                    /** 将此时的位置传出去*/
-                    // binding.value({ x: e.pageX, y: e.pageY });
-                };
-
-                document.onmouseup = function () {
-                    document.onmousemove = null;
-                    document.onmouseup = null;
-                };
-            };
-        }
-    }
-};
-</script>
-<style lang="scss">
-    #faultChoose .card .queryList .el-card .el-card__body .el-table--border .el-table__body-wrapper{
-        height: 135px !important;
-        overflow-y: auto !important;
-    }
-    #faultChoose .el-button--mini {
-        margin-left: 5px;
-    }
-    .triggerFaultListLeft{
-        display: inline-block;
-        float: left;
-        width: 730px;
-    }
-    // 谷歌、safari、qq浏览器、360浏览器滚动条样式
-	// 定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
-	#faultChoose .el-table__body-wrapper::-webkit-scrollbar {
-		width: 6px;
-        height: 6px;
-		// height: 110px;
-		background-color: #FFFFFF;
-	}
-	/*定义滚动条轨道 内阴影+圆角*/
-	#faultChoose .el-table__body-wrapper::-webkit-scrollbar-track {
-		// box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-		border-radius: 10px;
-		background-color: #FFFFFF;;
-	}
-	/*定义滑块 内阴影+圆角*/
-	#faultChoose .el-table__body-wrapper::-webkit-scrollbar-thumb {
-		border-radius: 10px;
-		// box-shadow: inset 0 0 6px rgba(0,0,0,.3);
-		background-color: #eaeaea;
-	}
-	/*滑块效果*/
-	#faultChoose .el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
-		border-radius: 5px;
-		// box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-		background: rgba(0,0,0,0.4);
-	}
-	/*IE滚动条颜色*/
-	html {
-		scrollbar-face-color:#bfbfbf;/*滚动条颜色*/
-		scrollbar-highlight-color:#000;
-		scrollbar-3dlight-color:#000;
-		scrollbar-darkshadow-color:#000;
-		scrollbar-Shadow-color:#adadad;/*滑块边色*/
-		scrollbar-arrow-color:rgba(0,0,0,0.4);/*箭头颜色*/
-		scrollbar-track-color:#eeeeee;/*背景颜色*/
-	}
-</style>
-<style scoped rel="stylesheet/scss" lang="scss">
-    .triggerFaultInfo{
-        margin-bottom:10px;
-        padding: 10px 10px 10px 15px;
-    }
-    .triggerFaultList{
-        font-size: 14px;
-        margin-top: 10px;
-        line-height: 20px;
-    }
-    .triggerFaultTitle{
-        font-size: 15px;
-        font-weight: bold;
-    }
-    .falutChooseTitle{
-        padding: 15px;
-        cursor: all-scroll;
-    }
-    #faultChoose{
-        width: 1000px;
-        position: absolute;
-        left: 30%;
-        top: 20%;
-        background: #fff;
-        padding:0px 0px 15px 0px;
-        // transform: translate3d(-50%,-50%,0);
-        border-radius: 6px;
-        z-index:999;
-    }
-    .faultChooseFoot{
-        display: inline-block;
-        float: right;
-        margin-right: 20px;
-        margin-top: 20px;
-    }
-    .closeFalutChoose{
-        position: absolute;
-        right: 0px;
-        top: 0px;
-        width: 35px;
-        height: 35px;
-        cursor: pointer;
-    }
-    .closeFalutChooseIn{
-        font-size: 20px;
-        margin-left: 5px;
-        margin-top: 10px;
-    }
-    .targetCard{
-        box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-        border-top: 1px #ebeef5 solid;
-    }
-    .targetFormItem{
-        margin-bottom: 12px;
-    }
-    .targetCardHead{
-        padding: 5px;
-        display: inline-block;
-        width: 100%;
-        margin-bottom: 10px;
-        border-bottom: 1px #f4f4f4 solid;
-        text-align: right;
-        padding-right: 15px;
-    }
-</style>
diff --git a/src/views/newMap/displayCity/demonMenu.vue b/src/views/newMap/displayCity/demonMenu.vue
deleted file mode 100644
index 5f012d359..000000000
--- a/src/views/newMap/displayCity/demonMenu.vue
+++ /dev/null
@@ -1,224 +0,0 @@
-<template>
-  <div>
-    <div v-if="isAllShow&&project != 'bjd'" class="display_top_draft" :style="allStyle">
-      <div class="btn_hover" @click="menuClick">菜单</div>
-      <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
-        <el-button v-if="jl3dmodelShow && !isContest && project !== 'bjd'" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
-        <!-- 司机视角 -->
-        <!-- <el-button v-if="$route.query.lineCode === '15'" size="small" type="jumpjlmap3d" @click="jumpjlmap3dDriver">司机视角</el-button> -->
-        <el-button v-if="$route.query.lineCode === '15'" size="small" @click="clCaAnCall">经典案例分析</el-button>
-        <el-button v-if="$route.query.lineCode === '15'" size="small" @click="normStudy">规范学习</el-button>
-        <el-button v-if="$route.query.lineCode === '16'" size="small" @click="showLineBoard">占线板</el-button>
-      </el-button-group>
-    </div>
-    <Jl3dRailway-Device
-      v-if="deviceif"
-      v-show="deviceShow"
-      ref="Jl3dRailwayDevice"
-      :panel-show="deviceShow"
-      @closedevice3dview="jumpjlmap3dmodel"
-    />
-    <Jl3dRailway-Drive v-show="drivingShow" ref="Jl3dRailwayDrive" :panel-show="drivingShow" @showdriving="showdriving" />
-    <draw-select ref="drawSelect" />
-    <line-board ref="lineBoard" />
-  </div>
-</template>
-<script>
-import Jl3dRailwayDevice from '@/views/jlmap3d/railwaydevice/jl3drailwaydevice';
-import Jl3dRailwayDrive from '@/views/jlmap3d/railwaydrive/jl3drailwaydrive';
-
-import { getSessionStorage } from '@/utils/auth';
-import { EventBus } from '@/scripts/event-bus';
-import { getPostByProjectCode } from '@/api/learn';
-import { ProjectCode } from '@/scripts/ProjectConfig';
-import DrawSelect from '@/jmapNew/theme/datie_01/menus/dialog/drawSelect';
-import LineBoard from './lineBoard';
-export default {
-    name:'DemonMenu',
-    components:{
-        Jl3dRailwayDevice,
-        Jl3dRailwayDrive,
-        DrawSelect,
-        LineBoard
-    },
-    props:{
-        isAllShow:{
-            type:Boolean,
-            require:true
-        },
-        jl3dmodelShow:{
-            type:Boolean,
-            require:true
-        },
-        jl3dnameShow:{
-            type:Boolean,
-            require:true
-        },
-        cctvShow:{
-            type:Boolean,
-            require:true
-        },
-        trafficplanShow:{
-            type:Boolean,
-            require:true
-        },
-        traffictrainShow:{
-            type:Boolean,
-            require:true
-        },
-        scheduleLoadShow:{
-            type:Boolean,
-            require:true
-        },
-        driverShow:{
-            type:Boolean,
-            require:true
-        },
-        schedulePreviewShow:{
-            type:Boolean,
-            require:true
-        },
-        jlmap3dFaultShow:{
-            type:Boolean,
-            require:true
-        },
-        allStyle:{
-            type:String,
-            default() {
-                return '';
-            }
-        }
-    },
-    data() {
-        return {
-            hoverBtn: false,
-            btnWidth: 0,
-            group:'',
-            mapId:'',
-            lineCode:'',
-            practiceDisabled:false,
-            deviceif:false,
-            deviceShow: true,
-            drivingShow: false,
-            messageBoard: 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')
-        };
-    },
-    computed:{
-        isDrive() {
-            return this.$route.query.prdType == '04';
-        },
-        project() {
-            return getSessionStorage('project');
-        },
-        isContest() {
-            return this.$route.params.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
-        },
-        running() {
-            return this.$store.state.training.started;
-        },
-        isLocal() { // 是否为本地项目
-            return process.env.VUE_APP_PRO === 'local';
-        }
-    },
-    mounted() {
-        this.group = this.$route.query.group;
-        this.mapId = this.$route.query.mapId;
-        this.lineCode = this.$route.query.lineCode;
-        EventBus.$on('loadScene', () => {
-            this.practiceDisabled = true;
-        });
-        EventBus.$on('quitScene', () => {
-            this.practiceDisabled = false;
-        });
-        if (this.project) {
-            getPostByProjectCode(ProjectCode[this.project]).then(resp => {
-                if (resp.data) {
-                    this.messageBoard = true;
-                }
-            }).catch(() => {
-                console.log('获取留言板信息失败');
-            });
-        }
-
-        if (this.$route.query.project == 'zzww') {
-            this.jumpjlmap3dDriver();
-        }
-    },
-    methods:{
-        menuClick() {
-            this.hoverBtn = !this.hoverBtn;
-            if (this.hoverBtn) {
-                this.btnWidth = 600;
-            } else {
-                this.btnWidth = 0;
-            }
-        },
-        clCaAnCall() {
-            this.$refs.drawSelect.doShow(null, 'clCaAn');
-        },
-        normStudy() {
-            this.$refs.drawSelect.doShow(null, 'normStudy');
-        },
-        showLineBoard() {
-            this.$refs.lineBoard.doShow();
-        },
-        jumpjlmap3dmodel() {
-            if (this.deviceif == false) {
-                this.deviceif = true;
-            } else {
-                if (this.deviceShow == false) {
-                    this.deviceShow = true;
-                } else {
-                    this.deviceShow = false;
-                }
-            }
-
-        },
-        showdriving() {
-            this.drivingShow = false;
-        },
-        jumpjlmap3dDriver() {
-            this.drivingShow = true;
-            this.$refs.Jl3dRailwayDrive.show(this.mapId, this.group);
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.display_top_draft{
-		position: absolute;
-		left: 5px;
-		top: 15px;
-		height: 32px;
-		overflow: hidden;
-		padding-left: 44px;
-        z-index: 35;
-		.btn_hover{
-			position: absolute;
-			left: 0;
-			top: 0;
-			z-index: 2;
-			color: #4e4d4d;
-			font-size: 14px;
-			background: #fff;
-			padding: 8px;
-			border-radius: 5px;
-			display: block;
-			cursor: pointer;
-			float: left;
-			height: 32px;
-		}
-		.button_group_box{
-			float: left;
-			transition: all 0.5s;
-			overflow: hidden;
-            margin-left: -700px;
-			// transform: translateX(0px);
-		}
-	}
-</style>
diff --git a/src/views/newMap/displayCity/index.vue b/src/views/newMap/displayCity/index.vue
deleted file mode 100644
index cbda37016..000000000
--- a/src/views/newMap/displayCity/index.vue
+++ /dev/null
@@ -1,311 +0,0 @@
-<template>
-  <div
-    v-loading="loading"
-    element-loading-text="玩命初始化中"
-    element-loading-background="rgba(0, 0, 0, 0.5)"
-    class="main"
-    :style="{width: canvasWidth+'px',height:'100%',position:'absolute',overflow:'hidden'}"
-  >
-    <template>
-      <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" @start="start" @end="end" />
-    </template>
-    <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
-  </div>
-</template>
-<script>
-import { getSessionStorage } from '@/utils/auth';
-import { mapGetters } from 'vuex';
-import { OperateMode } from '@/scripts/ConstDic';
-import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
-import MenuDemon from './menuDemon';
-import MenuSystemTime from '@/views/newMap/displayCity/menuSystemTime';
-import { getSimulationInfoNew, ranAsPlan } from '@/api/simulation';
-import { destroySimulation, initSimulation, getSimulationInfoByGroup } from '@/api/rtSimulation';
-import { loadMapDataById } from '@/utils/loaddata';
-import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'DisplayDraft',
-    components: {
-        MapSystemDraft,
-        MenuDemon,
-        MenuSystemTime
-    },
-    data() {
-        return {
-            offset: 15,
-            offsetBottom: 15,
-            tipBottom: 0,
-            textStatusHeight: 0,
-            planRunning:false,
-            dataError: false,
-            group:'',
-            loading: false
-        };
-    },
-    computed:{
-        ...mapGetters([
-            'canvasWidth'
-        ]),
-        mode() {
-            return this.$route.params.mode;
-        },
-        project() {
-            return getSessionStorage('project');
-        },
-        isDemon() {
-            return this.mode === 'demon' && !(this.project.includes('drts') || this.$route.query.thirdDrts);
-        },
-        isContest() {
-            return this.mode === 'demon' && (this.project.includes('drts') || this.$route.query.thirdDrts);
-        },
-        isExam() {
-            return this.mode === 'exam';
-        },
-        isLesson() {
-            return (this.mode === 'teach' || this.mode === 'manage');
-        },
-        isScript() {
-            return this.mode === 'script';
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        width() {
-            return this.$store.state.app.width;
-        },
-        height() {
-            return this.$store.state.app.height;
-        }
-    },
-    watch:{
-        '$store.state.socket.permissionOver': function () {
-            this.$alert('用户权限已被收回', '提示', {
-                confirmButtonText: '确定',
-                callback: action => {
-                    this.back();
-                }
-            });
-        },
-        '$store.state.config.menuBarLoadedCount': function (val) { // menuBar加载完成
-            this.setPosition();
-        },
-        '$store.state.app.windowSizeCount': function() { // 窗口缩放
-            this.setWindowSize();
-        },
-        '$store.state.training.prdType': function (val) { // 根据权限类型计算高度
-            this.setPosition();
-            if (val == '01') { this.switchModeInner('01'); } else { this.switchModeInner('02'); }
-        },
-        '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
-            if (this.planRunning) {
-                this.$store.dispatch('training/simulationStart');
-            }
-        },
-        $route() {
-            if (!this.isLesson && !this.isExam) {
-                this.initLoadData();
-            }
-        }
-    },
-    beforeDestroy() {
-        destroySimulation(this.group);
-        this.$store.dispatch('training/reset');
-        // this.$store.dispatch('map/mapClear');
-    },
-    async mounted() {
-        this.setWindowSize();
-        this.initLoadData();
-    },
-    methods:{
-        // 结束加载状态
-        endViewLoading(isSuccess) {
-            if (!isSuccess) {
-                this.$store.dispatch('map/mapClear');
-            }
-            this.$nextTick(() => {
-                EventBus.$emit('viewLoading', false);
-            });
-        },
-        // 仿真错误时，被动退出时调用
-        async back() {
-            if (this.isExam) {
-                await this.$refs.menuExam.back();
-            } else if (this.isLesson) {
-                await this.$refs.lessonMenu.back();
-            } else if (this.isDemon) {
-                await this.$refs.menuDemon.back();
-            } else if (this.isScript) {
-                await this.$refs.menuScript.back();
-            } else if (this.isContest) {
-                await this.$refs.menuDispatherContest.back();
-            }
-        },
-        // 设置各个按钮的定位
-        setPosition() {
-            this.$nextTick(() => {
-                this.offset = 10;
-                this.offsetBottom = 15;
-                const menuBar = document.getElementById('menuBar');
-                const menuTool = document.getElementById('menuTool');
-                const menuBottom = document.getElementById('menuButton');
-                const menuButtonsBox = document.getElementById('menuButtons_box');
-                const textStatus = document.getElementById('textStatus');
-                if (menuBar) {
-                    this.offset = (menuBar.offsetHeight || 0) + 15;
-                }
-                if (menuTool) {
-                    this.offset = (menuTool.offsetHeight || 0) + 15;
-                }
-                const buttonWidth = this.width - 1200; // B box widht
-                if (menuBottom && buttonWidth < 780) {
-                    this.offsetBottom = (menuBottom.offsetHeight || 0) + 15;
-                }
-                if (menuButtonsBox) {
-                    this.tipBottom = (menuButtonsBox.offsetHeight || 0) + 15;
-                }
-                if (textStatus) {
-                    this.textStatusHeight = textStatus.offsetHeight || 0;
-                    textStatus.style.top = this.offset - 15 + 'px';
-                }
-            });
-        },
-        // 缩放设置
-        setWindowSize() {
-            const width = this.width;
-            const height = this.height;
-            this.$store.dispatch('config/resize', { width, height });
-            // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-        },
-        //  初始化
-        initLoadData() {
-            this.group = this.$route.query.group;
-            this.$store.dispatch('training/reset');
-            this.loadSimulationInfo();
-            this.loadMapData();
-        },
-        // 新版地图根据仿真group获取仿真基础信息
-        async loadSimulationInfo() {
-            const resp = await getSimulationInfoByGroup(this.group);
-            if (resp && resp.code == 200 && resp.data) {
-                if (!resp.data.dataError) {
-                    this.$store.dispatch('socket/handleSimulationState', resp.data.state);
-                    this.$store.dispatch('runPlan/setRunPlanInfo', resp.data.runPlan);
-                    this.$store.dispatch('socket/setSimulationSpeed', resp.data.speed);
-                    this.planRunning = resp.data.planRunning;
-                    if (resp.data.planRunning) {
-                        this.$store.commit('training/start');
-                    }
-                } else {
-                    this.$messageBox('此地图数据正在维护中,无法运行！');
-                }
-                this.dataError = resp.data.dataError;
-            }
-        },
-        // 通过showMode切换显示效果
-        switchModeInner(swch) {
-            // let showMode = '03';
-            // if (swch == '01') {
-            //     showMode = '03';
-            // } else if (swch == '02') {
-            //     showMode = '02';
-            // }
-
-            const list = [];
-            const mapDevice = this.$store.state.map.mapDevice;
-            for (const key in mapDevice) {
-                list.push(mapDevice[key]);
-            }
-
-            if (swch == '01') {
-                this.$jlmap.updateShowStation(list, this.$store.state.training.centerStationCode); // 显示全部元素
-            } else {
-                this.$jlmap.updateShowStation(list, ''); // 显示全部元素
-            }
-
-            // this.$jlmap.updateShowMode(list, showMode); // 二次过滤
-        },
-        // 加载地图数据
-        loadMapData() {
-            if (parseInt(this.mapId)) {
-                this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-                loadMapDataById(this.mapId, 'simulation');
-            } else {
-                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', 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() {
-            this.loading = true;
-            initSimulation(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);
-                        this.$store.dispatch('map/initSimulationButton');
-                    });
-                });
-                setTimeout(() => {
-                    this.loading = false;
-                }, 1500);
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox(this.$t('display.demon.endSimulationFail'));
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
deleted file mode 100644
index 4c0156915..000000000
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ /dev/null
@@ -1,663 +0,0 @@
-<template>
-  <el-dialog
-    title="车站股道图"
-    :visible="dialogVisible"
-    width="99%"
-    z-index="3000"
-    top="5vh"
-    class="lineBoard"
-    center
-    :before-close="handleClose"
-  >
-    <div style="height: 500px; overflow-y: auto;background: #DFE3E6;padding: 7px;">
-      <div style="width: 100%;display: flex;align-items: center;margin-bottom: 10px;">
-        <div
-          v-for="item in showStationList"
-          :key="item.code"
-          class="tab-box"
-          :style="{background: selectCode === item.code ? '#F1F1F1': '#DBDBDB', color: selectCode === item.code ? '#000': '#ccc'}"
-          @click="selectStandCode(item.code)"
-        >
-          {{ item.name }}
-        </div>
-      </div>
-      <div v-for="item in trackList" :key="item.id" style="display: flex; justify-content: space-between;border-top: 1px solid #fff;padding: 3px;height: 36px;align-items: center;" :style="{background: item.oddNumber? '#BAC4CF':'#D2D8DB'}">
-        <!--<div
-          style="padding: 5px 20px;border-radius: 5px;border-width: 2px;border-style: solid;width: 120px;"
-          :style="{borderColor: item.occupied ? '#f00': '#DFE3E6', fontWeight: item.occupied? 'bold': 'normal', color:item.occupied? '#f00':'#1e2024' }"
-        >{{ item.trackName }}</div>-->
-        <div style="width: 150px;display: flex;">
-          <el-dropdown v-show="item.showTrack" trigger="click">
-            <div
-              style="width: 110px;padding: 5px 20px;border-radius: 5px;border-width: 2px;border-style: solid;display: flex;justify-content: space-between;background: #fff;"
-              :style="{borderColor: item.occupied ? '#f00': '#DFE3E6', fontWeight: item.occupied? 'bold': 'normal', color:item.occupied? '#f00':'#1e2024' }"
-            >
-              <span>{{ item.trackName }}</span>
-              <i class="el-icon-caret-bottom" />
-            </div>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>黄金糕</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-          <div v-show="item.showTrack" style="width: 30px;height: 30px;background: #fff;border-radius: 5px;margin-left: 5px;" />
-        </div>
-        <div v-show="!item.noData" style="width: 80px;color: #f00;font-weight: bolder;">{{ item.tripNumber }}</div>
-        <div v-show="!item.noData" style="background: #FFCBEC;border: 1px solid #315FD1;border-radius: 3px;font-size: 10px;width: 15px;" :style="{borderColor:item.trainType?'#315FD1':'#DFE3E6'}">{{ item.trainType?'客':'客' }}</div>
-        <div v-show="!item.noData" style="width: 60px;">{{ item.trainDistanceInfo }}</div>
-        <div v-show="!item.noData" style="width: 120px;">
-          <el-select v-model="item.process" placeholder="请选择" size="mini" style="width: 120px;" :disabled="true">
-            <el-option
-              v-for="elem in sectionStatusList"
-              :key="elem.value"
-              :label="elem.label"
-              :value="elem.value"
-            />
-          </el-select>
-        </div>
-        <div v-show="!item.noData" style="display: flex;width: 300px;">
-          <div v-show="item.receivingRouteCode" :style="{ background: item.receivingNotice ? '#29CA42': '#ccc' }" class="button-box-fir" @click="doShowRecDep(item,'rec')">接预</div>
-          <div
-            v-show="item.receivingRouteCode"
-            class="button-box-sec"
-            :style="{ background: handleBackground(item.receivingRouteLock, item.receivingRouteAutoTrigger) }"
-            @contextmenu="popMenuShow(item, 'rec' ,$event)"
-            @click="doShowRoute(item, 'rec')"
-          >
-            {{ '接路' + (item.receivingRouteLock ? '':getRouteName(item.receivingRouteCode)) }}
-          </div>
-          <div v-show="item.receivingRouteCode" :style="{ background: item.arrive ? '#29CA42': '#ccc' }" class="button-box-fir" style="margin-left: 10px;cursor: default;" @click="doShowRecDep(item, 'arrive')">到点</div>
-        </div>
-        <div v-show="!item.noData" style="width: 120px;color: #f00;">
-          <el-row><div>{{ item.arriveTime || '-' }}</div></el-row>
-          <el-row><div>{{ item.departureTime|| '-' }}</div></el-row>
-        </div>
-        <div v-show="!item.noData" style="width: 120px;color: #f00;font-style:italic;">
-          <el-row><div>{{ item.planArriveTime|| '-' }}</div></el-row>
-          <el-row><div>{{ item.planDepartureTime || '-' }}</div></el-row>
-        </div>
-        <div v-show="!item.noData" style="width: 150px;color: #f00;">
-          <el-row>{{ item.receivingDirection||'-' }}</el-row>
-          <el-row>{{ item.departureDirection||'-' }}</el-row>
-        </div>
-        <div /><!--起点--终点-->
-        <div v-show="!item.noData" style="display: flex;width: 300px;">
-          <div v-show="item.departureRouteCode" :style="{ background: item.departureNotice ? '#29CA42': '#ccc' }" class="button-box-fir" @click="doShowRecDep(item,'dep')">发预</div>
-          <div
-            v-show="item.departureRouteCode"
-            class="button-box-sec"
-            :style="{ background: handleBackground(item.departureRouteLock, item.departureRouteAutoTrigger) }"
-            @contextmenu="popMenuShow(item, 'dep' ,$event)"
-            @click="doShowRoute(item, 'dep')"
-          >
-            {{ '发路' + (item.departureRouteLock ? '':getRouteName(item.departureRouteCode)) }}
-          </div>
-          <div v-show="item.departureRouteCode" :style="{ background: item.departure ? '#29CA42': '#ccc' }" class="button-box-fir" style="margin-left: 10px;cursor: default;" @click="doShowRecDep(item, 'departure')">发点</div>
-        </div>
-        <div v-show="!item.noData" style="width: 80px;color: #f00;font-weight: bolder;">{{ item.tripNumber }}</div>
-        <div style="width: 120px" :style="{fontWeight: item.occupied? 'bold': 'normal', color:item.occupied? '#f00': '#1e2024' }">{{ item.showTrack ? item.trackName: '' }}</div>
-      </div>
-    </div>
-    <div style="background: #DFE3E6;">
-      <div style="padding: 5px;text-align: center;width: 700px;margin: 0 auto;">
-        <div style="background: #999EA7;display: flex;align-items: center;">
-          <div class="button-box">
-            <img :src="arrowPic" class="img-button">
-          </div>
-          <div class="button-box">
-            <img :src="controlPanelPic" class="img-button">
-          </div>
-          <div class="button-box">
-            <img :src="t3Pic" class="img-button">
-          </div>
-          <div class="button-box">
-            <img :src="panelPic" class="img-button">
-          </div>
-          <div class="button-box">
-            <img :src="trainPic" class="img-button">
-          </div>
-          <div class="button-box">
-            <img :src="linkPic" class="img-button">
-          </div>
-          <div class="button-box">
-            <img :src="cameraPic" class="img-button">
-          </div>
-          <div style="width: 270px;height: 36px; background: #fff;border-radius: 5px;" />
-          <div class="button-box">
-            <img :src="unknowPic" class="img-button">
-          </div>
-          <div class="button-box">
-            <div class="img-button">签</div>
-          </div>
-          <div class="button-box">
-            <div class="img-button">令</div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div style="display: flex;margin-top: 5px;justify-content: space-around;background: #DEE2E5;">
-      <div style="width: 49%;margin-top: 10px;">
-        <div style="display: flex;align-items: center;">
-          <div style="background: #0f0;">{{ `进路序列模式：&lt;${readOnlyMap[selectCode1] ? '只读':'可修改'}&gt;` }}</div>
-          <el-button size="mini" style="padding: 7px 4px;" disabled>修改申请</el-button>
-          <el-button size="mini" style="padding: 7px 4px;" disabled>只读申请</el-button>
-          <el-button size="mini" style="padding: 7px 4px;margin-left: 30px;">查找列车</el-button>
-          <el-input v-model="searchTrain" style="width: 70px;height: 25px;" size="mini" />
-          <div style="margin-left: 10px;">上下行</div>
-          <el-select v-model="andDown" size="mini" style="width: 80px;margin-left: 5px;">
-            <el-option
-              v-for="item in andDownList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <div style="margin-left: 10px;">接车口</div>
-          <el-select v-model="andDown" size="mini" style="width: 100px;margin-left: 5px;" disabled>
-            <el-option
-              v-for="item in andDownList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <div style="margin-left: 10px;">发车口</div>
-          <el-select v-model="andDown" size="mini" style="width: 100px;margin-left: 5px;" disabled>
-            <el-option
-              v-for="item in andDownList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </div>
-        <el-table
-          :data="sequenceList"
-          style="width: 100%;margin-top: 10px;"
-          highlight-current-row
-          :row-style="{ background: '#ff0' }"
-          height="180"
-          :default-sort="{prop: 'startTime', order: 'ascending'}"
-          border
-        >
-          <el-table-column width="50" label="序号" align="center">
-            <template slot-scope="scope">
-              <!--:style="{ background: scope.$index? '#f00':'#ff0' }" -->
-              <div>{{ scope.$index }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column property="date" label="注意确认" />
-          <el-table-column property="tripNumber" label="车次" />
-          <el-table-column property="trackName" label="股道" />
-          <el-table-column property="autoTrigger" label="自触">
-            <template slot-scope="scope">
-              <div style="width: 100%;height: 22px;" @contextmenu="popMenuShow(scope.row, '' ,$event)">{{ scope.row.autoTrigger? '√':'' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column property="departure" label="类型">
-            <template slot-scope="scope">
-              <span>{{ scope.row.departure ? '发车':'接车' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column property="status" label="状态">
-            <template slot-scope="scope">
-              <span>{{ getRouteStatus(scope.row.status) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column property="startTime" label="开始时间" />
-          <el-table-column property="planTime" label="计划时间" />
-          <el-table-column property="direction" label="方向" />
-          <el-table-column property="routeCode" label="序列描述">
-            <template slot-scope="scope">
-              <div>{{ getRouteName(scope.row.routeCode) }}</div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="width: 100%;display: flex;align-items: center;margin: 5px 0;">
-          <div
-            v-for="item in showStationList"
-            :key="item.code"
-            class="tab-box"
-            :style="{background: selectCode1 === item.code ? '#F1F1F1': '#DBDBDB', color: selectCode1 === item.code ? '#000': '#ccc'}"
-            @click="selectStandCode1(item.code)"
-          >
-            {{ item.name }}
-          </div>
-        </div>
-      </div>
-      <div style="width: 49%;margin-top: 10px;">
-        <div style="display: flex;align-items: center;">
-          <el-select v-model="unknow" size="mini" disabled>
-            <el-option
-              v-for="item in unknowList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <div>调机-J101</div>
-          <el-button size="mini" disabled>进路预览</el-button>
-          <el-select v-model="unknow1" size="mini" disabled>
-            <el-option
-              v-for="item in unknowList1"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-          <el-button size="mini" disabled>办理进路</el-button>
-          <el-button size="mini" disabled>发送机车</el-button>
-        </div>
-        <el-table
-          :data="tableData1"
-          style="width: 100%;margin-top: 10px;"
-          highlight-current-row
-          border
-          height="180"
-        >
-          <el-table-column type="index" width="50" label="勾" />
-          <el-table-column property="line" label="线路" />
-          <el-table-column property="method" label="方法" />
-          <el-table-column property="nums" label="辆数" />
-          <el-table-column property="direction" label="方向" />
-          <el-table-column property="leadWire" label="牵出线" />
-          <el-table-column property="status" label="状态" />
-          <el-table-column property="leadRoute" label="牵出进路" />
-          <el-table-column property="pushRoute" label="推入进路" />
-          <el-table-column property="note" label="记事" />
-        </el-table>
-      </div>
-    </div>
-    <rec-dep ref="recDep" />
-    <route-selection ref="routeSelection" />
-    <pop-menu ref="popMenu" :menu="menu" style="background: #DFE3E6;" />
-  </el-dialog>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import ArrowPic from '@/assets/datie/arrow.png';
-import PicT3 from '@/assets/datie/picT3.png';
-import ControlPanelPic from '@/assets/datie/controlPanel.png';
-import ControlPanel2Pic from '@/assets/datie/controlPanel2.png';
-import RecDep from '@/jmapNew/theme/datie_02/menus/dialog/recDep';
-import RouteSelection from '@/jmapNew/theme/datie_02/menus/dialog/routeSelection1';
-import PopMenu from '@/components/PopMenu';
-import { menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
-import T3Pic from '@/assets/ctc_icon/t3.png';
-import TrainPic from '@/assets/ctc_icon/train.png';
-import PanelPic from '@/assets/ctc_icon/panel.png';
-import LinkPic from '@/assets/ctc_icon/link.png';
-import CameraPic from '@/assets/ctc_icon/camera.png';
-import UnknowPic from '@/assets/ctc_icon/unknow.png';
-export default {
-    name: 'LineBoard',
-    components: {
-        RecDep,
-        RouteSelection,
-        PopMenu
-    },
-    data() {
-        return {
-            menu: [{label: '设置自触', handler: this.setTrigger, disabled: false}, {label: '取消自触', handler: this.cancelTrigger, disabled: false}],
-            dialogVisible: false,
-            triggerParam: {},
-            selectCode: '',
-            selectCode1: '',
-            arrowPic: ArrowPic,
-            picT3: PicT3,
-            controlPanelPic: ControlPanelPic,
-            controlPanel2Pic: ControlPanel2Pic,
-            t3Pic: T3Pic,
-            panelPic: PanelPic,
-            trainPic: TrainPic,
-            linkPic: LinkPic,
-            cameraPic: CameraPic,
-            unknowPic: UnknowPic,
-            searchTrain: '',
-            andDown: 'all',
-            unknow: '',
-            unknow1: '',
-            tableData1: [],
-            unknowList1: [{label: '全部机车', value: 'all'}],
-            unknowList: [{label: 'J101-执行中', value: 'J101'}],
-            andDownList: [{ label: '全部', value: 'all' }, { label: '上行', value: 'up' }, { label: '下行', value: 'down' }],
-            sectionStatusList: [
-                {label: '办理接车闭塞', value: 'RECEIVING_BLOCK'},
-                {label: '准备接车', value: 'RECEIVING'},
-                {label: '办理接车进路', value: 'RECEIVING_ROUTE'},
-                {label: '列车到达（通过）报点', value: 'ARRIVE'},
-                {label: '办理发车闭塞', value: 'DEPARTURE_BLOCK'},
-                {label: '发车进路办理', value: 'DEPARTURE_ROUTE'},
-                {label: '发车报点', value: 'DEPARTURE'},
-                {label: '流程终止', value: 'FINISH'}
-            ],
-            sequenceMap: {},
-            sequenceList: [],
-            readOnlyMap: {},
-            standTrackSectionMap: {},
-            trackList: [],
-            showStationList: []
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList',
-            'stationList'
-        ])
-    },
-    watch: {
-        '$store.state.socket.simulationReset': function (val) {
-            this.sequenceMap = {};
-            this.sequenceList = [];
-            this.readOnlyMap = {};
-            this.standTrackSectionMap = {};
-            this.trackList = [];
-            this.sectionList.forEach(item => {
-                if (item.standTrack) {
-                    this.standTrackSectionMap[item.code] = { trackName: item.name, occupied: false, belongStation:item.belongStation, lineMap: {}};
-                }
-            });
-        },
-        '$store.state.socket.railCtcStatusMsg': function (val) {
-            if (val && val.length) {
-                val.forEach(item => {
-                    if (item && item.routeSequence && item.routeSequence.lines && item.routeSequence.lines.length) {
-                        item.routeSequence.lines.forEach(elem => {
-                            if (!this.sequenceMap[elem.id]) {
-                                this.sequenceMap[elem.id] = Object.assign(elem, { stationCode: item.stationCode, readOnly: item.readOnly });
-                            } else {
-                                this.sequenceMap[elem.id] = Object.assign(this.sequenceMap[elem.id], elem, { stationCode: item.stationCode, readOnly: item.readOnly });
-                            }
-                        });
-                        this.readOnlyMap[item.stationCode] = item.readOnly;
-                    }
-                    if (item && item.routeSequence && item.routeSequence.deletedLineIds && item.routeSequence.deletedLineIds.length) {
-                        item.routeSequence.deletedLineIds.forEach(elem => {
-                            delete this.sequenceMap[elem];
-                        });
-                    }
-                    if (item && item.trackView && item.trackView.trackLineMap) {
-                        for (const key in item.trackView.trackLineMap) {
-                            if (this.standTrackSectionMap[key] && item.trackView.trackLineMap[key]) {
-                                for (const trainCode in item.trackView.trackLineMap[key]) {
-                                    if (this.standTrackSectionMap[key].lineMap[trainCode]) {
-                                        Object.assign(this.standTrackSectionMap[key].lineMap[trainCode], item.trackView.trackLineMap[key][trainCode]);
-                                    } else { this.standTrackSectionMap[key].lineMap[trainCode] = item.trackView.trackLineMap[key][trainCode]; }
-                                }
-                            }
-                        }
-                    }
-                    if (item && item.trackView && item.trackView.deletedMap) {
-                        for (const key in item.trackView.deletedMap) {
-                            if (this.standTrackSectionMap[key] && item.trackView.deletedMap[key] && item.trackView.deletedMap[key].length) {
-                                const sectionMap = this.standTrackSectionMap[key].lineMap;
-                                item.trackView.deletedMap[key].forEach(trainCode => {
-                                    delete sectionMap[trainCode];
-                                });
-                            }
-                        }
-                    }
-                    if (item && item.trackView && item.trackView.sectionOccupiedMap) {
-                        for (const key in item.trackView.sectionOccupiedMap) {
-                            if (this.standTrackSectionMap[key]) {
-                                this.standTrackSectionMap[key].occupied = item.trackView.sectionOccupiedMap[key];
-                            }
-                        }
-                    }
-                });
-                this.sequenceList = [];
-                for (const key in this.sequenceMap) {
-                    if (this.sequenceMap[key].stationCode === this.selectCode1) {
-                        this.sequenceList.push(this.sequenceMap[key]);
-                    }
-                }
-                this.trackList = [];
-                let oddNumber = true;
-                for (const key in this.standTrackSectionMap) {
-                    if (this.standTrackSectionMap[key].belongStation === this.selectCode) {
-                        if ( JSON.stringify(this.standTrackSectionMap[key].lineMap) !== '{}') {
-                            let flag = true;
-                            const lineMap = this.standTrackSectionMap[key].lineMap;
-                            for (const item in lineMap) {
-                                this.trackList.push(Object.assign({}, lineMap[item], { trackName: this.standTrackSectionMap[key].trackName, occupied: this.standTrackSectionMap[key].occupied, oddNumber: oddNumber, showTrack: flag }));
-                                flag = false;
-                            }
-                            oddNumber = !oddNumber;
-                        } else {
-                            this.trackList.push({trackName: this.standTrackSectionMap[key].trackName, occupied: this.standTrackSectionMap[key].occupied, noData: true, oddNumber: oddNumber, showTrack: true});
-                            oddNumber = !oddNumber;
-                        }
-                    }
-                }
-            }
-        },
-        '$store.state.map.mapDataLoadedCount': function (val) { // 地图数据加载完成
-            this.sectionList.forEach(item => {
-                if (item.standTrack) {
-                    this.standTrackSectionMap[item.code] = { trackName: item.name, occupied: false, belongStation:item.belongStation, lineMap: {}};
-                }
-            });
-        },
-        '$store.state.map.showCentralizedStationCode': function (val) {
-            this.initShowStationList(val);
-        }
-    },
-    mounted() {
-    },
-    methods: {
-        handleClose() {
-            this.dialogVisible = false;
-        },
-        initShowStationList(val) {
-            if (val) {
-                const centralizedStation = this.$store.getters['map/getDeviceByCode'](val);
-                const sn = centralizedStation.sn;
-                this.showStationList = [centralizedStation];
-                this.stationList.forEach(station => {
-                    if (station.sn === sn - 1) {
-                        this.showStationList.unshift(station);
-                    } else if (station.sn === sn + 1) {
-                        this.showStationList.push(station);
-                    }
-                });
-            }
-        },
-        doShow() {
-            this.dialogVisible = true;
-            this.initShowStationList(this.$store.state.map.showCentralizedStationCode);
-            if (this.showStationList && this.showStationList.length) {
-                this.selectStandCode(this.$store.state.map.showCentralizedStationCode);
-                this.selectStandCode1(this.$store.state.map.showCentralizedStationCode);
-            }
-        },
-        selectStandCode(code) {
-            this.selectCode = code;
-            this.trackList = [];
-            let oddNumber = true;
-            for (const key in this.standTrackSectionMap) {
-                if (this.standTrackSectionMap[key].belongStation === this.selectCode) {
-                    if ( JSON.stringify(this.standTrackSectionMap[key].lineMap) !== '{}') {
-                        let flag = true;
-                        const lineMap = this.standTrackSectionMap[key].lineMap;
-                        for (const item in lineMap) {
-                            this.trackList.push(Object.assign({}, lineMap[item], { trackName: this.standTrackSectionMap[key].trackName, occupied: this.standTrackSectionMap[key].occupied, oddNumber: oddNumber, showTrack: flag }));
-                            flag = false;
-                        }
-                        oddNumber = !oddNumber;
-                    } else {
-                        this.trackList.push({trackName: this.standTrackSectionMap[key].trackName, occupied: this.standTrackSectionMap[key].occupied, noData: true, oddNumber: oddNumber, showTrack: true});
-                        oddNumber = !oddNumber;
-                    }
-                }
-            }
-        },
-        getRouteStatus(status) {
-            if (status === '2') {
-                return '触发完成';
-            } else if (status === '1') {
-                return '正在触发';
-            } else {
-                return '等待中';
-            }
-        },
-        selectStandCode1(code) {
-            this.selectCode1 = code;
-            this.sequenceList = [];
-            for (const key in this.sequenceMap) {
-                if (this.sequenceMap[key].stationCode === this.selectCode1) {
-                    this.sequenceList.push(this.sequenceMap[key]);
-                }
-            }
-        },
-        getRouteName(code) {
-            if (code) {
-                const route = this.$store.state.map.routeData[code];
-                return route ? route.name : '';
-            } else { return ''; }
-        },
-        handleBackground(flag, trigger) {
-            if (flag) {
-                return '#29CA42';
-            } else {
-                return trigger ? '#FFBF2F' : '#CCCCCC';
-            }
-        },
-        doShowRecDep(row, type) {
-            this.$refs.recDep.doShow(row, type, this.selectCode);
-        },
-        doShowRoute(row, type) {
-            this.$refs.routeSelection.doShow(row, type, this.selectCode);
-        },
-        popMenuShow(item, type, e) {
-            if (type === 'rec') {
-                this.menu[0].disabled = item.receivingRouteAutoTrigger;
-                this.menu[1].disabled = !item.receivingRouteAutoTrigger;
-                this.triggerParam = { stationCode: this.selectCode, tripNumber: item.tripNumber, routeCode: item.receivingRouteCode };
-            } else if (type === 'dep') {
-                this.menu[0].disabled = item.departureRouteAutoTrigger;
-                this.menu[1].disabled = !item.departureRouteAutoTrigger;
-                this.triggerParam = { stationCode: this.selectCode, tripNumber: item.tripNumber, routeCode: item.departureRouteCode };
-            } else {
-                this.menu[0].disabled = item.autoTrigger;
-                this.menu[1].disabled = !item.autoTrigger;
-                this.triggerParam = { stationCode: this.selectCode1, tripNumber: item.tripNumber, routeCode: item.routeCode };
-            }
-            this.$refs.popMenu.resetShowPosition({x: e.x, y:e.y});
-        },
-        setTrigger() {
-            const param = { ...this.triggerParam, trigger: true };
-            commitOperate(menuOperate.CTC.autoTrigger, param, 3).then(({valid, operate})=>{
-                this.loading = false;
-                this.triggerParam = {};
-                if (valid) {
-                    this.doClose();
-                    this.$message.success('设置自动触发成功！');
-                }
-            }).catch((e) => {
-                console.error(e);
-                this.loading = false;
-                this.doClose();
-                this.triggerParam = {};
-                this.$refs.noticeInfo.doShow();
-            });
-        },
-        cancelTrigger() {
-            const param = { ...this.triggerParam, trigger: false };
-            commitOperate(menuOperate.CTC.autoTrigger, param, 3).then(({valid, operate})=>{
-                this.triggerParam = {};
-                if (valid) {
-                    this.$message.success('取消自动触发成功！');
-                }
-            }).catch((e) => {
-                console.error(e);
-                this.triggerParam = {};
-                this.$message.error('取消自动触发失败！');
-            });
-        }
-    }
-};
-</script>
-
-<style scoped>
-	/deep/ .el-dialog__header{
-		background: #B4B6B9;
-	}
-	/deep/ .el-dialog__body{
-		background: #8D939D;
-		padding: 10px;
-	}
-	/deep/ .el-table td{
-		padding: 0;
-	}
-	/deep/ .el-table th{
-		padding: 0;
-		background: #C5CBD0;
-		color: #1e2024;
-	}
-	/deep/ .el-input.is-disabled .el-input__inner {
-		color: #606266;
-	}
-	.img-box {
-		width: 30px;
-		height: 30px;
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		margin: 10px 5px 5px 5px;
-		background: #FAFAFA;
-	}
-	.tab-box {
-		padding: 5px;
-		text-align: center;
-		width: 33% ;
-		font-size: 18px;
-		border: 2px solid #F5F5F5;
-		cursor: pointer;
-		border-radius: 5px;
-		margin-left: 5px;
-	}
-	.button-box-sec{
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		font-size: 14px;
-		background: #ccc;
-		padding: 5px;
-		cursor: pointer;
-		margin-left: 10px;
-		width: 160px;
-		text-align: center;
-	}
-	.button-box-fir{
-		border: 1px solid #ccc;
-		border-radius: 4px;
-		font-size: 14px;
-		background: #ccc;
-		padding: 5px;
-		cursor: pointer;
-	}
-	.pop-background {
-		background: #DFE3E6;
-	}
-	.img-button{
-		width: 30px;
-		height: 30px;
-		background: #EBEBEB;
-		border: 2px inset #fff;
-		border-radius: 5px;
-		line-height: 27px;
-	}
-	.img-button:hover{
-		border: 2px outset #fff;
-	}
-	.img-button:active{
-		border: 2px outset #fff;
-	}
-	.button-box{
-		padding: 3px;
-		background: #EBEBEB;
-		width: 36px;
-		height: 36px;
-		border-radius: 5px;
-		margin: 3px;
-		cursor: pointer;
-	}
-</style>
diff --git a/src/views/newMap/displayCity/menuDemon.vue b/src/views/newMap/displayCity/menuDemon.vue
deleted file mode 100644
index 9f76d40c8..000000000
--- a/src/views/newMap/displayCity/menuDemon.vue
+++ /dev/null
@@ -1,342 +0,0 @@
-<template>
-  <div>
-    <demon-menu
-      ref="demonMenu"
-      :is-all-show="!dataError"
-      :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'"
-    />
-
-    <menu-schema
-      ref="menuSchema"
-      :offset="offset"
-      :data-error="dataError"
-      :offset-bottom="offsetBottom"
-    />
-
-    <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'||$route.query.lineCode == '14'}" :style="{bottom: offsetBottom + 'px'}">
-      <el-button-group class="button-group-box">
-        <template v-if="!dataError">
-          <template v-if="!projectDevice">
-            <el-button v-if="simulationPause" v-loading="pauseLoading" type="primary" size="small" @click="start">开始</el-button>
-            <el-button v-if="!simulationPause" v-loading="pauseLoading" type="warning" size="small" @click="pause">暂停</el-button>
-            <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
-          </template>
-        </template>
-        <el-button v-if="project !='bjd'" type="primary" size="small" @click="back">{{ projectDevice || project === 'wjls'?'退出':$t('display.demon.back') }}</el-button>
-      </el-button-group>
-    </div>
-  </div>
-
-</template>
-
-<!-- 单人仿真 -->
-<script>
-import DemonMenu from './demonMenu';
-import { Notification } from 'element-ui';
-import MenuSchema from '@/views/newMap/displayCity/menuSchema';
-import { getGoodsTryUse } from '@/api/management/goods';
-import {clearSimulation } from '@/api/simulation';
-import { PermissionType } from '@/scripts/ConstDic';
-import { getCountTime } from '@/utils/index';
-import { TrainingMode } from '@/scripts/ConstDic';
-// import { quitScriptNew } from '@/api/simulation';
-import { setGoodsTryUse } from '@/api/management/goods';
-// import {loadScriptNew } from '@/api/simulation';
-import StatusIcon from '@/views/components/StatusIcon/statusIcon';
-import { simulationPause, simulationStart } from '../../../api/rtSimulation';
-// import Vue from 'vue';
-import { getSessionStorage } from '@/utils/auth';
-import { destroySimulation } from '@/api/rtSimulation';
-// import { EventBus } from '@/scripts/event-bus';
-
-export default {
-    name: 'MenuDemon',
-    components: {
-        MenuSchema,
-        DemonMenu,
-        StatusIcon
-    },
-    props: {
-        offset: {
-            type: Number,
-            required: true
-        },
-        offsetBottom: {
-            type: Number,
-            required: true
-        },
-        dataError: {
-            type: Boolean,
-            default() {
-                return false;
-            }
-        },
-        textStatusHeight: {
-            type: Number,
-            default() {
-                return 0;
-            }
-        }
-    },
-    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: '',
-                remarks: ''
-            },
-            isScriptRun:false,
-            jl3dname: this.$t('display.demon.threeDimensionalView'),
-            jl3dmodel: this.$t('display.demon.deviceView'),
-            isShow3dmodel :true,
-            isGoback: false,
-            runing:false,
-            pauseLoading: false,
-            prdTypeMap: {
-                '01': '01', 	// 现地 => 现地
-                '02': '02', 	// 行调 => 行调
-                '04': '02', 	// 司机 => 行调
-                '05': ''		// 派班 => null
-            }
-        };
-    },
-    computed: {
-        isShowScheduling() {
-            return this.$route.query.prdType == '05';
-        },
-        isDrive() {
-            return this.$route.query.prdType == '04';
-        },
-        group() {
-            return this.$route.query.group;
-        },
-        projectDevice() {
-            return this.$route.query.projectDevice;
-        },
-        project() {
-            return getSessionStorage('project');
-        },
-        simulationPause() {
-            return this.$store.state.socket.simulationPause;
-        }
-    },
-    watch: {
-        '$store.state.training.subscribeCount': function () {
-            this.group && this.initLoadPage();
-        },
-        '$store.state.socket.simulationRoleList':function(val) {
-            (val || []).forEach(item => {
-                if (item.messageType === 'KICK_OUT' && item.userId == this.$store.state.user.id) {
-                    !this.isGoback && this.back();
-                }
-            });
-        },
-        '$store.state.socket.simulationOver':function(val) {
-            !this.isGoback && this.back();
-        },
-        '$store.state.socket.simulationStart':function(val) {
-            if (val) {
-                this.setRuning(true);
-                this.$store.dispatch('training/simulationStart').then(() => {
-                    this.$store.dispatch('map/setShowCentralizedStationNum');
-                });
-            }
-        },
-        '$store.state.socket.simulationReset':function(val) {
-            this.setRuning(false);
-        }
-    },
-    created() {
-        this.$store.dispatch('training/setPrdType', this.$route.query.prdType);
-        switch (this.$store.state.training.prdType) {
-        case '02': { this.userRole = 'DISPATCHER'; break; }
-        case '01': { this.userRole = 'STATION_SUPERVISOR'; break; }
-        case '04': { this.userRole = 'DRIVER'; break; }
-        case '05': { this.userRole = 'DEPOT_DISPATCHER'; break; }
-        default: { this.userRole = 'AUDIENCE'; break; }
-        }
-    },
-    beforeDestroy() {
-        if (this.time) {
-            this.setTryTime();
-            clearTimeout(this.time);
-        }
-        this.$store.dispatch('scriptRecord/updateSimulationPause', false);
-        this.$store.dispatch('map/resetActiveTrainList', true);
-    },
-    mounted() {
-        this.$store.dispatch('training/end', TrainingMode.NORMAL);
-        this.$nextTick(() => {
-            this.$refs.demonMenu.menuClick();
-        });
-    },
-    methods: {
-        async initLoadPage() {
-            try {
-                const memberData = Object.values(this.$store.state.training.memberData);
-                const member = memberData.find(eachMember=>{
-                    return eachMember.userId == this.$store.state.user.id;
-                });
-                const deviceId = member ? member.deviceId : '';
-                if (deviceId) {
-                    const list = [];
-                    const mapDevice = this.$store.state.map.mapDevice;
-                    for (const key in mapDevice) {
-                        list.push(mapDevice[key]);
-                    }
-                    this.$jlmap.updateShowStation(list, deviceId);
-                }
-                this.$jlmap.setCenter(deviceId);
-                if (this.try != '0') {
-                    this.loadInitData();
-                }
-            } catch (error) {
-                console.log(error);
-            }
-        },
-        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();
-        },
-        start() {
-            this.pauseLoading = true;
-            simulationStart(this.$route.query.group).then(resp => {
-                this.pauseLoading = false;
-            }).catch((e) =>{
-                this.$message.error('仿真开始失败！');
-            });
-        },
-        pause() {
-            this.pauseLoading = true;
-            simulationPause(this.$route.query.group).then(resp => {
-                this.pauseLoading = false;
-            }).catch((e) => {
-                this.pauseLoading = false;
-                this.$message.error('仿真暂停失败！');
-            });
-        },
-        setRuning(run) {
-            this.runing = run;
-        },
-        end() {
-            this.$emit('end');
-        },
-        clearAllData() {
-            this.$refs.chatbox.clearAllData();
-        },
-        async back() {
-            this.isGoback = true;
-            if (this.projectDevice || this.project === 'wjls') {
-                destroySimulation(this.group).then(res=>{
-                    this.$store.dispatch('training/over').then(() => {
-                        this.$store.dispatch('LogOut').then(() => {
-                            location.reload();
-                        });
-                    });
-                });
-            } else {
-                if (this.project === 'bjd') {
-                    window.close();
-                } else {
-                    this.$store.dispatch('map/setShowCentralizedStationCode', '');
-                    history.go(-1);
-                    Notification.closeAll();
-                }
-
-            }
-        },
-        setTryTime() {
-            if (this.try) {
-                const data = { time: this.tryTime, goodsId: this.goodsId };
-                if (data.goodsId) {
-                    setGoodsTryUse(data);
-                }
-
-            }
-        },
-        quit() {
-            window.close();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .display-card {
-        z-index: 9;
-        display: inline-block;
-        position: absolute;
-        top: 17px;
-        left: 160px;
-        height: 32px;
-    }
-
-    .display-card .el-row {
-        line-height: 32px !important;
-    }
-
-    .display-score {
-        background-color: black;
-        display: -moz-inline-box;
-        display: inline-block;
-        text-align: left;
-        height: 32px;
-        line-height: 24px;
-        border-radius: 4px;
-        padding-left: 2px;
-        margin-left: 10px;
-        font-family: "Microsoft" !important;
-        font-size: 18px !important;
-        color: #fff;
-    }
-	.haerbin_btn_box{
-		width: 450px;
-		bottom: 15px!important;
-	}
-	.display-draft {
-		position: absolute;
-		right: 10px;
-		bottom: 15px;
-		.button-group-box{
-			float: right;
-		}
-	}
-</style>
diff --git a/src/views/newMap/displayCity/menuSchema.vue b/src/views/newMap/displayCity/menuSchema.vue
deleted file mode 100644
index 11d55d953..000000000
--- a/src/views/newMap/displayCity/menuSchema.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <div class="schema" :style="{top: offset+'px'}">
-    <el-select v-model="speed" style="width: 100px;" size="small" @change="speedChange">
-      <el-option
-        v-for="item in speedList"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value"
-      />
-    </el-select>
-    <el-button v-if="!isScheduling" size="small" :type="faultMode ? '':'primary' " @click="changeOperateMode()">{{ faultMode?'切换到普通模式[Tab]':'切换到故障模式[Tab]' }}</el-button>
-    <fault-choose ref="faultChoose" :group="group" :offset="offset" />
-  </div>
-</template>
-<script>
-import FaultChoose from './demon/faultChoose';
-import { OperateMode } from '@/scripts/ConstDic';
-import { getByGroupStationList } from '@/api/jmap/map';
-import { getSessionStorage } from '@/utils/auth';
-import { loadRunPlanData } from '@/utils/loaddata';
-import { EventBus } from '@/scripts/event-bus';
-import { timesSpeedPlayback } from '@/api/rtSimulation';
-
-// 右上角操作
-export default {
-    name: 'MenuSchema',
-    components: {
-        FaultChoose
-    },
-    props: {
-        offset: {
-            type: Number,
-            required: true
-        },
-        dataError: {
-            type: Boolean,
-            default() {
-                return false;
-            }
-        }
-    },
-    data() {
-        return {
-            mode: OperateMode.NORMAL,
-            OperateMode: OperateMode,
-            viewDisabled: true,
-            faultMode: false,
-            speedList:[
-                { value: 1, label: '1倍速' },
-                { value: 2, label: '2倍速' },
-                { value: 3, label: '3倍速' },
-                { value: 4, label: '4倍速' },
-                { value: 5, label: '5倍速' },
-                { value: 6, label: '6倍速' },
-                { value: 7, label: '7倍速' },
-                { value: 8, label: '8倍速' },
-                { value: 9, label: '9倍速' },
-                { value: 10, label: '10倍速' }
-            ],
-            speed: 1
-        };
-    },
-    computed: {
-        group() {
-            return this.$route.query.group;
-        },
-        isScript() {
-            return this.$route.params.mode === 'script';
-        },
-        isDemon() {
-            return this.$route.params.mode === 'demon';
-        },
-        isScheduling() {
-            return this.$route.query.prdType === '05';
-        }
-    },
-    watch: {
-        '$store.state.training.triggerFaultCount': function () {
-            this.setFault();
-        },
-        '$store.state.runPlan.loadRunPlanCount': function () {
-            this.viewDisabled = false;
-        },
-        '$store.state.socket.simulationSpeed': function (val) {
-            this.speed = val;
-        }
-    },
-    mounted() {
-        EventBus.$on('CheckFaultModeEvent', () => {
-            if (!this.isScheduling) {
-                this.changeOperateMode();
-            }
-        });
-    },
-    methods: {
-        loadRunData() {
-            this.$store.dispatch('runPlan/clear').then(() => {
-                if (this.group) {
-                    this.viewDisabled = true;
-                    // 获取排序的车站列表
-                    getByGroupStationList(this.group).then(response => {
-                        this.$store.dispatch('runPlan/setStations', response.data).then(() => {
-                            loadRunPlanData(this.group, this.dataError);
-                        });
-                    }).catch(() => {
-                        this.$messageBox(this.$t('display.schema.getStationListFail'));
-                    });
-                }
-            });
-        },
-        changeOperateMode() {
-            this.faultMode = !this.faultMode;
-            let mode = OperateMode.NORMAL;
-            if (this.faultMode) {
-                mode = OperateMode.FAULT;
-            }
-            this.$store.dispatch('training/changeOperateMode', { mode: mode });
-        },
-        speedChange(val) {
-            timesSpeedPlayback(this.$route.query.group, val).then(resp => {
-                this.$message.success(`设置${val}倍速成功!`);
-            }).catch(e => {
-                this.$message.error('设置倍速失败！');
-            });
-        },
-        setFault() {
-            this.$refs.faultChoose.doShow();
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    .schema {
-        z-index: 36;
-        display: inline;
-        position: absolute;
-        right: 5px;
-    }
-
-    /deep/ .el-button+.el-button {
-        margin-left: 0px;
-    }
-</style>
diff --git a/src/views/newMap/displayCity/utils.js b/src/views/newMap/displayCity/utils.js
deleted file mode 100644
index faf615ccb..000000000
--- a/src/views/newMap/displayCity/utils.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import ConstConfig from '@/scripts/ConstConfig';
-import Cookies from 'js-cookie';
-import store from '@/store/index';
-export function covertMemberData (activeTrainList, resp) {
-    let lastData = JSON.stringify(resp);
-    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
-    roleTypeList.forEach(function(element) {
-        const rolename = element.value;
-        if (Cookies.get('user_lang') == 'en') {
-            lastData = lastData.replace(new RegExp(rolename, 'g'), element.enLabel);
-        } else {
-            lastData = lastData.replace(new RegExp(rolename, 'g'), element.label);
-        }
-    });
-    lastData = JSON.parse(lastData);
-    const lastMemberList = [];
-    // const electricDispatcherList = [];
-    const deviceListData = [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []];
-    const driverList = [];
-    lastData.forEach((member, index)=>{
-        if (member.userId && member.userId == store.state.user.id) {
-            member.disabled = true;
-            member.userName = store.state.user.nickname;
-            store.dispatch('training/setOrignalUserRoleId', member.id);
-        } else {
-            member.disabled = false;
-        }
-        const userName = member.userName ? '-' + member.userName : '';
-        const name = member.name ? '-' + member.name : '';
-        if (member.deviceCode) {
-            const device = store.getters['map/getDeviceByCode'](member.deviceCode);
-            member.deviceName = device.name || device.groupNumber;
-            member.label = member.type + member.deviceName + name + userName;
-            member.normalName = member.type + member.deviceName + name;
-        } else {
-            member.deviceName = '';
-            member.label = member.type + name + userName;
-            member.normalName = member.type + name;
-        }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长 '];
-        const deviceTypeIndex = deviceType.indexOf(member.type);
-        if (deviceTypeIndex >= 0) {
-            if (deviceTypeIndex == 3) {
-                if (activeTrainList.length > 0) {
-                    if (activeTrainList.includes(member.deviceCode)) {
-                        deviceListData[deviceTypeIndex].push(member);
-                    }
-                }
-                lastMemberList.push(member);
-                driverList.push(member);
-            } else {
-                deviceListData[deviceTypeIndex].push(member);
-                lastMemberList.push(member);
-            }
-        }
-    });
-    return {lastMemberList:lastMemberList, deviceListData:deviceListData, driverList:driverList};
-}
diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue
index 665be16a3..a31df182b 100644
--- a/src/views/newMap/displayNew/demonChat.vue
+++ b/src/views/newMap/displayNew/demonChat.vue
@@ -42,11 +42,7 @@ export default {
         }
     },
     watch:{
-        // 剧本执行完成消息
-        '$store.state.socket.scriptFinish':function(val, old) {
-            this.$message('剧本演出完毕');
-            this.$refs.scriptTip.resetScriptTip();
-        }
+
     },
     mounted() {
     },
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index a33c4c9f7..91bed0ddf 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -180,7 +180,7 @@ export default {
                                 break;
                             }
                             case 'DEPOT_DISPATCHER': {
-                                member.label = '车辆段信号楼' + (member.name ? member.name : '');
+                                member.label = '车辆段/停车场调度' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'PARENT_DEPARTMENT': {
@@ -191,8 +191,8 @@ export default {
                                 member.label = '电力调度' + (member.name ? member.name : '');
                                 break;
                             }
-                            case 'PARKING_LOT_SIGNAL_BUILDING': {
-                                member.label = '停车场信号楼' + (member.name ? member.name : '');
+                            case 'SIGNAL_BUILDING': {
+                                member.label = '信号楼' + (member.name ? member.name : '');
                                 break;
                             }
                             case 'STATION_ASSISTANT': {
diff --git a/src/views/newMap/displayNew/exam/index.vue b/src/views/newMap/displayNew/exam/index.vue
index a0b7a0eeb..913d102fc 100644
--- a/src/views/newMap/displayNew/exam/index.vue
+++ b/src/views/newMap/displayNew/exam/index.vue
@@ -95,7 +95,7 @@ export default {
             const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
             if (userInfo.type === 'STATION_SUPERVISOR') {
                 if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(userInfo.deviceCode) && picture.type === 'chainStation');
                     if (picture) {
                         const mapDevice = this.$store.state.map.mapDevice;
                         const list = [];
@@ -254,7 +254,7 @@ export default {
             list.forEach(item => {
                 if (item.messageType === 'PLAY_CHANGE' && item.userId == this.$store.state.user.id && item.type === 'STATION_SUPERVISOR') {
                     if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === item.deviceCode && picture.type === 'chainStation');
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(item.deviceCode) && picture.type === 'chainStation');
                         if (picture) {
                             const mapDevice = this.$store.state.map.mapDevice;
                             const list = [];
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 05623d9ec..4c3dc46d2 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -32,7 +32,7 @@ import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 import { clearSimulation, getSimulationInfoNew, ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { loadMapDataById } from '@/utils/loaddata';
-import DispatcherStation from '../jointTrainingNew/dispatcherStation';
+// import DispatcherStation from '../jointTrainingNew/dispatcherStation';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
diff --git a/src/views/newMap/displayNew/lesson/LeftSlider.vue b/src/views/newMap/displayNew/lesson/LeftSlider.vue
index a0c9926e7..ae9fea71e 100644
--- a/src/views/newMap/displayNew/lesson/LeftSlider.vue
+++ b/src/views/newMap/displayNew/lesson/LeftSlider.vue
@@ -96,7 +96,7 @@ export default {
                     const query = {
                         group: this.$route.query.group, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.$route.query.mapId, lineCode:this.$route.query.lineCode, noPreLogout: this.$route.query.noPreLogout
                     };
-                    this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query });
+                    this.$router.replace({ path: `${UrlConfig.display}/teach`, query: query });
                     launchFullscreen();
                     // }).catch(error => {
                     //     this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
diff --git a/src/views/newMap/displayNew/lesson/index.vue b/src/views/newMap/displayNew/lesson/index.vue
index 111eea871..43d754ea2 100644
--- a/src/views/newMap/displayNew/lesson/index.vue
+++ b/src/views/newMap/displayNew/lesson/index.vue
@@ -131,7 +131,7 @@ export default {
             const userInfo = this.$store.state.training.simulationUserList.find(user => user.userId == this.$store.state.user.id );
             if (userInfo.type === 'STATION_SUPERVISOR') {
                 if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === userInfo.deviceCode && picture.type === 'chainStation');
+                    const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(userInfo.deviceCode) && picture.type === 'chainStation');
                     if (picture) {
                         const mapDevice = this.$store.state.map.mapDevice;
                         const list = [];
@@ -366,7 +366,7 @@ export default {
             list.forEach(item => {
                 if (item.messageType === 'PLAY_CHANGE' && item.userId == this.$store.state.user.id && item.type === 'STATION_SUPERVISOR') {
                     if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === item.deviceCode && picture.type === 'chainStation');
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(item.deviceCode) && picture.type === 'chainStation');
                         if (picture) {
                             const mapDevice = this.$store.state.map.mapDevice;
                             const list = [];
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index c6f509d22..021fe9bdc 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -276,7 +276,7 @@ export default {
             //     }
             // });
             const routeData = this.$router.resolve({
-                path:'/displayNew/demon',
+                path:'/display/demon',
                 query:{
                     lineCode:this.$route.query.lineCode,
                     group: this.$route.query.group,
diff --git a/src/views/newMap/displayNew/menuSystemTime.vue b/src/views/newMap/displayNew/menuSystemTime.vue
index 576df343e..49d0170ef 100644
--- a/src/views/newMap/displayNew/menuSystemTime.vue
+++ b/src/views/newMap/displayNew/menuSystemTime.vue
@@ -51,7 +51,7 @@ export default {
             return this.$store.state.scriptRecord.simulationPause;
         },
         isDisplay() {
-            return this.$route.path.includes('displayNew') || this.$route.path.includes('scriptDisplayNew');
+            return this.$route.path.includes('display') || this.$route.path.includes('scriptDisplayNew');
         },
         isShowDate() { // 西安一 三号线
             return (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) && this.isDisplay;
diff --git a/src/views/newMap/displayNew/practiceDisplay.vue b/src/views/newMap/displayNew/practiceDisplay.vue
index c851074e9..cba588abe 100644
--- a/src/views/newMap/displayNew/practiceDisplay.vue
+++ b/src/views/newMap/displayNew/practiceDisplay.vue
@@ -365,7 +365,7 @@ export default {
                 this.openWindow.close();
             }
             const routeData = this.$router.resolve({
-                path:'/displayNew/demon',
+                path:'/display/demon',
                 query:{
                     mapId:this.$route.query.mapId,
                     group:this.$route.query.group,
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
index 53f2ae6f9..51b654514 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/index.vue
@@ -55,7 +55,7 @@ import { loadDraftScriptNew } from '@/api/designPlatform';
 import Vue from 'vue';
 import { ScriptMode } from '@/scripts/ConstDic';
 import ConstConfig from '@/scripts/ConstConfig';
-import DispatcherStation from '@/views/newMap/jointTrainingNew/dispatcherStation.vue';
+// import DispatcherStation from '@/views/newMap/jointTrainingNew/dispatcherStation.vue';
 
 export default {
     name: 'DisplayDraft',
@@ -209,7 +209,7 @@ export default {
                             }
                         });
                         window.open(routeData.href);
-                    } else if (role.type == '车辆段信号楼') {
+                    } else if (role.type == '车辆段/停车场调度') {
                         prdType = '05';
                         type = 'DEPOT_DISPATCHER';
                         this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
@@ -221,10 +221,10 @@ export default {
                         prdType = '';
                         type = 'ELECTRIC_DISPATCHER';
                         this.$store.dispatch('training/setRoles', 'ELECTRIC_DISPATCHER');
-                    } else if (role.type == '停车场信号楼') {
+                    } else if (role.type == '车辆段/停车场信号楼') {
                         prdType = '';
-                        type = 'PARKING_LOT_SIGNAL_BUILDING';
-                        this.$store.dispatch('training/setRoles', 'PARKING_LOT_SIGNAL_BUILDING');
+                        type = 'SIGNAL_BUILDING';
+                        this.$store.dispatch('training/setRoles', 'SIGNAL_BUILDING');
 
                     } else if (role.type == '车站助理') {
                         prdType = '';
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
index 098a0f671..d10f1d3da 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptButtonGroup.vue
@@ -209,7 +209,7 @@ export default {
     methods:{
         goCtc() {
             const routeData = this.$router.resolve({
-                path:'/displayNew/demon',
+                path:'/display/demon',
                 query:{
                     lineCode:this.$route.query.lineCode,
                     group: this.$route.query.group,
@@ -329,7 +329,7 @@ export default {
                         type: 'role',
                         children: result.deviceListData[1]
                     }, {
-                        label: '车辆段信号楼',
+                        label: '车辆段/停车场调度',
                         id: 'depotDispatcher',
                         type: 'role',
                         children: result.deviceListData[4]
@@ -346,7 +346,7 @@ export default {
                         children: result.deviceListData[6]
                     },
                     {
-                        label: '停车场信号楼',
+                        label: '车辆段/停车场信号楼',
                         id: 'parkingLotSignalBuilding',
                         type: 'role',
                         children: result.deviceListData[7]
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue
index 027bfd7bf..74b37f575 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptPreview/scriptPreviewChat.vue
@@ -47,11 +47,7 @@ export default {
     computed:{
     },
     watch:{
-        // 剧本执行完成消息
-        '$store.state.socket.scriptFinish':function(val, old) {
-            this.$message('剧本演出完毕');
-            this.$refs.scriptTip.resetScriptTip();
-        }
+
     },
     methods:{
         clearAllData() {
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index dc0ddb731..4a51cde37 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -165,7 +165,7 @@ export default {
                 });
                 if (member) {
                     const memberType = ['STATION_SUPERVISOR', 'DISPATCHER', 'DRIVER', 'MAINTAINER', 'DEPOT_DISPATCHER', 'PARENT_DEPARTMENT',
-                        'ELECTRIC_DISPATCHER', 'PARKING_LOT_SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
+                        'ELECTRIC_DISPATCHER', 'SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER',
                         'STATION_PASSENGER', 'STATION_SWITCH_MAN', 'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER', ' TRAIN_MASTER'];
                     const prdTypeList = ['01', '02', '04', '', '05', '', '', '', '', '', '01', '', '01', '', '', '', ''];
                     const index = memberType.indexOf(member.type);
diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue
index f5e70a5c9..c3012832c 100644
--- a/src/views/newMap/displayNew/selectStation.vue
+++ b/src/views/newMap/displayNew/selectStation.vue
@@ -70,7 +70,7 @@ export default {
                 const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode);
                 if (station) {
                     if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === station.code && picture.type === 'chainStation');
+                        const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(station.code) && picture.type === 'chainStation');
                         if (picture) {
                             const mapDevice = this.$store.state.map.mapDevice;
                             const list = [];
diff --git a/src/views/newMap/displayNew/utils.js b/src/views/newMap/displayNew/utils.js
index 199f51e80..58dd673a1 100644
--- a/src/views/newMap/displayNew/utils.js
+++ b/src/views/newMap/displayNew/utils.js
@@ -37,7 +37,7 @@ export function covertMemberData (activeTrainList, resp) {
             member.label = member.type + name + userName;
             member.normalName = member.type + name;
         }
-        const deviceType = ['行调', '通号', '行值', '司机', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长'];
+        const deviceType = ['行调', '通号', '行值', '司机', '车辆段/停车场调度', '上级部门', '电力调度', '车辆段/停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长'];
 
         /**
          * 车站助理
@@ -75,3 +75,25 @@ export function covertMemberData (activeTrainList, resp) {
     });
     return {lastMemberList:lastMemberList, deviceListData:deviceListData, driverList:driverList};
 }
+
+export function handleMemberList(list) {
+    const memberList = [];
+    const roleTypeList = ConstConfig.ConstSelect.roleTypeNew;
+    const roleTypeMap = {};
+    roleTypeList.forEach(item => {
+        roleTypeMap[item.value] = Cookies.get('user_lang') === 'en' ? item.enLabel : item.label;
+    });
+    (list || []).forEach(member => {
+        const name = member.name ? '-' + member.name : '';
+        const type = roleTypeMap[member.type];
+        if (member.deviceCode) {
+            const device = store.getters['map/getDeviceByCode'](member.deviceCode);
+            const deviceName = device ? device.name || device.groupNumber : '';
+            member.label = type + deviceName + name;
+        } else {
+            member.label = type + name;
+        }
+        memberList.push(member);
+    });
+    return memberList;
+}
diff --git a/src/views/newMap/jlmapNew/index.vue b/src/views/newMap/jlmapNew/index.vue
index c3440d01a..fa05818ae 100644
--- a/src/views/newMap/jlmapNew/index.vue
+++ b/src/views/newMap/jlmapNew/index.vue
@@ -3,7 +3,6 @@
     <div v-show="maskOpen" class="mask" />
     <div :id="canvasId" class="display_canvas" />
     <progress-bar ref="progressBar" />
-    <!-- <zoom-box v-if="!showZoom && !isScreen" :scale-rate="dataZoom.scaleRate" @setShrink="setShrink" @setMagnify="setMagnify" /> -->
     <show-mode v-show="isDesign" :draft-show="draftShow" :local-station-show="localStationShow" @setShowMode="setShowMode" />
     <switch-station v-show="isDesign && (showMode === '03') && localStationShow" ref="switchStation" :draft-show="draftShow" :concentration-station-list="concentrationStationList" @setShowStation="setShowStation" />
     <div v-if="show && !isScreen" class="zoom-view" :style="{ width: width +'px'}">
@@ -35,7 +34,6 @@
 import Vue from 'vue';
 import localStore from 'storejs';
 import Jlmap from '@/jmapNew/map';
-// import ZoomBox from './pendant/zoom';
 import ShowMode from './pendant/showMode';
 import SwitchStation from './pendant/switchStation';
 import ProgressBar from '@/views/components/progressBar/index';
@@ -47,7 +45,6 @@ import { runPassenger} from '@/api/jlmap3d/assets3d';
 export default {
     name: 'JlmapVisual',
     components: {
-        // ZoomBox,
         ProgressBar,
         ShowMode,
         SwitchStation
@@ -86,12 +83,6 @@ export default {
         ...mapGetters('training', [
             'mode'
         ]),
-        // canvasId() {
-        //     // debugger;
-        //     const canvasId = ['map', (Math.random().toFixed(5)) * 100000].join('_');
-        //     this.$store.dispatch('config/setCurrentCancasId', { id: canvasId });
-        //     return canvasId;
-        // },
         width() {
             return this.$store.state.config.width;
         },
@@ -242,7 +233,7 @@ export default {
             }
             const prdType = this.$store.state.training.prdType;
             const showMode = { '01': '03', '02': '02'}[prdType] || '';
-
+            console.log('initLoadPage');
             Vue.prototype.$theme = new Theme();
             this.selfJlmap = Vue.prototype.$jlmap = new Jlmap({
                 dom: document.getElementById(this.canvasId),
@@ -272,7 +263,7 @@ export default {
             this.$jlmap.on('dataZoom', this.onDataZoom, this);
             this.$jlmap.on('selected', this.onSelected, this);
             this.$jlmap.on('contextmenu', this.onContextMenu, this);
-            if (this.$route.path.startsWith('/design/usermap/map/draw')) {
+            if (this.$route.path.startsWith('/lineDesign/usermap/map/draw')) {
                 this.$jlmap.on('keyboard', this.onKeyboard, this);
             } else {
                 this.$jlmap.on('keyboard', this.onSimulationKeyboard, this);
@@ -392,8 +383,10 @@ export default {
         },
         // 点击选择事件
         onSelected(em) {
-            const path = window.location.href;
-            if (path.includes('/practiceDisplay')) {
+            // const path = window.location.href;
+            // const search = window.location.search;
+            // if (path.includes('/display/demon') && search.includes('project=bjd')) {
+            if (this.$store.state.map.picture == 'largePassengerView') {
                 if (em.deviceType == 'StationStand') {
                     runPassenger(this.$route.query.group, em.deviceCode).then(netdata => {
                         if (netdata.data) {
@@ -412,7 +405,7 @@ export default {
                             });
                             window.open(routeData.href, '_blank');
                         } else {
-                            window.open(routeData.href, '_blank');
+                            // window.open(routeData.href, '_blank');
                         }
                     });
                 }
@@ -433,7 +426,7 @@ export default {
                             });
                             window.open(routeData.href, '_blank');
                         } else {
-                            window.open(routeData.href, '_blank');
+                            // window.open(routeData.href, '_blank');
                         }
                     });
 
diff --git a/src/views/newMap/jlmapNew/pendant/zoom.vue b/src/views/newMap/jlmapNew/pendant/zoom.vue
index d1c8ea00b..a19278f92 100644
--- a/src/views/newMap/jlmapNew/pendant/zoom.vue
+++ b/src/views/newMap/jlmapNew/pendant/zoom.vue
@@ -38,7 +38,7 @@ export default {
     methods: {
         setPosition() {
             this.$nextTick(() => {
-                const offset = (this.$route.path.includes('displayNew') || this.$route.path.includes('scriptDisplayNew')) && (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) ? 73 : 15;
+                const offset = (this.$route.path.includes('display') || this.$route.path.includes('scriptDisplayNew')) && (this.$route.query.lineCode == 10 || this.$route.query.lineCode == 11) ? 73 : 15;
                 const menuBar = document.getElementById('menuBar');
                 const menuTool = document.getElementById('menuTool');
                 if (menuBar) {
diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index 3873067fc..616882328 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -99,16 +99,16 @@ import { Message } from 'element-ui';
 import { getToken } from '@/utils/auth';
 import MembersManage from './memberManage/membersManage';
 import AddMember from './memberManage/addMember';
-import BaSiDi from '@/views/newMap/displayBaSiDi/baSiDiNew';
-import RpsDialog from '@/views/newMap/displayBaSiDi/rps';
-import TroDialog from '@/views/newMap/displayBaSiDi/tro';
-import CarPack from '@/views/newMap/displayBaSiDi/carPack';
-import TroDetail from '@/views/newMap/displayBaSiDi/troDetail';
-import TraDialog from '@/views/newMap/displayBaSiDi/tra';
-import TtlDialog from '@/views/newMap/displayBaSiDi/ttl';
-import TmtDialog from '@/views/newMap/displayBaSiDi/tmt';
-import AtrDialog from '@/views/newMap/displayBaSiDi/atr';
-import TrainTrunkDetail from '@/views/newMap/displayBaSiDi/trainTrunkDetail';
+// import BaSiDi from '@/views/newMap/displayBaSiDi/baSiDiNew';
+// import RpsDialog from '@/views/newMap/displayBaSiDi/rps';
+// import TroDialog from '@/views/newMap/displayBaSiDi/tro';
+// import CarPack from '@/views/newMap/displayBaSiDi/carPack';
+// import TroDetail from '@/views/newMap/displayBaSiDi/troDetail';
+// import TraDialog from '@/views/newMap/displayBaSiDi/tra';
+// import TtlDialog from '@/views/newMap/displayBaSiDi/ttl';
+// import TmtDialog from '@/views/newMap/displayBaSiDi/tmt';
+// import AtrDialog from '@/views/newMap/displayBaSiDi/atr';
+// import TrainTrunkDetail from '@/views/newMap/displayBaSiDi/trainTrunkDetail';
 import DispatcherStation from './dispatcherStation';
 import TicketInfo from '../trainTicket/ticketInfo';
 import Vue from 'vue';
@@ -454,7 +454,7 @@ export default {
                 this.$jlmap.updateShowMode(list, '02');
             }
             if (this.$store.state.map.map && this.$store.state.map.map.pictureList) {
-                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation');
+                const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCodes && picture.stationCodes.includes(deviceCode) && picture.type === 'chainStation');
                 if (picture) {
                     const mapDevice = this.$store.state.map.mapDevice;
                     const list = [];
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 4ebb137ab..84f919452 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -215,14 +215,6 @@ export default {
         }
     },
     watch: {
-        '$store.state.socket.roleList': function (roleList) { // 综合演练室用户消息
-            if (roleList && roleList.length) {
-                this.$nextTick(() => {
-                    this.addrolesList(roleList);
-                    this.$store.dispatch('config/updateMenuBar');
-                });
-            }
-        },
         '$store.state.socket.simulationOver':function(val) {
             if (val && this.project == 'refereeJsxt') {
                 this.$router.go(-1);
@@ -298,62 +290,6 @@ export default {
         modifySystemTime() {
             this.$refs.modifySysTime.doShow();
         },
-        // 设置用户角色  Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 MAINTAINER 通号
-        addrolesList(list) {
-            list.forEach(item => {
-                if (this.$store.state.user.id == item.id) {
-                    switch (item.userRole) {
-                    case 'INSTRUCTOR':
-                        this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'INSTRUCTOR');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'DISPATCHER':
-                        this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'DISPATCHER');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'STATION_SUPERVISOR':
-                        if (!item['deviceCode']) {
-                            this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
-                            break;
-                        }
-                        this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'STATION_SUPERVISOR');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'STATION_ASSISTANT':
-                        this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'STATION_ASSISTANT');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'CI':
-                        this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'CI');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'DRIVER':
-                        this.$store.dispatch('training/setPrdType', '04'); this.$store.dispatch('training/setRoles', 'DRIVER');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'MAINTAINER':
-                        this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'MAINTAINER');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'IBP':
-                        this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'IBP');
-                        this.$emit('getUserRole');
-                        break;
-                    case 'BIGSCREEN':
-                        this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'BIGSCREEN');
-                        this.$emit('getUserRole');
-                        break;
-                    default:
-                        this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'AUDIENCE');
-                        this.$emit('getUserRole');
-                        break;
-                    }
-                }
-            });
-            if (this.$refs.chatView) {
-                this.$refs.chatView.getUserRole();
-            }
-        },
         selectBeginTime() {
             this.$refs.setTime.doShow();
             console.log(1);
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 5e1ec438a..0ca20dd6a 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -262,7 +262,7 @@ export default {
         },
         goCtc() {
             const routeData = this.$router.resolve({
-                path:'/displayNew/demon',
+                path:'/display/demon',
                 query:{
                     lineCode:this.$route.query.lineCode,
                     group: this.$route.query.group,
diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue
index 827405b49..ad7b24954 100644
--- a/src/views/newMap/mapDraftPicture/createPicture.vue
+++ b/src/views/newMap/mapDraftPicture/createPicture.vue
@@ -7,18 +7,20 @@
   >
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
       <el-form-item label="画面名称：" prop="name">
-        <el-input v-model="ruleForm.name" />
+        <el-input v-model="ruleForm.name" :disabled="edit" />
       </el-form-item>
       <el-form-item label="画面类型：" prop="type">
         <el-select v-model="ruleForm.type" placeholder="请选择画面类型">
           <el-option label="站间透明" value="lucency" />
-          <el-option label="连锁车站" value="chainStation" />
-          <el-option label="大屏显示" value="bigScreen" />
+          <el-option label="联锁" value="chainStation" />
+          <el-option label="大屏" value="bigScreen" />
           <el-option label="区域批量操作" value="regionBatchOperation" />
+          <el-option label="行调" value="dispatchWork" />
+          <el-option label="现地" value="localWork" />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="ruleForm.type !== 'bigScreen'" label="所属车站：" prop="stationCode">
-        <el-select v-model="ruleForm.stationCode" placeholder="请选择">
+      <el-form-item label="所属车站：" prop="stationCodes">
+        <el-select v-model="ruleForm.stationCodes" placeholder="请选择" multiple>
           <el-option
             v-for="item in stationList"
             :key="item.code"
@@ -33,7 +35,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')">创建</el-button>
+        <el-button v-if="!edit" type="primary" @click="submitForm('ruleForm')">创建</el-button>
+        <el-button v-else type="primary" @click="updateData">修改</el-button>
       </el-form-item>
     </el-form>
   </el-dialog>
@@ -49,13 +52,13 @@ export default {
         return {
             centerDialogVisible: false,
             skinCodeList: [],
-            ruleForm: { name: '', type: '', stationCode: '', lineCode: '' },
+            ruleForm: { name: '', type: '', stationCodes: '', lineCode: '' },
             rules: {
                 name: [{ required: true, message: '请输入画面名称', trigger: 'blur' }],
                 type: [{ required: true, message: '请选择画面类型', trigger: 'change' }],
-                stationCode: [{ required: true, message: '请选择车站', trigger: 'change' }],
                 lineCode: [{ required: true, message: '请选择线路', trigger: 'change' }]
-            }
+            },
+            edit: false
         };
     },
     computed: {
@@ -95,12 +98,41 @@ export default {
                 }
             });
         },
+        updateData() {
+            this.$refs.ruleForm.validate((valid) => {
+                const map = this.$store.state.map.map;
+                if (map && map.pictureList && map.pictureList.length) {
+                    const pictureModel = map.pictureList.find(elem => elem.name === this.ruleForm.name);
+                    pictureModel.type = this.ruleForm.type;
+                    pictureModel.stationCodes = this.ruleForm.stationCodes;
+                    pictureModel.lineCode = this.ruleForm.lineCode;
+                    if (map && parseInt(this.$route.params.mapId)) {
+                        saveMap(Object.assign(map, { mapId: this.$route.params.mapId })).then(() => {
+                            this.$message.success('修改画面成功！');
+                            this.doClose();
+                        }).catch(() => {
+                            this.$message.error('修改画面失败！');
+                        });
+                    }
+                } else {
+                    this.$message.error('数据不存在！');
+                }
+            });
+        },
         doClose() {
             this.$refs.ruleForm.resetFields();
             this.centerDialogVisible = false;
         },
-        doShow() {
+        doShow(data) {
+            this.edit = false;
             this.centerDialogVisible = true;
+            if (data) {
+                this.ruleForm.name = data.name;
+                this.ruleForm.type = data.type;
+                this.ruleForm.stationCodes = data.stationCodes;
+                this.ruleForm.lineCode = data.lineCode;
+                this.edit = true;
+            }
         }
     }
 };
diff --git a/src/views/newMap/mapDraftPicture/index.vue b/src/views/newMap/mapDraftPicture/index.vue
index fb0a9cbbd..e24077983 100644
--- a/src/views/newMap/mapDraftPicture/index.vue
+++ b/src/views/newMap/mapDraftPicture/index.vue
@@ -27,6 +27,7 @@
             @createPicture="createPicture"
             @changePicture="changePicture"
             @deletePicture="deletePicture"
+            @editPicture="editPicture"
             @setCenter="setCenter"
           />
         </div>
@@ -128,6 +129,7 @@ export default {
         this.clearAutoSave();
         this.$store.dispatch('map/setPictureDeviceMap', {});
         this.$store.dispatch('map/mapClear');
+        this.$store.dispatch('map/setPictureDeviceMap', {});
     },
     methods: {
         clickRightBtn() {
@@ -366,7 +368,8 @@ export default {
         },
 
         backRoute() {
-            this.$router.push({ path: `/design/usermap/home` });
+            // this.$router.push({ path: `/design/usermap/home` });
+            this.$router.go(-1);
         },
         createPicture() { // 创建 跟新元素
             this.$refs.createPicture.doShow();
@@ -374,6 +377,12 @@ export default {
         changePicture() {
             this.$refs.changePicture.doShow();
         },
+        editPicture() {
+            if (this.pictureName) {
+                const pictureModel = this.$store.state.map.map.pictureList.find(elem => elem.name == this.pictureName);
+                this.$refs.createPicture.doShow(pictureModel);
+            }
+        },
         // 撤销
         revocation() {
             this.$store.dispatch('map/setRevocation');
diff --git a/src/views/newMap/mapDraftPicture/mapoperate/device.vue b/src/views/newMap/mapDraftPicture/mapoperate/device.vue
index b7679d79c..2cfb0e970 100644
--- a/src/views/newMap/mapDraftPicture/mapoperate/device.vue
+++ b/src/views/newMap/mapDraftPicture/mapoperate/device.vue
@@ -68,7 +68,7 @@ export default {
         deviceList () {
             return [...this.sectionList, ...this.signalList, ...this.psdList, ...this.stationStandList, ...this.stationList, ...this.trainWindowList,
                 ...this.arrowList, ...this.automaticRouteButtonList, ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.directionRodList, ...this.espList,
-                ...this.indicatorLightList, ...this.lcList, ...this.lineList, ...this.outerFrameList, ...this.psdList, ...this.resourceList, ...this.responderList,
+                ...this.indicatorLightList, ...this.lcList, ...this.lineList, ...this.outerFrameList, ...this.resourceList, ...this.responderList,
                 ...this.signalButtonList, ...this.splitStationList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList,
                 ...this.zcList];
         },
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index 8d7c87862..11fcfa7c6 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -59,7 +59,6 @@ export default {
             const lineCode = this.$jlmap.lineCode;
             if (lineCode) {
                 this.menus = this.$theme.loadMenuComponent(lineCode);
-                this.$store.commit('training/notifyGetCommandDefinition', lineCode);
             }
         }
     },
@@ -71,7 +70,6 @@ export default {
     methods: {
         reloadMenuComponent(lineCode) {
             this.menus = this.$theme.loadMenuComponent(lineCode); // 加载menu
-            this.$store.commit('training/notifyGetCommandDefinition', lineCode); // 重新加载线路指令
         },
         // 获取设备数据
         getDeviceByEm(em) {
diff --git a/src/views/newMap/mapsystemNew/plugin/setFault.vue b/src/views/newMap/mapsystemNew/plugin/setFault.vue
index c7eabf555..2faefd76d 100644
--- a/src/views/newMap/mapsystemNew/plugin/setFault.vue
+++ b/src/views/newMap/mapsystemNew/plugin/setFault.vue
@@ -150,7 +150,7 @@ export default {
                     faultType: this.form.faultType
                 }
             };
-            this.$store.dispatch('training/nextNew', setp).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', setp).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@@ -171,7 +171,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
index bbb1ce740..be7860b91 100644
--- a/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
+++ b/src/views/newMap/mapsystemNew/plugin/trainingtip.vue
@@ -33,9 +33,6 @@ export default {
     watch: {
         '$store.state.training.tipEvent': function (val) {
             setTimeout(() => { this.tipInit(); }, 300);
-            this.$nextTick(function() {
-                this.tipInit();
-            });
         }
     },
     methods: {
diff --git a/src/views/newMap/newDesignUser/demonList.vue b/src/views/newMap/newDesignUser/demonList.vue
index 905e1ea36..eec2aa4ec 100644
--- a/src/views/newMap/newDesignUser/demonList.vue
+++ b/src/views/newMap/newDesignUser/demonList.vue
@@ -195,7 +195,7 @@ export default {
                     this.$store.dispatch('app/transitionAnimations');
                 }
                 this.$router.push({
-                    path: `/design/usermap/map/pictureDraw/${obj.mapId}/draft`,
+                    path: `/lineDesign/usermap/map/pictureDraw/${obj.mapId}/draft`,
                     query: { name: obj.mapName, lineCode: obj.lineCode }
                 });
                 break;
diff --git a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
index bdf2a3655..fbcf18aa1 100644
--- a/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
+++ b/src/views/newMap/newMapdraft/dataRelation/disStationOperate/detail.vue
@@ -12,7 +12,7 @@
   </el-dialog>
 </template>
 <script>
-import { getDisStationList, deleteDisStation } from '@/api/disStation.js';
+import { getDisStationListPaged, deleteDisStation } from '@/api/disStation';
 import { mapGetters } from 'vuex';
 export default {
     name:'BigRouteDetail',
@@ -101,7 +101,7 @@ export default {
         },
         queryFunction(params) {
             if (this.mapInfo && this.mapInfo.id) {
-                return getDisStationList(this.mapInfo.id, params);
+                return getDisStationListPaged(this.mapInfo.id, params);
             }
         },
         getNameList(codeList) {
diff --git a/src/views/newMap/newMapdraft/index.vue b/src/views/newMap/newMapdraft/index.vue
index 3ea428a24..70de97c87 100644
--- a/src/views/newMap/newMapdraft/index.vue
+++ b/src/views/newMap/newMapdraft/index.vue
@@ -532,6 +532,7 @@ export default {
             //     item.uniqueName = item.name;
             // });
             if (this.$refs.jlmapVisual && map && parseInt(this.$route.params.mapId)) {
+                this.verifyMember(map);
                 if (this.verifySectionPoint(map)) {
                     this.mapSaveing = true;
                     this.$store
@@ -563,6 +564,11 @@ export default {
                 }
             }
         },
+        verifyMember(map) {
+            map.memberMap.METRO = (map.memberMap.METRO || []).filter(item => item.type);
+            map.memberMap.RAILWAY = (map.memberMap.RAILWAY || []).filter(item => item.type);
+            map.memberMap.EMERGENCY = (map.memberMap.EMERGENCY || []).filter(item => item.type);
+        },
         async checkOver() {
             if (this.$refs.jlmapVisual) {
                 const map = this.$store.state.map.map;
@@ -619,7 +625,7 @@ export default {
             }
         },
         backRoute() {
-            this.$router.push({ path: `/design/usermap/home` });
+            this.$router.push({ path: `/lineDesign/usermap/home` });
         },
         updateMapModel(models) {
             this.$store.dispatch('map/updateMapDevices', models);
diff --git a/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue b/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
index 8a3c625fc..6883478f8 100644
--- a/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/ImageControl.vue
@@ -51,7 +51,7 @@ export default {
             mapData: null,
             imageLists: [
                 {
-                    value: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/2292-98507.png`,
+                    value: `${this.$store.state.user.ossUrl}/PICTURE/2022-08-01/2292-98507.png`,
                     label: '电流表'
                 }
             ],
@@ -74,7 +74,7 @@ export default {
                 name: '',
                 rotate: 0,
                 zIndex: 5,
-                url: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/2292-98507.png`,
+                url: `${this.$store.state.user.ossUrl}/PICTURE/2022-08-01/2292-98507.png`,
                 position: {
                     x: 0,
                     y: 0
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue
deleted file mode 100644
index 8e2065cb1..000000000
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig.vue
+++ /dev/null
@@ -1,393 +0,0 @@
-<template>
-  <div v-loading="loading" class="view-control-content">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-card shadow="never" style="width: 80%; margin: 0 auto 15px; border-top: none;">
-        <div slot="header">
-          <span>请选择行调显示设备</span>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div class="content-box-list" style="margin-top: 10px;">
-            <div class="title-box">设备列表</div>
-            <div class="list-box" style="height:400px;overflow:auto">
-              <div v-for="nor in addModel.elementList" :key="nor.code" class="list-content">
-                <div class="name">{{ getDeviceName(nor) }}</div>
-                <div class="close" @click="delList(nor, addModel.elementList)"><i class="el-icon-close" /></div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div class="content-box-list" style="margin-top: 10px">
-            <div style="height: 30px;line-height: 30px;margin-bottom: 10px;">
-              <span class="title-box">修正设备列表</span>
-              <el-button icon="el-icon-plus" size="mini" style="float:right;" circle @click="addAmendPoints" />
-            </div>
-            <template v-for="(elem, i) in amendPointsList">
-              <el-card :key="i" class="box-card">
-                <el-row>
-                  <el-button icon="el-icon-minus" size="mini" style="float:right;" circle @click="delAmendPoints(i)" />
-                </el-row>
-                <el-row style="height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>修正设备：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-select v-model="elem.code" filterable size="mini" placeholder="请选择">
-                      <el-option
-                        v-for="item in [...sectionList, ...signalList, ...trainWindowList]"
-                        :key="item.code"
-                        :label="item.name?item.name:'' + '(' + item.code + ')'"
-                        :value="item.code"
-                      />
-                    </el-select>
-                    <el-button :type="hoverIndex === i?'danger':'primary'" size="mini" @click="hoverClick(i)">激活</el-button>
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'points')" style="margin-top: 10px;">
-                  <el-col :span="5" style="height: 28px;line-height: 28px">
-                    <span>坐标点：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <template v-for="(point, j) in elem.points">
-                      <div :key="j">
-                        <el-input-number v-model="point.x" style="width: 100px" size="mini" controls-position="right" />
-                        <span style="line-height: 28px;">, </span>
-                        <el-input-number v-model="point.y" style="width: 100px" size="mini" controls-position="right" />
-                        <el-button icon="el-icon-plus" size="mini" circle @click="addPoint(j, elem.points)" />
-                        <el-button icon="el-icon-minus" size="mini" circle :disabled="elem.points.length < 3" @click="delPoint(j, elem.points)" />
-                      </div>
-                    </template>
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'position')" style="margin-top: 10px;height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>坐标点：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-input-number v-model="elem.position.x" style="width: 100px" size="mini" controls-position="right" />
-                    <span style="line-height: 28px;">, </span>
-                    <el-input-number v-model="elem.position.y" style="width: 100px" size="mini" controls-position="right" />
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'rotate')" style="margin-top: 10px;height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>旋转角度：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-input-number v-model="elem.rotate" style="width: 100px" size="mini" :min="-360" :max="360" controls-position="right" />
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'reversal')" style="margin-top: 10px;height: 28px;line-height: 28px;">
-                  <el-col :span="5">
-                    <span>车头翻转：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-checkbox v-model="elem.reversal" />
-                  </el-col>
-                </el-row>
-              </el-card>
-            </template>
-          </div>
-        </div>
-      </el-card>
-      <div style="display: table; margin-left: 120px; margin-top: 12px; margin-bottom: 20px;">
-        <el-button type="primary" size="small" :loading="dataLoading" @click="generateData">自动生成</el-button>
-        <el-button type="primary" size="small" :loading="dataLoading" @click="save">保存</el-button>
-        <el-button type="primary" size="small" :loading="dataLoading" @click="clear">清除</el-button>
-        <el-button type="primary" size="small" @click="back">返回</el-button>
-      </div>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { saveMap } from '@/api/jmap/mapdraft';
-
-export default {
-    components: {
-    },
-    props: {
-        selected: {
-            type: Object,
-            default: function () {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            otherData: [],
-            addModel: {
-                type: 'CENTER',
-                elementList: []
-            },
-            amendPointsList: [],
-            loading: false,
-            dataLoading:false,
-            hoverIndex: -1
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList',
-            'stationList',
-            'signalList',
-            'switchList',
-            'stationStandList',
-            'automaticRouteButtonList',
-            'axleCounterResetButtonList',
-            'cycleButtonList',
-            'directionRodList',
-            'indicatorLightList',
-            'lineList',
-            'outerFrameList',
-            'psdList',
-            'responderList',
-            'tbStrategyList',
-            'tempSpeedLimitList',
-            'textList',
-            'totalGuideLockButtonVOList',
-            'seclectDeviceList',
-            'trainWindowList',
-            'signalButtonList'
-        ])
-    },
-    watch: {
-        selected: function (val, oldVal) {
-            this.deviceSelect(val);
-        }
-    },
-    mounted() {
-        this.initData();
-    },
-    methods: {
-        initData() {
-            (this.$store.state.map.map.displayList || []).forEach(item => {
-                if (item.type === 'CENTER') {
-                    this.addModel = item;
-                    this.amendPointsList = this.addModel.amendPointsList ? this.addModel.amendPointsList : [];
-                } else {
-                    this.otherData.push(item);
-                }
-            });
-        },
-        deviceSelect(selected) {
-            if (selected && selected._type.toUpperCase() == 'CheckBox'.toUpperCase()) {
-                this.seclectDeviceList.forEach(item => {
-                    if (this.addModel.elementList.indexOf(item.code) < 0) {
-                        this.addModel.elementList.push(item.code);
-                    }
-                });
-            } else if (selected && this.hoverIndex > -1 && (['Section'.toUpperCase(), 'Signal'.toUpperCase(), 'TrainWindow'.toUpperCase()].includes(selected._type.toUpperCase()))) {
-                this.amendPointsList[this.hoverIndex].code = selected.code;
-            } else if (selected) {
-                if (this.addModel.elementList.indexOf(selected.code) < 0) {
-                    this.addModel.elementList.push(selected.code);
-                }
-            }
-        },
-        hoverClick(index) {
-            this.hoverIndex = this.hoverIndex === index ? -1 : index;
-        },
-        checkDeviceType(data, prop) {
-            if (data.code) {
-                const device = this.$store.getters['map/getDeviceByCode'](data.code);
-                if (device._type === 'Section' && prop === 'points') {
-                    return true;
-                } else if (device._type === 'Signal' && (prop === 'position' || prop === 'rotate')) {
-                    return true;
-                } else if (device._type === 'TrainWindow' && (prop === 'position' || prop === 'reversal')) {
-                    return true;
-                }
-            }
-            return false;
-        },
-        getDeviceName(code) {
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            return device.name || device.code;
-        },
-        // 删除当前选中
-        delList(model, list) {
-            list.forEach((nor, index) => {
-                if (nor == model) {
-                    list.splice(index, 1);
-                }
-            });
-            this.seclectDeviceList.forEach((item, index) => {
-                if (item.code == model) {
-                    this.seclectDeviceList.splice(index, 1);
-                }
-            });
-        },
-        clear() {
-            this.addModel = {
-                type: 'CENTER',
-                elementList: []
-            };
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.otherData],
-                mapId: this.$route.params.mapId
-            };
-            this.dataLoading = true;
-            saveMap(Object.assign(map, param)).then(response => {
-                this.$message.success('保存行调配置成功');
-                this.dataLoading = false;
-            }).catch(() => {
-                this.dataLoading = false;
-                this.$messageBox('保存行调配置失败');
-            });
-        },
-        addAmendPoints() {
-            this.amendPointsList.push({ code: '', points: [{ x: 0, y: 0 }, { x:0, y:0 }], position: {x: 0, y: 0}, rotate:0, reversal: false });
-        },
-        delAmendPoints(index) {
-            this.hoverIndex = -1;
-            this.amendPointsList.splice(index, 1);
-        },
-        save() {
-            if (this.amendPointsList.find(elem => !elem.code)) {
-                this.$messageBox('修正设备未选择!');
-                return;
-            }
-            const map = this.$store.state.map.map;
-            this.addModel.amendPointsList = this.amendPointsList;
-            const param = {
-                displayList: [...this.otherData, this.addModel],
-                mapId: this.$route.params.mapId
-            };
-            this.dataLoading = true;
-            saveMap(Object.assign(map, param)).then(response => {
-                this.$message.success('保存行调配置成功');
-                this.dataLoading = false;
-            }).catch(() => {
-                this.dataLoading = false;
-                this.$messageBox('保存行调配置失败');
-            });
-        },
-        back() {
-            this.$emit('goDraw');
-        },
-        generateData() {
-            this.loading = true;
-            this.addModel = {
-                type: 'CENTER',
-                elementList: []
-            };
-            const stationCodes = [];
-            this.stationList.forEach(item => {
-                if (item.depot) {
-                    stationCodes.push(item.code);
-                }
-            });
-
-            [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
-                ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
-                if (!stationCodes.includes(item.stationCode)) {
-                    this.addModel.elementList.push(item.code);
-                }
-            });
-            [...this.directionRodList].forEach(item => {
-                if (!stationCodes.includes(item.deviceStationCode)) {
-                    this.addModel.elementList.push(item.code);
-                }
-            });
-            this.stationList.forEach(item => {
-                if (!stationCodes.includes(item.code)) {
-                    this.addModel.elementList.push(item.code);
-                }
-            });
-            this.psdList.forEach(item => {
-                const stand = this.$store.getters['map/getDeviceByCode'](item.standCode);
-                if (!stationCodes.includes(stand.stationCode)) {
-                    this.addModel.elementList.push(item.code);
-                }
-            });
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.otherData, this.addModel],
-                mapId: this.$route.params.mapId
-            };
-            saveMap(Object.assign(map, param)).then(response => {
-                this.loading = false;
-                this.$message.success('保存行调配置成功');
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox('保存行调配置失败');
-            });
-        },
-        addPoint(index, points) {
-            points.splice(index, 0, {x:0, y:0});
-        },
-        delPoint(index, points) {
-            points.splice(index, 1);
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.title-box{
-		padding-left: 10px;
-		border-left: 4px solid red;
-		margin-bottom: 10px;
-	}
-	.box-card {
-		width: 100%;
-		padding: 5px;
-	}
-	.coordinate {
-		overflow: hidden;
-
-		.title {
-			text-align: right;
-			font-size: 14px;
-			color: #606266;
-			-webkit-box-sizing: border-box;
-			box-sizing: border-box;
-			line-height: 28px;
-			width: 120px;
-			font-weight: bold;
-			display: block;
-			float: left;
-			margin-right: 7px;
-		}
-		.listWidth{
-			display: table;
-			float: left;
-			margin-right: 20px;
-			&:last-child{
-				margin: 0;
-			}
-		}
-	}
-	.list-box{
-		overflow: hidden;
-		.list-content{
-			float: left;
-			background: #e2e2e2;
-			margin: 5px;
-			border-radius: 5px;
-			height: 30px;
-			line-height: 30px;
-			padding-left: 10px;
-			padding-right: 3px;
-			cursor: pointer;
-
-			&:hover{
-				background: #ccc;
-			}
-			.name{
-				float: left;
-				margin-right: 20px;
-			}
-			.close{
-				float: left;
-				width: 23px;
-				cursor: pointer;
-			}
-		}
-	}
-</style>
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue
deleted file mode 100644
index c4b35dfc9..000000000
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/depotConfig.vue
+++ /dev/null
@@ -1,479 +0,0 @@
-<template>
-  <div v-loading="loading" class="view-control-content">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-table :data="tableData" style="width: 80%; margin: 0 auto;">
-        <el-table-column label="车站">
-          <template slot-scope="scope">
-            <template v-for="stationCode in scope.row.stationCodeList">
-              <span :key="stationCode" style="margin-left: 10px">{{ getDeviceName(stationCode) }}</span>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="100px">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.prevent="editModel(tableData, scope.$index)">
-              编辑
-            </el-button>
-            <el-button type="text" size="small" @click.native.prevent="deleteModel(tableData, scope.$index)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-card shadow="never" style="width: 80%; margin: 0 auto 15px; border-top: none;">
-        <div slot="header" class="clearfix">
-          <span style="font-size: 12px;">{{ cardTitle }}</span>
-          <el-button style="float: right; padding: 3px 3px" type="text" @click="clear">清空</el-button>
-          <el-button v-if="cardMode === 'generate'" style="float: right; padding: 3px 0" type="text" @click="generateOverlab">生成</el-button>
-          <el-button-group v-else-if=" cardMode === 'edit'" style="float: right;">
-            <el-button type="text" style="padding:3px 3px" @click="updateOverlab">修改</el-button>
-            <el-button type="text" style="padding:3px 0" @click="cancelOverlab">取消</el-button>
-          </el-button-group>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div>
-            <span>车站：</span>
-            <el-select v-model="addModel.stationCodeList" size="mini" style="width: 300px;" multiple placeholder="请选择">
-              <el-option
-                v-for="item in stationList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </div>
-          <div class="content-box-list" style="margin-top: 10px;">
-            <div class="title-box">设备列表</div>
-            <div class="list-box" style="height:400px;overflow:auto">
-              <div v-for="nor in addModel.elementList" :key="nor.code" class="list-content">
-                <div class="name">{{ getDeviceName(nor) }}</div>
-                <div class="close" @click="delList(nor, addModel.elementList)"><i class="el-icon-close" /></div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div class="content-box-list" style="margin-top: 10px">
-            <div style="height: 30px;line-height: 30px;margin-bottom: 10px;">
-              <span class="title-box">修正设备列表</span>
-              <el-button icon="el-icon-plus" size="mini" style="float:right;" circle @click="addAmendPoints" />
-            </div>
-            <template v-for="(elem, i) in amendPointsList">
-              <el-card :key="i" class="box-card">
-                <el-row>
-                  <el-button icon="el-icon-minus" size="mini" style="float:right;" circle @click="delAmendPoints(i)" />
-                </el-row>
-                <el-row style="height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>修正设备：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-select v-model="elem.code" filterable size="mini" placeholder="请选择">
-                      <el-option
-                        v-for="item in [...sectionList, ...signalList, ...trainWindowList]"
-                        :key="item.code"
-                        :label="item.name?item.name:'' + '(' + item.code + ')'"
-                        :value="item.code"
-                      />
-                    </el-select>
-                    <el-button :type="hoverIndex === i?'danger':'primary'" size="mini" @click="hoverClick(i)">激活</el-button>
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'points')" style="margin-top: 10px;">
-                  <el-col :span="5" style="height: 28px;line-height: 28px">
-                    <span>坐标点：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <template v-for="(point, j) in elem.points">
-                      <div :key="j">
-                        <el-input-number v-model="point.x" style="width: 100px" size="mini" controls-position="right" />
-                        <span style="line-height: 28px;">, </span>
-                        <el-input-number v-model="point.y" style="width: 100px" size="mini" controls-position="right" />
-                        <el-button icon="el-icon-plus" size="mini" circle @click="addPoint(j, elem.points)" />
-                        <el-button icon="el-icon-minus" size="mini" circle :disabled="elem.points.length < 3" @click="delPoint(j, elem.points)" />
-                      </div>
-                    </template>
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'position')" style="margin-top: 10px;height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>坐标点：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-input-number v-model="elem.position.x" style="width: 100px" size="mini" controls-position="right" />
-                    <span style="line-height: 28px;">, </span>
-                    <el-input-number v-model="elem.position.y" style="width: 100px" size="mini" controls-position="right" />
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'rotate')" style="margin-top: 10px;height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>旋转角度：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-input-number v-model="elem.rotate" style="width: 100px" size="mini" :min="-360" :max="360" controls-position="right" />
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'reversal')" style="margin-top: 10px;height: 28px;line-height: 28px;">
-                  <el-col :span="5">
-                    <span>车头翻转：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-checkbox v-model="elem.reversal" />
-                  </el-col>
-                </el-row>
-              </el-card>
-            </template>
-          </div>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div class="content-box-list" style="margin-top: 10px">
-            <div style="height: 30px;line-height: 30px;margin-bottom: 10px;">
-              <span class="title-box">偏移缩放</span>
-              <el-button size="mini" style="float:right;" @click="generateOffsetScale">定位</el-button>
-            </div>
-          </div>
-          <div>
-            <el-row style="margin-top: 10px;height: 28px;line-height: 28px">
-              <el-col :span="5">
-                <span>坐标点：</span>
-              </el-col>
-              <el-col :span="19">
-                <el-input-number v-model="addModel.offsetX" style="width: 120px" size="mini" controls-position="right" />
-                <span style="line-height: 28px;">, </span>
-                <el-input-number v-model="addModel.offsetY" style="width: 120px" size="mini" controls-position="right" />
-              </el-col>
-            </el-row>
-            <el-row style="margin-top: 10px;height: 28px;line-height: 28px">
-              <el-col :span="5">
-                <span>缩放：</span>
-              </el-col>
-              <el-col :span="19">
-                <el-input-number v-model="addModel.scaleRate" style="width: 100px" size="mini" :min="-360" :max="360" controls-position="right" />
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-      </el-card>
-      <div style="display: table; margin-left: 150px; margin-top: 12px; margin-bottom: 20px;">
-        <el-button type="primary" size="small" @click="generateData">生成</el-button>
-        <el-button type="primary" size="small" :loading="dataLoading" @click="save">保存</el-button>
-        <el-button type="primary" size="small" @click="back">返回</el-button>
-      </div>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { saveMap } from '@/api/jmap/mapdraft';
-
-export default {
-    components: {
-    },
-    props: {
-        selected: {
-            type: Object,
-            default: function () {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            tableData: [],
-            otherData: [],
-            addModel: {
-                type: 'LOCAL',
-                stationCodeList: [],
-                elementList: [],
-                offsetX: 0,
-                offsetY: 0,
-                scaleRate: 1
-            },
-            amendPointsList: [],
-            list: [],
-            field: '',
-            cardMode: 'generate',
-            index: '',
-            isPreview: true,
-            loading: false,
-            dataLoading:false,
-            depotStationList: [],
-            hoverIndex: -1
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList',
-            'stationList',
-            'signalList',
-            'switchList',
-            'stationStandList',
-            'automaticRouteButtonList',
-            'axleCounterResetButtonList',
-            'cycleButtonList',
-            'directionRodList',
-            'indicatorLightList',
-            'lineList',
-            'outerFrameList',
-            'psdList',
-            'responderList',
-            'tbStrategyList',
-            'tempSpeedLimitList',
-            'textList',
-            'totalGuideLockButtonVOList',
-            'seclectDeviceList',
-            'trainWindowList',
-            'signalButtonList'
-        ]),
-        cardTitle() {
-            if (this.cardMode === 'generate') {
-                return '生成数据';
-            } else if (this.cardMode === 'edit') {
-                return '编辑数据';
-            } else {
-                return '';
-            }
-        }
-    },
-    watch: {
-        selected: function (val, oldVal) {
-            this.deviceSelect(val);
-        }
-    },
-    mounted() {
-        this.initData();
-    },
-    methods: {
-        initData() {
-            this.depotStationList = this.stationList.filter(elem => elem.depot);
-            (this.$store.state.map.map.displayList || []).forEach( item => {
-                if (item.type === 'DEPOT_IL') {
-                    this.tableData.push(item);
-                } else {
-                    this.otherData.push(item);
-                }
-            });
-        },
-        generateOffsetScale() {
-            this.addModel.offsetX = this.$store.state.map.dataZoom.offsetX || 0;
-            this.addModel.offsetY = this.$store.state.map.dataZoom.offsetY || 0;
-            this.addModel.scaleRate = this.$store.state.map.dataZoom.scaleRate || 1;
-        },
-        deviceSelect(selected) {
-            if (selected && selected._type.toUpperCase() == 'CheckBox'.toUpperCase()) {
-                this.seclectDeviceList.forEach(item => {
-                    if (this.addModel.elementList.indexOf(item.code) < 0) {
-                        this.addModel.elementList.push(item.code);
-                    }
-                });
-            } else if (selected && this.hoverIndex > -1 && (['Section'.toUpperCase(), 'Signal'.toUpperCase(), 'TrainWindow'.toUpperCase()].includes(selected._type.toUpperCase()))) {
-                this.amendPointsList[this.hoverIndex].code = selected.code;
-            } else if (selected) {
-                if (this.addModel.elementList.indexOf(selected.code) < 0) {
-                    this.addModel.elementList.push(selected.code);
-                }
-            }
-        },
-        getDeviceName(code) {
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            return device.name || device.code;
-        },
-        hoverClick(index) {
-            this.hoverIndex = this.hoverIndex === index ? -1 : index;
-        },
-        checkDeviceType(data, prop) {
-            if (data.code) {
-                const device = this.$store.getters['map/getDeviceByCode'](data.code);
-                if (device._type === 'Section' && prop === 'points') {
-                    return true;
-                } else if (device._type === 'Signal' && (prop === 'position' || prop === 'rotate')) {
-                    return true;
-                } else if (device._type === 'TrainWindow' && (prop === 'position' || prop === 'reversal')) {
-                    return true;
-                }
-            }
-            return false;
-        },
-        deleteModel(list, index) {
-            list.splice(index, 1);
-            this.list.pop();
-            this.clearData();
-            this.cardMode = 'generate';
-        },
-        editModel(list, index) {
-            this.addModel = list[index];
-            this.amendPointsList = this.addModel.amendPointsList ? this.addModel.amendPointsList : [];
-            this.index = index;
-            this.cardMode = 'edit';
-        },
-        cancelOverlab() {
-            this.cardMode = 'generate';
-            this.clear();
-        },
-        updateOverlab() {
-            if (this.index || this.index == 0) {
-                if (!this.addModel.stationCodeList.length) {
-                    this.$messageBox('请选择车站!');
-                    return;
-                }
-                if (this.amendPointsList.find(elem => !elem.code)) {
-                    this.$messageBox('修正设备未选择!');
-                    return;
-                }
-                this.addModel.amendPointsList = [...this.amendPointsList];
-                this.amendPointsList = [];
-                this.tableData.splice(this.index, 1, this.addModel);
-                this.clearData();
-            }
-        },
-        // 删除当前选中
-        delList(model, list) {
-            list.forEach((nor, index) => {
-                if (nor == model) {
-                    list.splice(index, 1);
-                }
-            });
-            this.seclectDeviceList.forEach((item, index) => {
-                if (item.code == model) {
-                    this.seclectDeviceList.splice(index, 1);
-                }
-            });
-        },
-        save() {
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.tableData, ...this.otherData],
-                mapId: this.$route.params.mapId
-            };
-            this.dataLoading = true;
-            saveMap(Object.assign(map, param)).then(response => {
-                this.$message.success('保存车辆段配置成功');
-                this.dataLoading = false;
-                this.cancelOverlab();
-            }).catch(() => {
-                this.dataLoading = false;
-                this.$messageBox('保存车辆段配置失败');
-            });
-        },
-        back() {
-            this.$emit('goDraw');
-        },
-        generateOverlab() { // 生成
-            if (!this.addModel.stationCodeList.length) {
-                this.$messageBox('请选择车站!');
-                return;
-            }
-            if (this.amendPointsList.find(elem => !elem.code)) {
-                this.$messageBox('修正区段未选择!');
-                return;
-            }
-            this.addModel.amendPointsList = [...this.amendPointsList];
-            this.amendPointsList = [];
-            this.hoverIndex = -1;
-            this.tableData.push(this.addModel);
-            this.clearData();
-        },
-        clear() {
-            this.addModel = { type: 'DEPOT_IL', stationCodeList: [], elementList: [], offsetX: 0, offsetY: 0, scaleRate: 1 };
-            this.amendPointsList = [];
-        },
-        clearData() {
-            this.addModel = { type: 'DEPOT_IL', stationCodeList: [], elementList: [], offsetX: 0, offsetY: 0, scaleRate: 1 };
-            this.amendPointsList = [];
-            this.index = '';
-            this.cardMode = 'generate';
-        },
-        addAmendPoints() {
-            this.amendPointsList.push({ code: '', points: [{ x: 0, y: 0 }, { x:0, y:0 }], position: {x: 0, y: 0}, rotate:0, reversal: false });
-        },
-        delAmendPoints(index) {
-            this.hoverIndex = -1;
-            this.amendPointsList.splice(index, 1);
-        },
-        addPoint(index, points) {
-            points.splice(index, 0, {x:0, y:0});
-        },
-        delPoint(index, points) {
-            points.splice(index, 1);
-        },
-        generateData() {
-            this.loading = true;
-            this.tableData = [];
-            this.stationList.forEach(item => {
-                if (item.depot) {
-                    this.tableData.push({type: 'DEPOT_IL', stationCodeList: [item.code], elementList: [item.code], offsetX: 0, offsetY: 0, scaleRate: 1 });
-                }
-            });
-
-            [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
-                ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
-                const target = this.tableData.find(elem => elem.stationCodeList.includes(item.stationCode));
-                target && target.elementList.push(item.code);
-            });
-            [...this.directionRodList].forEach(item => {
-                const target = this.tableData.find(elem => elem.stationCodeList.includes(item.deviceStationCode));
-                target && target.elementList.push(item.code);
-            });
-            this.psdList.forEach(item => {
-                const stand = this.$store.getters['map/getDeviceByCode'](item.standCode);
-                const target = this.tableData.find(elem => elem.stationCodeList.includes(stand.stationCode));
-                target && target.elementList.push(item.code);
-            });
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.tableData, ...this.otherData],
-                mapId: this.$route.params.mapId
-            };
-            saveMap(Object.assign(map, param)).then(response => {
-                this.loading = false;
-                this.$message.success('保存车辆段配置成功');
-                this.cancelOverlab();
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox('保存车辆段配置失败');
-            });
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.title-box{
-		padding-left: 10px;
-		border-left: 4px solid red;
-		margin-bottom: 10px;
-	}
-	.box-card {
-		width: 100%;
-		padding: 5px;
-	}
-	.list-box{
-		overflow: hidden;
-		.list-content{
-			float: left;
-			background: #e2e2e2;
-			margin: 5px;
-			border-radius: 5px;
-			height: 30px;
-			line-height: 30px;
-			padding-left: 10px;
-			padding-right: 3px;
-			cursor: pointer;
-
-			&:hover{
-				background: #ccc;
-			}
-			.name{
-				float: left;
-				margin-right: 20px;
-			}
-			.close{
-				float: left;
-				width: 23px;
-				cursor: pointer;
-			}
-		}
-	}
-</style>
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue
deleted file mode 100644
index fbee5d628..000000000
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/localConfig.vue
+++ /dev/null
@@ -1,518 +0,0 @@
-<template>
-  <div v-loading="loading" class="view-control-content">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-table :data="tableData" style="width: 80%; margin: 0 auto;">
-        <el-table-column label="车站">
-          <template slot-scope="scope">
-            <template v-for="stationCode in scope.row.stationCodeList">
-              <span :key="stationCode" style="margin-left: 10px">{{ getDeviceName(stationCode) }}</span>
-            </template>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="100px">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.prevent="editModel(tableData, scope.$index)">
-              编辑
-            </el-button>
-            <el-button type="text" size="small" @click.native.prevent="deleteModel(tableData, scope.$index)">
-              删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-card shadow="never" style="width: 80%; margin: 0 auto 15px; border-top: none;">
-        <div slot="header" class="clearfix">
-          <span style="font-size: 12px;">{{ cardTitle }}</span>
-          <el-button style="float: right; padding: 3px 3px" type="text" @click="clear">清空</el-button>
-          <el-button v-if="cardMode === 'generate'" style="float: right; padding: 3px 0" type="text" @click="generateOverlab">生成</el-button>
-          <el-button-group v-else-if=" cardMode === 'edit'" style="float: right;">
-            <el-button type="text" style="padding:3px 3px" @click="updateOverlab">修改</el-button>
-            <el-button type="text" style="padding:3px 0" @click="cancelOverlab">取消</el-button>
-          </el-button-group>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div>
-            <span>车站：</span>
-            <el-select v-model="addModel.stationCodeList" size="mini" style="width: 300px;" multiple placeholder="请选择">
-              <el-option
-                v-for="item in stationList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </div>
-          <div style="margin-top:10px">
-            <span>可切换显示的车站：</span>
-            <el-select v-model="addModel.switchStationCodeList" size="mini" style="width:200px;" multiple placeholder="请选择">
-              <el-option
-                v-for="item in stationList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </div>
-          <div class="content-box-list" style="margin-top: 10px;">
-            <div class="title-box">设备列表</div>
-            <div class="list-box" style="height:400px;overflow:auto">
-              <div v-for="nor in addModel.elementList" :key="nor.code" class="list-content">
-                <div class="name">{{ getDeviceName(nor) }}</div>
-                <div class="close" @click="delList(nor, addModel.elementList)"><i class="el-icon-close" /></div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div style="padding: 10px;font-size: 14px;">
-          <div class="content-box-list" style="margin-top: 10px">
-            <div style="height: 30px;line-height: 30px;margin-bottom: 10px;">
-              <span class="title-box">修正设备列表</span>
-              <el-button icon="el-icon-plus" size="mini" style="float:right;" circle @click="addAmendPoints" />
-            </div>
-            <template v-for="(elem, i) in amendPointsList">
-              <el-card :key="i" class="box-card">
-                <el-row>
-                  <el-button icon="el-icon-minus" size="mini" style="float:right;" circle @click="delAmendPoints(i)" />
-                </el-row>
-                <el-row style="height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>修正设备：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-select v-model="elem.code" filterable size="mini" placeholder="请选择">
-                      <el-option
-                        v-for="item in [...sectionList, ...signalList, ...trainWindowList]"
-                        :key="item.code"
-                        :label="item.name?item.name:'' + '(' + item.code + ')'"
-                        :value="item.code"
-                      />
-                    </el-select>
-                    <el-button :type="hoverIndex === i?'danger':'primary'" size="mini" @click="hoverClick(i)">激活</el-button>
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'points')" style="margin-top: 10px;">
-                  <el-col :span="5" style="height: 28px;line-height: 28px;">
-                    <span>坐标点：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <template v-for="(point, j) in elem.points">
-                      <div :key="j">
-                        <el-input-number v-model="point.x" style="width: 100px" size="mini" controls-position="right" />
-                        <span style="line-height: 28px;">, </span>
-                        <el-input-number v-model="point.y" style="width: 100px" size="mini" controls-position="right" />
-                        <el-button icon="el-icon-plus" size="mini" circle @click="addPoint(j, elem.points)" />
-                        <el-button icon="el-icon-minus" size="mini" circle :disabled="elem.points.length < 3" @click="delPoint(j, elem.points)" />
-                      </div>
-                    </template>
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'position')" style="margin-top: 10px;height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>坐标点：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-input-number v-model="elem.position.x" style="width: 100px" size="mini" controls-position="right" />
-                    <span style="line-height: 28px;">, </span>
-                    <el-input-number v-model="elem.position.y" style="width: 100px" size="mini" controls-position="right" />
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'rotate')" style="margin-top: 10px;height: 28px;line-height: 28px">
-                  <el-col :span="5">
-                    <span>旋转角度：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-input-number v-model="elem.rotate" style="width: 100px" size="mini" :min="-360" :max="360" controls-position="right" />
-                  </el-col>
-                </el-row>
-                <el-row v-if="checkDeviceType(elem, 'reversal')" style="margin-top: 10px;height: 28px;line-height: 28px;">
-                  <el-col :span="5">
-                    <span>车头翻转：</span>
-                  </el-col>
-                  <el-col :span="19">
-                    <el-checkbox v-model="elem.reversal" />
-                  </el-col>
-                </el-row>
-              </el-card>
-            </template>
-          </div>
-        </div>
-      </el-card>
-      <div style="display: table; margin-left: 90px; margin-top: 12px; margin-bottom: 20px;">
-        <el-button type="primary" size="small" @click="generateData">按集中站生成</el-button>
-        <el-button type="primary" size="small" @click="generateAllData">全显生成</el-button>
-        <el-button type="primary" size="small" :loading="dataLoading" @click="save">保存</el-button>
-        <el-button type="primary" size="small" @click="back">返回</el-button>
-      </div>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { saveMap } from '@/api/jmap/mapdraft';
-
-export default {
-    components: {
-    },
-    props: {
-        selected: {
-            type: Object,
-            default: function () {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            tableData: [],
-            otherData: [],
-            addModel: {
-                type: 'LOCAL',
-                stationCodeList: [],
-                switchStationCodeList:[],
-                elementList: []
-            },
-            amendPointsList: [],
-            list: [],
-            field: '',
-            cardMode: 'generate',
-            index: '',
-            isPreview: true,
-            loading: false,
-            dataLoading:false,
-            hoverIndex: -1
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList',
-            'stationList',
-            'signalList',
-            'switchList',
-            'stationStandList',
-            'automaticRouteButtonList',
-            'axleCounterResetButtonList',
-            'cycleButtonList',
-            'directionRodList',
-            'indicatorLightList',
-            'lineList',
-            'outerFrameList',
-            'psdList',
-            'responderList',
-            'tbStrategyList',
-            'tempSpeedLimitList',
-            'textList',
-            'totalGuideLockButtonVOList',
-            'seclectDeviceList',
-            'trainWindowList',
-            'signalButtonList'
-        ]),
-        cardTitle() {
-            if (this.cardMode === 'generate') {
-                return '生成数据';
-            } else if (this.cardMode === 'edit') {
-                return '编辑数据';
-            } else {
-                return '';
-            }
-        }
-    },
-    watch: {
-        selected: function (val, oldVal) {
-            this.deviceSelect(val);
-        }
-    },
-    mounted() {
-        this.initData();
-    },
-    methods: {
-        // deviceSelect(selected) {
-        //     this.$refs.form && this.$refs.form.resetFields();
-        //     this.$refs.make && this.$refs.make.resetFields();
-        //     if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'selectSection'.toUpperCase()) {
-        //         if (selected.type === '01' || selected.type === '02' || selected.type === '03') {
-        //             this.addModel.sectionCode = selected.code;
-        //             this.field = '';
-        //         }
-        //     }
-        // },
-        initData() {
-            (this.$store.state.map.map.displayList || []).forEach( item => {
-                if (item.type === 'LOCAL') {
-                    this.tableData.push(item);
-                } else {
-                    this.otherData.push(item);
-                }
-            });
-        },
-        deviceSelect(selected) {
-            if (selected && selected._type.toUpperCase() == 'CheckBox'.toUpperCase()) {
-                this.seclectDeviceList.forEach(item => {
-                    if (this.addModel.elementList.indexOf(item.code) < 0) {
-                        this.addModel.elementList.push(item.code);
-                    }
-                });
-            } else if (selected && this.hoverIndex > -1 && (['Section'.toUpperCase(), 'Signal'.toUpperCase(), 'TrainWindow'.toUpperCase()].includes(selected._type.toUpperCase()))) {
-                this.amendPointsList[this.hoverIndex].code = selected.code;
-            } else if (selected) {
-                if (this.addModel.elementList.indexOf(selected.code) < 0) {
-                    this.addModel.elementList.push(selected.code);
-                }
-            }
-        },
-        hoverClick(index) {
-            this.hoverIndex = this.hoverIndex === index ? -1 : index;
-        },
-        getDeviceName(code) {
-            const device = this.$store.getters['map/getDeviceByCode'](code);
-            return device.name || device.code;
-        },
-        checkDeviceType(data, prop) {
-            if (data.code) {
-                const device = this.$store.getters['map/getDeviceByCode'](data.code);
-                if (device._type === 'Section' && prop === 'points') {
-                    return true;
-                } else if (device._type === 'Signal' && (prop === 'position' || prop === 'rotate')) {
-                    return true;
-                } else if (device._type === 'TrainWindow' && (prop === 'position' || prop === 'reversal')) {
-                    return true;
-                }
-            }
-            return false;
-        },
-        deleteModel(list, index) {
-            list.splice(index, 1);
-            this.list.pop();
-            this.clearData();
-            this.cardMode = 'generate';
-        },
-        editModel(list, index) {
-            this.addModel = list[index];
-            this.amendPointsList = this.addModel.amendPointsList ? this.addModel.amendPointsList : [];
-            this.index = index;
-            this.cardMode = 'edit';
-        },
-        cancelOverlab() {
-            this.cardMode = 'generate';
-            this.clear();
-        },
-        updateOverlab() {
-            if (this.index || this.index == 0) {
-                if (!this.addModel.stationCodeList.length) {
-                    this.$messageBox('请选择车站!');
-                    return;
-                }
-                if (!this.addModel.switchStationCodeList.length) {
-                    this.$messageBox('请选择可切换显示的车站!');
-                    return;
-                }
-                if (this.amendPointsList.find(elem => !elem.code)) {
-                    this.$messageBox('修正设备未选择!');
-                    return;
-                }
-                this.addModel.amendPointsList = [...this.amendPointsList];
-                this.amendPointsList = [];
-                this.tableData.splice(this.index, 1, this.addModel);
-                this.clearData();
-            }
-        },
-        // 删除当前选中
-        delList(model, list) {
-            list.forEach((nor, index) => {
-                if (nor == model) {
-                    list.splice(index, 1);
-                }
-            });
-            this.seclectDeviceList.forEach((item, index) => {
-                if (item.code == model) {
-                    this.seclectDeviceList.splice(index, 1);
-                }
-            });
-        },
-        save() {
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.tableData, ...this.otherData],
-                mapId: this.$route.params.mapId
-            };
-            this.dataLoading = true;
-            saveMap(Object.assign(map, param)).then(response => {
-                this.$message.success('保存现地配置成功');
-                this.dataLoading = false;
-                this.cancelOverlab();
-            }).catch(() => {
-                this.dataLoading = false;
-                this.$messageBox('保存现地配置失败');
-            });
-        },
-        back() {
-            this.$emit('goDraw');
-        },
-        generateOverlab() { // 生成
-            if (!this.addModel.stationCodeList.length) {
-                this.$messageBox('请选择车站!');
-                return;
-            }
-            if (!this.addModel.switchStationCodeList.length) {
-                this.$messageBox('请选择可切换显示的车站!');
-                return;
-            }
-            if (this.amendPointsList.find(elem => !elem.code)) {
-                this.$messageBox('修正区段未选择!');
-                return;
-            }
-            this.addModel.amendPointsList = [...this.amendPointsList];
-            this.amendPointsList = [];
-            this.hoverIndex = -1;
-            this.tableData.push(this.addModel);
-            this.clearData();
-        },
-        clear() {
-            this.addModel = { type: 'LOCAL', stationCodeList: [], elementList: [], switchStationCodeList:[] };
-            this.amendPointsList = [];
-        },
-        clearData() {
-            this.addModel = { type: 'LOCAL', stationCodeList: [], elementList: [], switchStationCodeList:[] };
-            this.amendPointsList = [];
-            this.index = '';
-            this.cardMode = 'generate';
-        },
-        generateAllData() {
-            this.loading = true;
-            this.tableData = [];
-            const tempData = { type: 'LOCAL', stationCodeList: [], elementList: [], switchStationCodeList:[] };
-            const stationCodeList = [];
-            this.stationList.forEach(item => {
-                if (!item.depot) {
-                    tempData.stationCodeList.push(item.code);
-                    tempData.switchStationCodeList.push(item.code);
-                    tempData.elementList.push(item.code);
-                } else { stationCodeList.push(item.code); }
-            });
-            [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
-                ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
-                if (!stationCodeList.includes(item.stationCode)) {
-                    tempData.elementList.push(item.code);
-                }
-            });
-            [...this.directionRodList].forEach(item => {
-                if (!stationCodeList.includes(item.deviceStationCode)) {
-                    tempData.elementList.push(item.code);
-                }
-            });
-            this.psdList.forEach(item => {
-                const stand = this.$store.getters['map/getDeviceByCode'](item.standCode);
-                if (!stationCodeList.includes(stand.stationCode)) {
-                    tempData.elementList.push(item.code);
-                }
-            });
-            this.tableData.push(tempData);
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.tableData, ...this.otherData],
-                mapId: this.$route.params.mapId
-            };
-            saveMap(Object.assign(map, param)).then(response => {
-                this.loading = false;
-                this.$message.success('保存现地配置成功');
-                this.cancelOverlab();
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox('保存现地配置失败');
-            });
-        },
-        addAmendPoints() {
-            this.amendPointsList.push({ code: '', points: [{ x: 0, y: 0 }, { x:0, y:0 }], position: {x: 0, y: 0}, rotate:0, reversal: false });
-        },
-        delAmendPoints(index) {
-            this.hoverIndex = -1;
-            this.amendPointsList.splice(index, 1);
-        },
-        addPoint(index, points) {
-            points.splice(index, 0, {x:0, y:0});
-        },
-        delPoint(index, points) {
-            points.splice(index, 1);
-        },
-        generateData() {
-            this.loading = true;
-            this.tableData = [];
-            // switchStationCodeList:[...item.switchStationCodeList, item.code]
-            this.stationList.forEach(item => {
-                if (item.centralized) {
-                    this.tableData.push({type: 'LOCAL', stationCodeList: [...item.chargeStationCodeList, item.code], elementList: [...item.chargeStationCodeList, item.code], switchStationCodeList:[...item.chargeStationCodeList, item.code]});
-                }
-            });
-
-            [...this.sectionList, ...this.signalList, ...this.stationStandList, ...this.switchList, ...this.automaticRouteButtonList,
-                ...this.axleCounterResetButtonList, ...this.cycleButtonList, ...this.indicatorLightList, ...this.lineList, ...this.outerFrameList,
-                ...this.responderList, ...this.tbStrategyList, ...this.tempSpeedLimitList, ...this.textList, ...this.totalGuideLockButtonVOList, ...this.signalButtonList].forEach(item => {
-                const target = this.tableData.find(elem => elem.stationCodeList.includes(item.stationCode));
-                target && target.elementList.push(item.code);
-            });
-            [...this.directionRodList].forEach(item => {
-                const target = this.tableData.find(elem => elem.stationCodeList.includes(item.deviceStationCode));
-                target && target.elementList.push(item.code);
-            });
-            this.psdList.forEach(item => {
-                const stand = this.$store.getters['map/getDeviceByCode'](item.standCode);
-                const target = this.tableData.find(elem => elem.stationCodeList.includes(stand.stationCode));
-                target && target.elementList.push(item.code);
-            });
-            const map = this.$store.state.map.map;
-            const param = {
-                displayList: [...this.tableData, ...this.otherData],
-                mapId: this.$route.params.mapId
-            };
-            saveMap(Object.assign(map, param)).then(response => {
-                this.loading = false;
-                this.$message.success('保存现地配置成功');
-                this.cancelOverlab();
-            }).catch(() => {
-                this.loading = false;
-                this.$messageBox('保存现地配置失败');
-            });
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.title-box{
-		padding-left: 10px;
-		border-left: 4px solid red;
-		margin-bottom: 10px;
-	}
-	.box-card {
-		width: 100%;
-		padding: 5px;
-	}
-	.list-box{
-		overflow: hidden;
-		.list-content{
-			float: left;
-			background: #e2e2e2;
-			margin: 5px;
-			border-radius: 5px;
-			height: 30px;
-			line-height: 30px;
-			padding-left: 10px;
-			padding-right: 3px;
-			cursor: pointer;
-
-			&:hover{
-				background: #ccc;
-			}
-			.name{
-				float: left;
-				margin-right: 20px;
-			}
-			.close{
-				float: left;
-				width: 23px;
-				cursor: pointer;
-			}
-		}
-	}
-</style>
diff --git a/src/views/newMap/newMapdraft/mapoperate/displayConfig/splitScreen.vue b/src/views/newMap/newMapdraft/mapoperate/displayConfig/splitScreen.vue
deleted file mode 100644
index d601b5e52..000000000
--- a/src/views/newMap/newMapdraft/mapoperate/displayConfig/splitScreen.vue
+++ /dev/null
@@ -1,308 +0,0 @@
-<template>
-  <div class="view-control-content">
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-table :data="tableData" style="width: 80%; margin: 0 auto;">
-        <el-table-column label="区段名称">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="换行位置">
-          <template slot-scope="scope">
-            <span style="margin-left: 10px">{{ scope.row.position }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.prevent="editModel(tableData, scope.$index)">
-              编辑
-            </el-button>
-            <el-button type="text" size="small" @click.native.prevent="deleteModel(tableData, scope.$index)">
-              移出
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-card class="box-card" shadow="never" style="width: 80%; margin: 0 auto 15px; border-top: none;">
-        <div slot="header" class="clearfix">
-          <span style="font-size: 12px;">{{ cardTitle }}</span>
-          <el-button v-if="cardMode === 'generate'" style="float: right; padding: 3px 0" type="text" @click="generateOverlab">生成</el-button>
-          <el-button-group v-else-if=" cardMode === 'edit'" style="float: right;">
-            <el-button type="text" style="padding:3px 3px" @click="updateOverlab">修改</el-button>
-            <el-button type="text" style="padding:3px 0" @click="cancelOverlab">取消</el-button>
-          </el-button-group>
-        </div>
-        <div>
-          <el-form ref="hostileForm" :model="addModel" label-width="135px" size="mini" style="margin-top: 15px">
-            <el-form-item label="区段:" prop="sectionCode">
-              <el-select v-model="addModel.sectionCode" clearable :filterable="true">
-                <el-option
-                  v-for="item in sectionList"
-                  :key="item.code"
-                  :label="item.name + ' (' + item.code+ ')'"
-                  :value="item.code"
-                />
-              </el-select>
-              <el-button
-                :type=" field === 'selectSection' ? 'danger' : 'primary'"
-                @click="hover('selectSection')"
-              >{{ $t('map.activate') }}</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </el-card>
-      <el-form ref="form" :model="formData" :rules="rules" label-width="140px" size="mini">
-        <el-form-item label="宽度:" prop="width">
-          <el-input-number v-model="formData.width" style="width: 150px;" :min="1" />
-          <span style="color: #ababab;">屏</span>
-        </el-form-item>
-        <el-form-item label="高度:" prop="height">
-          <el-input-number v-model="formData.height" style="width: 150px;" :min="1" />
-          <span style="color: #ababab;">屏</span>
-        </el-form-item>
-        <template v-for="(item, i) in list">
-          <el-form-item :key="i" :label="'第'+ (i + 1) +'行偏移值:'" prop="offsetTop">
-            <el-input-number v-model="list[i]['offsetTop']" style="width: 150px;" />
-          </el-form-item>
-        </template>
-      </el-form>
-      <div style="display: table; margin-left: 90px; margin-top: 12px; margin-bottom: 20px;">
-        <el-button type="primary" @click="save">保存</el-button>
-        <el-button v-if="isPreview" type="primary" @click="preview">预览</el-button>
-        <el-button v-if="!isPreview" type="primary" @click="recover">重置</el-button>
-        <el-button type="primary" @click="back">返回</el-button>
-      </div>
-    </el-scrollbar>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import { saveMap } from '@/api/jmap/mapdraft';
-
-export default {
-    components: {
-    },
-    props: {
-        selected: {
-            type: Object,
-            default: function () {
-                return null;
-            }
-        }
-    },
-    data() {
-        return {
-            tableData: [],
-            addModel: {
-                sectionCode: '',
-                offsetTop: 0
-            },
-            formData: {
-                width: 2,
-                height: 2,
-                offsetTop: 0
-            },
-            rules: {
-                width: [
-                    { required: true, message: '请输入宽度', trigger: 'blur' }
-                ],
-                height: [
-                    { required: true, message: '请输入高度', trigger: 'blur' }
-                ]
-            },
-            list: [],
-            field: '',
-            cardMode: 'generate',
-            index: '',
-            isPreview: true
-        };
-    },
-    computed: {
-        ...mapGetters('map', [
-            'sectionList',
-            'bigScreenConfig'
-        ]),
-        cardTitle() {
-            if (this.cardMode === 'generate') {
-                return '生成数据';
-            } else if (this.cardMode === 'edit') {
-                return '编辑数据';
-            } else {
-                return '';
-            }
-        }
-    },
-    watch: {
-        selected: function (val, oldVal) {
-            this.deviceSelect(val);
-        }
-        // bigScreenConfig: function(data) {
-        //     if (data) {
-        //         this.handleList(data);
-        //     }
-        // }
-    },
-    mounted() {
-        if (this.bigScreenConfig) {
-            this.handleList(this.bigScreenConfig);
-        }
-    },
-    methods: {
-        deviceSelect(selected) {
-            this.$refs.form && this.$refs.form.resetFields();
-            this.$refs.make && this.$refs.make.resetFields();
-            if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase() && this.field.toUpperCase() === 'selectSection'.toUpperCase()) {
-                if (selected.type === '01' || selected.type === '02' || selected.type === '03') {
-                    this.addModel.sectionCode = selected.code;
-                    this.field = '';
-                }
-            }
-        },
-        handleList(data) {
-            this.tableData = [];
-            if (data.bigScreenSplitConfig) {
-                data.bigScreenSplitConfig.forEach(item => {
-                    const section = this.$store.getters['map/getDeviceByCode'](item.sectionCode);
-                    if (section) {
-                        const param = {
-                            position: String(section.points[section.points.length - 1].x),
-                            name: `${section.name}(${section.code})`,
-                            offsetTop: 0,
-                            sectionCode: section.code
-                        };
-                        this.tableData.push(param);
-                    }
-                });
-
-                this.tableData.sort((a, b) => Number(a.position) - Number(b.position)); // 数组排序
-                this.formData = {
-                    width: data.width,
-                    height: data.height
-                };
-                data.offsetList.length = data.bigScreenSplitConfig.length + 1;
-            }
-            if (data.offsetList && data.offsetList.length) {
-                this.list = [];
-                data.offsetList.forEach(item => {
-                    const param = {offsetTop: item};
-                    this.list.push(param);
-                });
-            } else {
-                this.list = this.tableData.concat({offsetTop: 0});
-            }
-        },
-        hover(field) {
-            this.field = field == this.field ? '' : field;
-        },
-        deleteModel(list, index) {
-            list.splice(index, 1);
-            this.list.pop();
-            this.clear();
-            this.cardMode = 'generate';
-        },
-        editModel(list, index) {
-            this.addModel.sectionCode = list[index].sectionCode;
-            this.index = index;
-            this.cardMode = 'edit';
-        },
-        cancelOverlab() {
-            this.cardMode = 'generate';
-            this.clear();
-        },
-        updateOverlab() {
-            if (this.index || this.index == 0) {
-                if (!this.addModel.sectionCode) {
-                    this.$messageBox('请选择区段!');
-                } else {
-                    const section = this.$store.getters['map/getDeviceByCode'](this.addModel.sectionCode);
-                    const param = {
-                        position: String(section.points[section.points.length - 1].x),
-                        offsetTop: 0,
-                        name: `${section.name}(${section.code})`,
-                        sectionCode: section.code
-                    };
-                    this.tableData.splice(this.index, 1, param);
-                }
-                this.clear();
-                this.cardMode = 'generate';
-            }
-        },
-        save() {
-            if (this.tableData.length) {
-                const map = this.$store.state.map.map;
-                const param = {
-                    bigScreenConfig: {
-                        bigScreenSplitConfig: this.tableData,
-                        width: this.formData.width,
-                        height: this.formData.height,
-                        offsetList: this.list.map(ele => ele.offsetTop)
-                    },
-                    mapId: this.$route.params.mapId
-                };
-                saveMap(Object.assign(map, param)).then(response => {
-                    this.$message.success('保存大屏分割位置成功');
-                }).catch(() => {
-                    this.$messageBox('保存大屏分割位置失败');
-                });
-            }
-        },
-        preview() { // 预览
-            if (this.tableData.length) {
-                this.isPreview = false;
-                this.$jlmap && this.$jlmap.off('zoom');
-                const size = {
-                    width: this.$jlmap.$zr.getWidth() * this.formData.width,
-                    height: this.$jlmap.$zr.getHeight() * this.formData.height,
-                    list: this.tableData.map(ele => ele.position),
-                    offsetList: this.list.map(ele => ele.offsetTop)
-                };
-                this.$jlmap && this.$jlmap.setUpdateScreen(size);
-            } else {
-                this.$messageBox('请输入换行位置信息');
-            }
-        },
-        recover() { // 恢复缩放比
-            this.isPreview = true;
-            this.$jlmap && this.$jlmap.on('zoom');
-            const param = {
-                scaleRate: this.$store.state.map.dataZoom.scaleRate,
-                offsetX: this.$store.state.map.dataZoom.offsetX,
-                offsetY: this.$store.state.map.dataZoom.offsetY
-            };
-            this.$jlmap && this.$jlmap.setRecover(param);
-        },
-        back() {
-            this.$emit('goDraw');
-        },
-        clear() {
-            this.$refs.hostileForm.resetFields();
-            this.addModel.sectionCode = '';
-            this.index = '';
-            this.field = '';
-        },
-        generateOverlab() { // 生成
-            if (!this.addModel.sectionCode) {
-                this.$messageBox('请选择区段!');
-            } else {
-                const section = this.$store.getters['map/getDeviceByCode'](this.addModel.sectionCode);
-                const position = section.points[section.points.length - 1].x;
-                this.tableData.push({
-                    position: String(position),
-                    offsetTop: 0,
-                    name: `${section.name}(${section.code})`,
-                    sectionCode: section.code
-                });
-                this.tableData.sort((a, b) => Number(a.position) - Number(b.position)); // 数组排序
-
-                this.list = this.list.concat({offsetTop: 0});
-                this.clear();
-            }
-        }
-    }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/newMap/newMapdraft/mapoperate/index.vue b/src/views/newMap/newMapdraft/mapoperate/index.vue
index 116e18379..1388a9155 100644
--- a/src/views/newMap/newMapdraft/mapoperate/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/index.vue
@@ -13,10 +13,6 @@
         <el-dropdown class="operate-button" trigger="click">
           <span class="el-dropdown-link">配置</span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item><div @click="showCenterConfig">行调配置</div></el-dropdown-item>
-            <el-dropdown-item><div @click="showLocalConfig">现地配置</div></el-dropdown-item>
-            <el-dropdown-item><div @click="showScreenConfig">大屏配置</div></el-dropdown-item>
-            <el-dropdown-item><div @click="showDepotConfig">车辆段配置</div></el-dropdown-item>
             <el-dropdown-item><div @click="setMapFunctionConfig">地图配置</div></el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
@@ -30,7 +26,7 @@
         </el-dropdown>
         <el-button v-if="isSave" type="text" style="padding: 3px 0" :disabled="$attrs.mapSaveing" @click="saveMapEvent">{{ $t('map.save') }}</el-button>
       </div>
-      <el-tabs v-show="configShow === 'none'" v-model="enabledTab" class="mapEdit" type="card">
+      <el-tabs v-model="enabledTab" class="mapEdit" type="card">
         <el-tab-pane v-for="(each,index) in tabList" :key="index" :label="each.label" class="tab_pane_box" :name="each.name" :lazy="lazy">
           <component
             :is="each.menus"
@@ -42,10 +38,6 @@
           />
         </el-tab-pane>
       </el-tabs>
-      <local-config v-if="configShow === 'local'" ref="localConfig" :selected="selected" @goDraw="goDraw" />
-      <split-screen v-else-if="configShow === 'screen'" ref="splitScreen" :selected="selected" @goDraw="goDraw" />
-      <center-config v-else-if="configShow === 'center'" ref="centerConfig" :selected="selected" @goDraw="goDraw" />
-      <depot-config v-else-if="configShow === 'depot'" ref="depotConfig" :selected="selected" @goDraw="goDraw" />
     </div>
   </transition>
 </template>
@@ -73,18 +65,14 @@ import ResponderDraft from './responder/index';
 import ControlLamp from './controlLamp';
 import SplitStation from './splitStation';
 import Arrow from './arrow';
-import SplitScreen from './displayConfig/splitScreen';
 import FloodGate from './floodGate';
 import DirectionRod from './directionRod';
 import SignalButton from './signalButton';
-import LocalConfig from './displayConfig/localConfig';
-import CenterConfig from './displayConfig/centerConfig';
-import DepotConfig from './displayConfig/depotConfig';
+import SimulationMember from './simulationMember/index';
 
 export default {
     name: 'MapOperate',
     components: {
-        // CounterDraft,
         SectionDraft,
         SwitchDraft,
         SignalDraft,
@@ -107,13 +95,10 @@ export default {
         ControlLamp,
         SplitStation,
         Arrow,
-        SplitScreen,
         FloodGate,
         DirectionRod,
         SignalButton,
-        LocalConfig,
-        CenterConfig,
-        DepotConfig
+        SimulationMember
     },
     props: {
         selected: {
@@ -155,11 +140,11 @@ export default {
                 {label: '箭头', name:'Arrow', menus:Arrow},
                 {label:  '防淹门', name: 'FloodGate', menus: FloodGate},
                 {label: '方向杆', name: 'DirectionRod', menus: DirectionRod},
-                {label: '信号按钮', name: 'SignalButton', menus: SignalButton }
+                {label: '信号按钮', name: 'SignalButton', menus: SignalButton },
+                {label: '仿真成员', name: 'SimulationMember', menus: SimulationMember}
             ],
             selectDevice:'',
-            enabledTab: 'Section',
-            configShow: 'none'
+            enabledTab: 'Section'
         };
     },
     computed: {
@@ -190,21 +175,6 @@ export default {
         dataRelation() {
             this.$emit('selectView', 'path');
         },
-        showCenterConfig() {
-            this.configShow = 'center';
-        },
-        showLocalConfig() {
-            this.configShow = 'local';
-        },
-        showScreenConfig() {
-            this.configShow = 'screen';
-        },
-        showDepotConfig() {
-            this.configShow = 'depot';
-        },
-        goDraw() {
-            this.configShow = 'none';
-        },
         showMap() {
             this.$emit('showMap');
         },
diff --git a/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
new file mode 100644
index 000000000..81afd3a24
--- /dev/null
+++ b/src/views/newMap/newMapdraft/mapoperate/simulationMember/index.vue
@@ -0,0 +1,821 @@
+<template>
+  <el-tabs v-model="activeName" class="card" style="height: 100%;">
+    <el-tab-pane class="view-control" label="成员" name="first" :lazy="lazy">
+      <el-tabs v-model="memberActive" class="card" style="height: 100%">
+        <el-tab-pane class="view-control" label="地铁CBTC" name="METRO">
+          <div style="height: 100%;overflow-y: auto;">
+            <el-row style="margin-bottom: 5px;">
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">名称</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">成员类型</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">设备</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">操作</div></el-col>
+            </el-row>
+            <el-row v-for="(item, index) in memberMetroList" :key="item.id" style="margin-bottom: 5px;">
+              <el-col :span="5" :offset="1">
+                <el-input v-model="item.name" size="mini" />
+              </el-col>
+              <el-col :span="5" :offset="1">
+                <el-select v-model="item.type" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in roleList" :key="elem.value" :label="elem.label" :value="elem.value" />
+                </el-select>
+              </el-col>
+              <el-col :span="5" :offset="1">
+                <el-select v-if="item.type === 'DRIVER'" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in trainList" :key="elem.groupNumber" :label="elem.groupNumber" :value="elem.groupNumber" />
+                </el-select>
+                <el-select v-else-if="stationShow.includes(item.type)" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in stationList" :key="elem.code" :label="elem.name" :value="elem.code" />
+                </el-select>
+                <span v-else>--</span>
+              </el-col>
+              <el-col :span="5" :offset="1" style="text-align: center;">
+                <el-button type="primary" size="mini" @click="deleteMember(index, 'METRO')">删除</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane class="view-control" label="大铁CTC" name="RAILWAY">
+          <div style="height: 100%;overflow-y: auto;">
+            <el-row style="margin-bottom: 5px;">
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">名称</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">成员类型</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">设备</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">操作</div></el-col>
+            </el-row>
+            <el-row v-for="(item, index) in memberRailwayList" :key="item.id" style="margin-bottom: 5px;">
+              <el-col :span="5" :offset="1">
+                <el-input v-model="item.name" size="mini" />
+              </el-col>
+              <el-col :span="5" :offset="1">
+                <el-select v-model="item.type" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in roleList" :key="elem.value" :label="elem.label" :value="elem.value" />
+                </el-select>
+              </el-col>
+              <el-col :span="5" :offset="1">
+                <el-select v-if="item.type === 'DISPATCHER'" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in disStationList" :key="elem.id" :label="elem.name" :value="elem.code" />
+                </el-select>
+                <el-select v-else-if="item.type === 'DRIVER'" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in trainList" :key="elem.groupNumber" :label="elem.groupNumber" :value="elem.groupNumber" />
+                </el-select>
+                <el-select v-else-if="stationShow.includes(item.type)" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in stationList" :key="elem.code" :label="elem.name" :value="elem.code" />
+                </el-select>
+                <span v-else>--</span>
+              </el-col>
+              <el-col :span="5" :offset="1" style="text-align: center;">
+                <el-button type="primary" size="mini" @click="deleteMember(index, 'METRO')">删除</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane class="view-control" label="应急调度" name="EMERGENCY">
+          <div style="height: 100%;overflow-y: auto;">
+            <el-row style="margin-bottom: 5px;">
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">名称</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">成员类型</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">设备</div></el-col>
+              <el-col :span="5" :offset="1"><div style="text-align: center;font-size: 14px;">操作</div></el-col>
+            </el-row>
+            <el-row v-for="(item, index) in memberEmergencyList" :key="item.id" style="margin-bottom: 5px;">
+              <el-col :span="5" :offset="1">
+                <el-input v-model="item.name" size="mini" />
+              </el-col>
+              <el-col :span="5" :offset="1">
+                <el-select v-model="item.type" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in roleList" :key="elem.value" :label="elem.label" :value="elem.value" />
+                </el-select>
+              </el-col>
+              <el-col :span="5" :offset="1">
+                <el-select v-if="item.type === 'DRIVER'" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in trainList" :key="elem.groupNumber" :label="elem.groupNumber" :value="elem.groupNumber" />
+                </el-select>
+                <el-select v-else-if="stationShow.includes(item.type)" v-model="item.deviceCode" placeholder="请选择" size="mini">
+                  <el-option v-for="elem in stationList" :key="elem.code" :label="elem.name" :value="elem.code" />
+                </el-select>
+                <span v-else>--</span>
+              </el-col>
+              <el-col :span="5" :offset="1" style="text-align: center;">
+                <el-button type="primary" size="mini" @click="deleteMember(index, 'METRO')">删除</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-tab-pane>
+    <el-tab-pane class="view-control" label="创建" name="second" :lazy="lazy">
+      <div style="height: 100%;overflow-y:auto;">
+        <el-form ref="createForm" :model="createForm" label-width="150px" class="demo-ruleForm" size="small">
+          <el-form-item label="成员名称：" prop="name">
+            <el-input v-model="createForm.name" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="成员类型：" prop="type">
+            <el-select v-model="createForm.type" placeholder="请选择">
+              <el-option v-for="item in roleList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="关联设备：" prop="deviceCode">
+            <el-select v-model="createForm.deviceCode" placeholder="请选择">
+              <el-option v-for="item in [...stationList, ...trainList]" :key="item.code" :label="item.name || item.groupNumber" :value="item.code" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="系统：" prop="systemType">
+            <el-select v-model="createForm.systemType" placeholder="请选择">
+              <el-option v-for="item in systemList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="createMember">提交</el-button>
+            <el-button @click="resetForm">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane class="view-control" label="批量创建" name="third" :lazy="lazy">
+      <div style="height: 100%;overflow-y:auto;">
+        <el-form ref="batchForm" :model="batchForm" label-width="120px" class="demo-ruleForm" size="small">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="系统：" prop="systemType">
+                <el-select v-model="batchForm.systemType" placeholder="请选择">
+                  <el-option
+                    v-for="item in systemList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="行调：" prop="DISPATCHER">
+                <el-input-number v-model="batchForm.DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="通号：" prop="MAINTAINER">
+                <el-input-number v-model="batchForm.MAINTAINER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="行值：" prop="STATION_SUPERVISOR">
+                <el-input-number v-model="batchForm.STATION_SUPERVISOR" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="司机：" prop="DRIVER">
+                <el-input-number v-model="batchForm.DRIVER" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'METRO'">
+            <el-col :span="12">
+              <el-form-item label="车辆段/停车场调度：" prop="DEPOT_DISPATCHER">
+                <el-input-number v-model="batchForm.DEPOT_DISPATCHER" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="车辆段/停车场信号楼：" prop="SIGNAL_BUILDING">
+                <el-input-number v-model="batchForm.SIGNAL_BUILDING" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'RAILWAY'">
+            <el-col :span="12">
+              <el-form-item label="车站助理：" prop="STATION_ASSISTANT">
+                <el-input-number v-model="batchForm.STATION_ASSISTANT" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="车站站长：" prop="STATION_MASTER">
+                <el-input-number v-model="batchForm.STATION_MASTER" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'RAILWAY'">
+            <el-col :span="12">
+              <el-form-item label="车站信号员：" prop="STATION_SIGNALER">
+                <el-input-number v-model="batchForm.STATION_SIGNALER" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="车站客运员：" prop="STATION_PASSENGER">
+                <el-input-number v-model="batchForm.STATION_PASSENGER" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'RAILWAY'">
+            <el-col :span="12">
+              <el-form-item label="车站扳道员：" prop="STATION_SWITCH_MAN">
+                <el-input-number v-model="batchForm.STATION_SWITCH_MAN" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="车站引导员：" prop="STATION_FACILITATOR">
+                <el-input-number v-model="batchForm.STATION_FACILITATOR" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'RAILWAY'">
+            <el-col :span="12">
+              <el-form-item label="车站工务工：" prop="STATION_WORKER">
+                <el-input-number v-model="batchForm.STATION_WORKER" size="small" :min="0" :max="1" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备管理员：" prop="DEVICE_MANAGER">
+                <el-input-number v-model="batchForm.DEVICE_MANAGER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'METRO'">
+            <el-col :span="12">
+              <el-form-item label="工电调度：" prop="ELECTRIC_DISPATCHER">
+                <el-input-number v-model="batchForm.ELECTRIC_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="车务段段长：" prop="TRAIN_MASTER">
+                <el-input-number v-model="batchForm.TRAIN_MASTER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="batchForm.systemType === 'METRO'">
+            <el-col :span="12">
+              <el-form-item label="值班主任：" prop="SHIFT_MANAGER">
+                <el-input-number v-model="batchForm.SHIFT_MANAGER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="环控调度" prop="ENVIRONMENT_DISPATCHER">
+                <el-input-number v-model="batchForm.ENVIRONMENT_DISPATCHER" size="small" :min="0" :step="1" :precision="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item>
+            <el-button type="primary" @click="batchCreate">批量创建</el-button>
+            <el-button @click="resetForm">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane class="view-control" label="一键生成" name="fourth" :lazy="lazy">
+      <el-form ref="generationForm" :model="generationForm" label-width="120px" class="demo-ruleForm" size="small">
+        <el-form-item label="系统：" prop="systemType">
+          <el-select v-model="generationForm.systemType" placeholder="请选择">
+            <el-option
+              v-for="item in systemList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div style="text-align: center;">
+        <el-button size="small" type="primary" @click="keyGeneration">一键生成</el-button>
+      </div>
+    </el-tab-pane>
+    <el-tab-pane class="view-control" label="一键清空" name="fifth" :lazy="lazy">
+      <el-form ref="generationForm" :model="clearForm" label-width="120px" class="demo-ruleForm" size="small">
+        <el-form-item label="系统：" prop="systemType">
+          <el-select v-model="clearForm.systemType" placeholder="请选择">
+            <el-option
+              v-for="item in systemList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div style="text-align: center;">
+        <el-button size="small" type="primary" @click="keyClear">一键清空</el-button>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import {mapGetters} from 'vuex';
+import { getDisStationList } from '@/api/disStation';
+import ConstConfig from '@/scripts/ConstConfig';
+export default {
+    name: 'SimulationMember',
+    data() {
+        return {
+            lazy: true,
+            activeName: 'first',
+            memberActive: 'METRO',
+            roleList: ConstConfig.ConstSelect.roleTypeList,
+            systemList: [
+                { label: '地铁CBTC', value: 'METRO' },
+                { label: '大铁CTC', value: 'RAILWAY' },
+                { label: '应急调度', value: 'EMERGENCY' }
+            ],
+            createForm: {
+                id: '',
+                name: '',
+                type: 'DISPATCHER',
+                deviceCode: '',
+                systemType: 'METRO'
+            },
+            batchForm: {
+                DISPATCHER: 0,
+                STATION_SUPERVISOR: 0,
+                DRIVER: 0,
+                MAINTAINER: 0,
+                DEPOT_DISPATCHER: 0,
+                SIGNAL_BUILDING: 0,
+                STATION_ASSISTANT: 0,
+                STATION_MASTER: 0,
+                STATION_SIGNALER: 0,
+                STATION_PASSENGER: 0,
+                STATION_SWITCH_MAN: 0,
+                STATION_FACILITATOR: 0,
+                STATION_WORKER: 0,
+                TRAIN_MASTER: 0,
+                ELECTRIC_DISPATCHER: 0,
+                DEVICE_MANAGER: 0,
+                SHIFT_MANAGER: 0,
+                ENVIRONMENT_DISPATCHER: 0,
+                systemType: 'METRO'
+            },
+            generationForm: {
+                systemType: 'METRO'
+            },
+            clearForm: {
+                systemType: 'METRO'
+            },
+            disStationList: [],
+            stationShow: ['STATION_SUPERVISOR', 'DEPOT_DISPATCHER', 'SIGNAL_BUILDING', 'STATION_ASSISTANT', 'STATION_MASTER', 'STATION_SIGNALER', 'STATION_PASSENGER', 'STATION_SWITCH_MAN',
+                'STATION_FACILITATOR', 'STATION_WORKER', 'DEVICE_MANAGER']
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'memberEmergencyList',
+            'stationList',
+            'trainList'
+        ]),
+        memberMetroList() {
+            return this.$store.state.map.map.memberMap.METRO;
+        },
+        memberRailwayList() {
+            return this.$store.state.map.map.memberMap.RAILWAY;
+        },
+        memberEmergencyList() {
+            return this.$store.state.map.map.memberMap.EMERGENCY;
+        }
+    },
+    watch: {
+
+    },
+    mounted() {
+        this.initDisStationList();
+    },
+    methods: {
+        initDisStationList() {
+            getDisStationList(this.$route.params.mapId).then(resp => {
+                this.disStationList = resp.data || [];
+            }).catch(e => { this.$message.error('获取调度台数据失败！'); });
+        },
+        getMemberId(systemType) {
+            let id = '1';
+            const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList };
+            if (memberMap[systemType] && memberMap[systemType].length) {
+                id = parseInt(memberMap[systemType][memberMap[systemType].length - 1].id) + 1 + '';
+            }
+            return id;
+        },
+        deleteMember(index, type) {
+            const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList };
+            memberMap[type].splice(index, 1);
+        },
+        async batchCreate() {
+            const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList };
+            if (this.batchForm.DISPATCHER) {
+                if (this.batchForm.systemType === 'RAILWAY') {
+                    const resp = await getDisStationList(this.$route.params.mapId);
+                    this.disStationList = resp.data || [];
+                    for (let i = 0; i < this.batchForm.DISPATCHER; i++) {
+                        this.disStationList.forEach(disStation => {
+                            const member = {
+                                id: this.getMemberId(this.batchForm.systemType),
+                                name: '',
+                                type: 'DISPATCHER',
+                                deviceCode: disStation.code
+                            };
+                            memberMap[this.batchForm.systemType].push(member);
+                        });
+                    }
+                } else {
+                    for (let i = 0; i < this.batchForm.DISPATCHER; i++) {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'DISPATCHER',
+                            deviceCode: ''
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                }
+            }
+            this.stationList.forEach(station => {
+                if (!station.depot) {
+                    if (this.batchForm.STATION_SUPERVISOR) {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_SUPERVISOR',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_ASSISTANT && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_ASSISTANT',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_MASTER && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_MASTER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_SIGNALER && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_SIGNALER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_PASSENGER && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_PASSENGER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_SWITCH_MAN && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_SWITCH_MAN',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_FACILITATOR && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_FACILITATOR',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.STATION_WORKER && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'STATION_WORKER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.DEVICE_MANAGER && this.batchForm.systemType === 'RAILWAY') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'DEVICE_MANAGER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                } else {
+                    if (this.batchForm.DEPOT_DISPATCHER && this.batchForm.systemType === 'METRO') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'DEPOT_DISPATCHER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                    if (this.batchForm.SIGNAL_BUILDING && this.batchForm.systemType === 'METRO') {
+                        const member = {
+                            id: this.getMemberId(this.batchForm.systemType),
+                            name: '',
+                            type: 'SIGNAL_BUILDING',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.batchForm.systemType].push(member);
+                    }
+                }
+            });
+
+            if (this.batchForm.DRIVER) {
+                this.trainList.forEach(train => {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'DRIVER',
+                        deviceCode: train.groupNumber
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                });
+            }
+            if (this.batchForm.MAINTAINER) {
+                for (let i = 0; i < this.batchForm.MAINTAINER; i++) {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'MAINTAINER',
+                        deviceCode: ''
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                }
+            }
+            if (this.batchForm.TRAIN_MASTER && this.batchForm.systemType === 'METRO') {
+                for (let i = 0; i < this.batchForm.TRAIN_MASTER; i++) {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'TRAIN_MASTER',
+                        deviceCode: ''
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                }
+            }
+            if (this.batchForm.ELECTRIC_DISPATCHER && this.batchForm.systemType === 'METRO') {
+                for (let i = 0; i < this.batchForm.ELECTRIC_DISPATCHER; i++) {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'ELECTRIC_DISPATCHER',
+                        deviceCode: ''
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                }
+            }
+            if (this.batchForm.SHIFT_MANAGER && this.batchForm.systemType === 'METRO') {
+                for (let i = 0; i < this.batchForm.SHIFT_MANAGER; i++) {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'SHIFT_MANAGER',
+                        deviceCode: ''
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                }
+            }
+            if (this.batchForm.ENVIRONMENT_DISPATCHER && this.batchForm.systemType === 'METRO') {
+                for (let i = 0; i < this.batchForm.ENVIRONMENT_DISPATCHER; i++) {
+                    const member = {
+                        id: this.getMemberId(this.batchForm.systemType),
+                        name: '',
+                        type: 'ENVIRONMENT_DISPATCHER',
+                        deviceCode: ''
+                    };
+                    memberMap[this.batchForm.systemType].push(member);
+                }
+            }
+            this.$message.success('批量添加成功！');
+            this.resetForm();
+        },
+        createMember() {
+            const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList };
+            const member = {
+                id: this.getMemberId(this.createForm.systemType),
+                name: this.createForm.name,
+                type: this.createForm.type,
+                deviceCode: this.createForm.deviceCode
+            };
+            memberMap[this.createForm.systemType].push(member);
+            this.$message.success('添加成功！');
+            this.resetForm();
+        },
+        resetForm() {
+            this.batchForm = {
+                DISPATCHER: 0,
+                STATION_SUPERVISOR: 0,
+                DRIVER: 0,
+                MAINTAINER: 0,
+                DEPOT_DISPATCHER: 0,
+                SIGNAL_BUILDING: 0,
+                STATION_ASSISTANT: 0,
+                STATION_MASTER: 0,
+                STATION_SIGNALER: 0,
+                STATION_PASSENGER: 0,
+                STATION_SWITCH_MAN: 0,
+                STATION_FACILITATOR: 0,
+                STATION_WORKER: 0,
+                TRAIN_MASTER: 0,
+                ELECTRIC_DISPATCHER: 0,
+                DEVICE_MANAGER: 0,
+                SHIFT_MANAGER: 0,
+                ENVIRONMENT_DISPATCHER: 0,
+                systemType: 'METRO'
+            };
+            this.createForm = {
+                id: '',
+                name: '',
+                type: 'DISPATCHER',
+                deviceCode: '',
+                systemType: 'METRO'
+            };
+            this.generationForm = {
+                systemType: 'METRO'
+            };
+        },
+        async keyGeneration() {
+            const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList };
+            memberMap[this.generationForm.systemType].splice(0, memberMap[this.generationForm.systemType].length);
+            if (this.generationForm.systemType === 'RAILWAY') {
+                const resp = await getDisStationList(this.$route.params.mapId);
+                this.disStationList = resp.data || [];
+                this.disStationList.forEach(disStation => {
+                    const memberDispatcher = {
+                        id: this.getMemberId(this.generationForm.systemType),
+                        name: '',
+                        type: 'DISPATCHER',
+                        deviceCode: disStation.code
+                    };
+                    memberMap[this.generationForm.systemType].push(memberDispatcher);
+                });
+            } else {
+                const memberDispatcher = {
+                    id: this.getMemberId(this.generationForm.systemType),
+                    name: '',
+                    type: 'DISPATCHER',
+                    deviceCode: ''
+                };
+                memberMap[this.generationForm.systemType].push(memberDispatcher);
+            }
+            this.stationList.forEach(station => {
+                if (!station.depot) {
+                    const member = {
+                        id: this.getMemberId(this.generationForm.systemType),
+                        name: '',
+                        type: 'STATION_SUPERVISOR',
+                        deviceCode: station.code
+                    };
+                    memberMap[this.generationForm.systemType].push(member);
+                }
+            });
+            this.trainList.forEach(train => {
+                const member = {
+                    id: this.getMemberId(this.generationForm.systemType),
+                    name: '',
+                    type: 'DRIVER',
+                    deviceCode: train.groupNumber
+                };
+                memberMap[this.generationForm.systemType].push(member);
+            });
+            const memberMaintainer = {
+                id: this.getMemberId(this.generationForm.systemType),
+                name: '',
+                type: 'MAINTAINER',
+                deviceCode: ''
+            };
+            memberMap[this.generationForm.systemType].push(memberMaintainer);
+            if (this.generationForm.systemType === 'RAILWAY') {
+                this.stationList.forEach(station => {
+                    if (!station.depot) {
+                        const memberStationAssistant = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_ASSISTANT',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationAssistant);
+                        const memberStationMaster = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_MASTER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationMaster);
+                        const memberStationSignaler = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_SIGNALER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationSignaler);
+                        const memberStationPassenger = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_PASSENGER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationPassenger);
+                        const memberStationSwitchMan = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_SWITCH_MAN',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationSwitchMan);
+                        const memberStationFacilitator = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_FACILITATOR',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationFacilitator);
+                        const memberStationWorker = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'STATION_WORKER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberStationWorker);
+                        const memberDeviceManager = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'DEVICE_MANAGER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberDeviceManager);
+                    }
+                });
+            } else if (this.generationForm.systemType === 'METRO') {
+                this.stationList.forEach(station => {
+                    if (station.depot) {
+                        const memberDepotDispatcher = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'DEPOT_DISPATCHER',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberDepotDispatcher);
+                        const memberSignalBuilDing = {
+                            id: this.getMemberId(this.generationForm.systemType),
+                            name: '',
+                            type: 'SIGNAL_BUILDING',
+                            deviceCode: station.code
+                        };
+                        memberMap[this.generationForm.systemType].push(memberSignalBuilDing);
+                    }
+                });
+                const memberTrainMaster = {
+                    id: this.getMemberId(this.generationForm.systemType),
+                    name: '',
+                    type: 'TRAIN_MASTER',
+                    deviceCode: ''
+                };
+                memberMap[this.generationForm.systemType].push(memberTrainMaster);
+                const memberElectricDispatcher = {
+                    id: this.getMemberId(this.generationForm.systemType),
+                    name: '',
+                    type: 'ELECTRIC_DISPATCHER',
+                    deviceCode: ''
+                };
+                memberMap[this.generationForm.systemType].push(memberElectricDispatcher);
+                const memberShiftManager = {
+                    id: this.getMemberId(this.generationForm.systemType),
+                    name: '',
+                    type: 'SHIFT_MANAGER',
+                    deviceCode: ''
+                };
+                memberMap[this.generationForm.systemType].push(memberShiftManager);
+                const memberEnvironmentDispatcher = {
+                    id: this.getMemberId(this.generationForm.systemType),
+                    name: '',
+                    type: 'ENVIRONMENT_DISPATCHER',
+                    deviceCode: ''
+                };
+                memberMap[this.generationForm.systemType].push(memberEnvironmentDispatcher);
+
+            }
+            this.$message.success('一键生成成功！');
+            this.resetForm();
+        },
+        keyClear() {
+            const memberMap = { METRO: this.memberMetroList, RAILWAY: this.memberRailwayList, EMERGENCY: this.memberEmergencyList };
+            memberMap[this.clearForm.systemType].splice(0, memberMap[this.clearForm.systemType].length);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/organization/classManage/index.vue b/src/views/organization/classManage/index.vue
index 37755d9f5..233a48d04 100644
--- a/src/views/organization/classManage/index.vue
+++ b/src/views/organization/classManage/index.vue
@@ -2,10 +2,10 @@
   <div style="width: 100%;height: 100%;">
     <QueryListPage
       ref="classQueryListPage"
+      :card-padding="10"
       :query-form="classQueryForm"
       :pager-config="pagerConfig"
       :query-list="classQueryList"
-      style="width:96%;margin: 0 auto;"
     />
     <create-class ref="createClass" @refresh="classRefresh" />
   </div>
@@ -82,11 +82,11 @@ export default {
                                 handleClick: this.handleStudentDetail,
                                 type: 'primary'
                             },
-                            {
-                                name: '评价查询',
-                                handleClick: this.handleGradeCheck,
-                                type: 'primary'
-                            },
+                            // {
+                            //     name: '评价查询',
+                            //     handleClick: this.handleGradeCheck,
+                            //     type: 'primary'
+                            // },
                             {
                                 name: '时长查看',
                                 handleClick: this.handleDurationView,
diff --git a/src/views/organization/examManage/gradeList.vue b/src/views/organization/examManage/gradeList.vue
index f800f8992..39069af61 100644
--- a/src/views/organization/examManage/gradeList.vue
+++ b/src/views/organization/examManage/gradeList.vue
@@ -26,6 +26,7 @@ export default {
                 labelWidth: '90px',
                 textAlign: 'right',
                 reset: false,
+                notRecord: true,
                 queryObject: {
                     orgId: {
                         type: 'select',
@@ -49,7 +50,7 @@ export default {
                 columns: [
                     {
                         title: '姓名',
-                        prop: 'username'
+                        prop: 'nickname'
                     },
                     {
                         title: '学号',
@@ -59,60 +60,44 @@ export default {
                         title: '状态',
                         prop: 'result',
                         type: 'tag',
-                        columnValue: (row) => {
-                            if (!row.result) {
-                                return '未参加';
-                            } else if (row.result === '01') {
-                                return '考试中';
-                            } else if (row.result === '02') {
-                                return '通过';
-                            } else if (row.result === '03') {
-                                return '未通过';
-                            } else {
-                                return '';
-                            }
-                        },
-                        tagType: (row) => { }
+                        columnValue: row => ['未知', '通过', '不通过', '未参加', '未提交'][row.result],
+                        tagType: row => ['', 'success', 'danger', 'info', 'warning'][row.result]
                     },
                     {
                         title: '得分',
                         prop: 'score'
                     }
                 ],
-                actions: [
-                    { text: '导出成绩', handler: this.exportGrade }
-                ]
+                actions: [{ text: '导出成绩', handler: this.exportGrade }]
             }
         };
     },
     async created() {
         const resp = await getClassListUnPage();
         const classList = [];
-        resp.data && resp.data.forEach(item => {
-            classList.push({ value: item.id, label: item.name });
-            localStore.set(this.$route.path, { orgId: classList[0].value + '' });
-        });
+        resp.data &&
+            resp.data.forEach(item => {
+                classList.push({ value: item.id, label: item.name });
+                localStore.set(this.$route.path, { orgId: classList[0].value + '' });
+            });
         this.queryForm.queryObject.orgId.config.data = classList;
     },
     methods: {
         exportGrade() {
             // ;
             const wb = XLSX.utils.book_new();
-            const data = [{A: '学号', B:'姓名', C: '得分'}];
-            this.queryList.data && this.queryList.data.forEach(item => {
-                data.push({ A: item.account, B: item.username, C:item.score });
-            });
-            const ws = XLSX.utils.json_to_sheet(data, {skipHeader:true});
-            ws['!cols'] = [
-                {width: 20},
-                {width: 20},
-                {width: 20}
-            ];
+            const data = [{ A: '学号', B: '姓名', C: '得分' }];
+            this.queryList.data &&
+                this.queryList.data.forEach(item => {
+                    data.push({ A: item.account, B: item.username, C: item.score });
+                });
+            const ws = XLSX.utils.json_to_sheet(data, { skipHeader: true });
+            ws['!cols'] = [{ width: 20 }, { width: 20 }, { width: 20 }];
             XLSX.utils.book_append_sheet(wb, ws, 'file');
             XLSX.writeFile(wb, `${this.$route.query.name}成绩.xlsx`);
         },
         queryFunction(params) {
-            return getClassGradeList(this.$route.query.examId, params);
+            return getClassGradeList({ pcId: this.$route.query.examId, ...params });
         },
         back() {
             this.$router.go(-1);
@@ -122,11 +107,11 @@ export default {
 </script>
 
 <style scoped>
-	.title_content {
-		width: 100%;
-		margin: 20px 0 30px;
-		text-align: center;
-		font-size: 24px;
-		font-weight: bold;
-	}
+.title_content {
+    width: 100%;
+    margin: 20px 0 30px;
+    text-align: center;
+    font-size: 24px;
+    font-weight: bold;
+}
 </style>
diff --git a/src/views/organization/examManage/gradeStatistics.vue b/src/views/organization/examManage/gradeStatistics.vue
index ea3dd6ce6..c5b5cad44 100644
--- a/src/views/organization/examManage/gradeStatistics.vue
+++ b/src/views/organization/examManage/gradeStatistics.vue
@@ -1,264 +1,176 @@
 <template>
-  <div>
-    <div class="title_content">{{ $route.query.name + ' 成绩统计' }}</div>
-    <el-button type="text" style="position: fixed;right: 20px;top: 70px;" @click="back">返回</el-button>
-    <div class="gradeStatisticPane">
-      <el-form
-        ref="queryForm"
-        size="small"
-        style="padding-top: 18px;"
-      >
-        <el-form-item prop="orgId" label="班级:" :required="false">
-          <el-select
-            ref="orgId"
-            v-model="orgId"
-            :clearable="false"
-            :placeholder="$t('global.choose')"
-            filterable
-            @change="onChange"
-          >
-            <el-option
-              v-for="option in classList"
-              :key="option['value']"
-              :label="option['label']"
-              :value="option['value']"
-            />
-          </el-select>
-        </el-form-item>
-      </el-form>
+    <div>
+        <div class="title_content">{{ $route.query.name + ' 成绩统计' }}</div>
+        <el-button type="text" style="position: fixed;right: 20px;top: 70px;" @click="back">返回</el-button>
+        <div class="gradeStatisticPane">
+            <el-form ref="queryForm" size="small" style="padding-top: 18px;">
+                <el-form-item prop="orgId" label="班级:" :required="false">
+                    <el-select
+                        ref="orgId"
+                        v-model="orgId"
+                        :clearable="false"
+                        :placeholder="$t('global.choose')"
+                        filterable
+                        @change="onChange"
+                    >
+                        <el-option
+                            v-for="option in classList"
+                            :key="option['value']"
+                            :label="option['label']"
+                            :value="option['value']"
+                        />
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="statisticChart">
+            <div id="mychart1" class="statisticChartLeft" />
+        </div>
     </div>
-    <div class="statisticChart">
-      <div id="mychart1" class="statisticChartLeft" />
-      <!-- <div id="mychart2" class="statisticChartRight" /> -->
-    </div>
-  </div>
 </template>
 <script>
-import * as echarts from 'echarts';
-import { getClassGradeStatistic } from '@/api/management/userexam';
-import { getClassListUnPage } from '@/api/company';
-import { getExamLessonDetail } from '@/api/management/exam';
-import localStore from 'storejs';
+import * as echarts from 'echarts'
+import { getClassGradeStatistic } from '@/api/management/userexam'
+import { getClassListUnPage } from '@/api/company'
+import localStore from 'storejs'
 export default {
     name: 'GradeStatistics',
     data() {
         return {
-            orgId:'',
-            myChart1:null,
-            // myChart2:null,
-            // userNameList:[],
-            // gradeList:[],
-            classList:[],
-            // durationList:[],
-            fullPoint:0,
-            passingPoint:0,
-            duration:0,
-            title:{
-                show:true,
-                text:'成绩分布',
-                textAlign:'center',
-                left:'50%',
-                top:'5px',
-                textStyle:{
-                    color:'#f00'
-                }
-            },
-            // title1:{
-            //     show:true,
-            //     text:' 答题时长区间人数 ',
-            //     // 各分数区间人数统计
-            //     textAlign:'center',
-            //     left:'50%',
-            //     top:'5px',
-            //     textStyle:{
-            //         color:'#f00'
-            //     }
-            // },
-            // yAxis1:{
-            //     position:'left',
-            //     name:'人数',
-            //     nameLocation:'end',
-            //     minInterval:1,
-            //     nameTextStyle:{
-            //         align:'left',
-            //         fontSize:14
-            //     },
-            //     axisLine:{show:true}
-            // },
-            yAxis:{
-                position:'left',
-                name:'人数',
-                nameLocation:'end',
-                min:0,
-                nameTextStyle:{
-                    align:'left',
-                    fontSize:14
+            orgId: '',
+            myChart1: null,
+            classList: [],
+            fullPoint: 0,
+            passingPoint: 0,
+            duration: 0,
+            title: {
+                show: true,
+                text: '成绩分布',
+                textAlign: 'center',
+                left: '50%',
+                top: '5px',
+                textStyle: {
+                    color: '#f00',
                 },
-                axisLine:{show:true}
             },
-            gradeInterval:[]
-        };
+            yAxis: {
+                position: 'left',
+                name: '人数',
+                nameLocation: 'end',
+                min: 0,
+                nameTextStyle: {
+                    align: 'left',
+                    fontSize: 14,
+                },
+                axisLine: { show: true },
+            },
+            gradeInterval: [],
+        }
     },
     async mounted() {
-        const resp = await getClassListUnPage();
-        resp.data && resp.data.forEach(item => {
-            this.classList.push({ value: item.id, label: item.name });
-        });
-        localStore.set(this.$route.path, { orgId: this.classList[0].value + '' });
-        this.orgId = this.classList[0].value;
-        const res = await getExamLessonDetail(this.$route.query.examId);
-        if (res.data) {
-            this.fullPoint = res.data.fullPoint;
-            this.passingPoint = res.data.passingPoint;
-            this.duration = res.data.duration;
-        }
-        var chartDom1 = document.getElementById('mychart1');
-        this.myChart1 = echarts.init(chartDom1);
-        // var chartDom2 = document.getElementById('mychart2');
-        // this.myChart2 = echarts.init(chartDom2);
-        const eachInterval = this.fullPoint / 10;
-        this.gradeInterval = [];
-        for(var i=0;i<10;i++){
-            this.gradeInterval.push(eachInterval*i+'-'+eachInterval*(i+1));
-        }
+        const resp = await getClassListUnPage()
+        resp.data &&
+            resp.data.forEach(item => {
+                this.classList.push({ value: item.id, label: item.name })
+            })
+        localStore.set(this.$route.path, { orgId: this.classList[0].value + '' })
+        this.orgId = this.classList[0].value
+
+        var chartDom1 = document.getElementById('mychart1')
+        this.myChart1 = echarts.init(chartDom1)
         const option = {
-            title:this.title,
+            title: this.title,
             xAxis: {
                 type: 'category',
-                name:'分数区间',
-                data: this.gradeInterval
+                name: '分数区间',
+                data: this.gradeInterval,
             },
-            yAxis:this.yAxis,
-            tooltip:{
-                show:true,
-                trigger:'axis'
+            yAxis: this.yAxis,
+            tooltip: {
+                show: true,
+                trigger: 'axis',
             },
             series: [
                 {
-                    data:[],
-                    type: 'line'
-                }
-            ]
-        };
-        option && this.myChart1 && this.myChart1.setOption(option);
-        this.getClassGradeStatis();
+                    data: [],
+                    type: 'bar',
+                },
+            ],
+        }
+        option && this.myChart1 && this.myChart1.setOption(option)
+        this.getClassGradeStatis()
     },
     methods: {
         back() {
-            this.$router.go(-1);
+            this.$router.go(-1)
         },
         getClassGradeStatis() {
             if (this.orgId) {
-                // this.userNameList = [];
-                // this.gradeList = [];
-                // this.myChart1.restore();
-                getClassGradeStatistic(this.orgId, this.$route.query.examId).then(resp=>{
-                    const results = resp.data;
-                    if (results) {
-                        const gradeList = results.results;
-                        const countList = [0,0,0,0,0,0,0,0,0,0];
-                        if (gradeList.length > 0) {
-                            gradeList.forEach(each=>{
-                                // this.userNameList.push(each.username || '');
-                                // this.gradeList.push(each.score);
-                                // this.durationList.push(each.duration || 0);
-                                countList[Math.floor((each.score || 0) / (this.fullPoint/ 10))]++;
-                            });
-                            let option=this.myChart1.getOption();
-                            // debugger
-                            option.series[0].data=countList;
-                            // const option1 = {
-                            //     title1:this.title1,
-                            //     xAxis: {
-                            //         name:'时长区间/s',
-                            //         type: 'category',
-                            //         data: this.durationInterval
-                            //     },
-                            //     yAxis: this.yAxis1,
-                            //     tooltip:{
-                            //         show:true,
-                            //         trigger:'axis'
-                            //     },
-                            //     series: [
-                            //         {
-                            //             data:countList,
-                            //             type: 'bar'
-                            //         }
-                            //     ]
-                            // };
-                            option && this.myChart1 && this.myChart1.setOption(option);
-                            // option1 && this.myChart2 && this.myChart2.setOption(option1);
-                            // debugger;
-                            // id": "92",
-                            // "userId": "92",
-                            // "account": "d8h4pz",
-                            // "username": "博涛.朱",
-                            // "examId": "92",
-                            // "examName": "博涛.朱",
-                            // "score": 29.38,
-                            // "usedTime": 727,
-                            // "result": "dbw206",
-                            // "duration": 429,
-                        }
-                    }
-                }).catch((error) => {
-                    // const option1 = {
-                    //     title:this.title1,
-                    //     xAxis: {
-                    //         name:'时长区间/s',
-                    //         type: 'category',
-                    //         data: this.durationInterval
-                    //     },
-                    //     yAxis:this.yAxis1,
-                    //     series: [
-                    //         {
-                    //             data:[],
-                    //             type: 'bar'
-                    //         }
-                    //     ]
-                    // };
-                    // option1 && this.myChart2 && this.myChart2.setOption(option1);
-                    this.$message.error(error.message);
-                });
+                getClassGradeStatistic(this.orgId, this.$route.query.examId)
+                    .then(resp => {
+                        const results = resp.data
+                        if (results) {
+                            this.fullPoint = results.fullScore
+                            const gradeList = results.detail
+                            const countList = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+                            if (gradeList.length > 0) {
+                                gradeList.forEach(each => {
+                                    countList[Math.floor((each.score || 0) / (this.fullPoint / 10))]++
+                                })
+                                let option = this.myChart1.getOption()
 
+                                const eachInterval = this.fullPoint / 10
+                                this.gradeInterval = []
+                                for (var i = 0; i < 10; i++) {
+                                    this.gradeInterval.push(eachInterval * i + '-' + eachInterval * (i + 1))
+                                }
+                                option.series[0].data = countList
+                                option.xAxis[0].data = this.gradeInterval
+                                option && this.myChart1 && this.myChart1.setOption(option)
+                            }
+                        }
+                    })
+                    .catch(error => {
+                        this.$message.error(error.message)
+                    })
             }
         },
         onChange(data) {
-            this.getClassGradeStatis();
-        }
-    }
-};
+            this.getClassGradeStatis()
+        },
+    },
+}
 </script>
 <style scoped>
-	.title_content {
-		width: 100%;
-		margin: 20px 0 30px;
-		text-align: center;
-		font-size: 24px;
-		font-weight: bold;
-	}
-  .gradeStatisticPane{
-      margin: 0 auto;
-      width: 300px;
-  }
-  .statisticChart{
-      /* margin-left: 50%; */
-      /* transform: translateX(-50%); */
-      width:90%;
-      display: flex;
-      margin-left:5%;
-  }
-  .statisticChartLeft{
-      width: 100%;
-      display: inline-block;
-      height: 500px;
-      /* margin-left:25%; */
-      /* border:1px #ccc solid */
-  }
-  .statisticChartRight{
-      width: 50%;
-      display: inline-block;
-      height: 500px;
-      /* border:1px #ccc solid */
-  }
+.title_content {
+    width: 100%;
+    margin: 20px 0 30px;
+    text-align: center;
+    font-size: 24px;
+    font-weight: bold;
+}
+.gradeStatisticPane {
+    margin: 0 auto;
+    width: 300px;
+}
+.statisticChart {
+    /* margin-left: 50%; */
+    /* transform: translateX(-50%); */
+    width: 90%;
+    display: flex;
+    margin-left: 5%;
+}
+.statisticChartLeft {
+    width: 100%;
+    display: inline-block;
+    height: 500px;
+    /* margin-left:25%; */
+    /* border:1px #ccc solid */
+}
+.statisticChartRight {
+    width: 50%;
+    display: inline-block;
+    height: 500px;
+    /* border:1px #ccc solid */
+}
 </style>
diff --git a/src/views/organization/examManage/index.vue b/src/views/organization/examManage/index.vue
index ff494feba..f9448c2c2 100644
--- a/src/views/organization/examManage/index.vue
+++ b/src/views/organization/examManage/index.vue
@@ -1,20 +1,22 @@
 <template>
-  <div style="width: 100%;height: 100%;">
+  <div style="width: 100%;">
     <QueryListPage
       ref="examQueryListPage"
+      :card-padding="10"
       :query-form="examQueryForm"
       :pager-config="pagerConfig"
       :query-list="examQueryList"
-      style="width:96%;margin: 0 auto;"
     />
   </div>
 </template>
 
 <script>
-import { getExamListProject, setExamEffectivey, setExamEfficacy } from '@/api/management/exam';
-import localStore from 'storejs';
+import config from '@/scripts/ConstConfig';
+import { getPapaerListOfOrg, getAllPapaerListOfOrg, lockPaper, invalidPaper, deletePaper } from '@/api/management/exam';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 
+const { paperStateArr, paperStateQueryMap } = config.ConstSelect;
+
 export default {
     name: 'ExamManage',
     data() {
@@ -35,24 +37,22 @@ export default {
                         type: 'text',
                         label: '试卷名称:'
                     },
-                    creatorName: {
-                        type: 'text',
-                        label: '创建人:'
-                    },
-                    status: {
+                    findState: {
                         type: 'select',
-                        label: '启用/禁用:',
+                        label: '状态:',
+                        value: 1,
                         config: {
-                            data: [
-                                { label: '启用', value: '1' },
-                                { label: '禁用', value: '0' }
-                            ]
-                        }
+                            data: Object.entries(paperStateQueryMap).map(([i, v]) => ({
+                                value: Number(i),
+                                label: v
+                            }))
+                        },
+                        noClearable: true
                     }
                 }
             },
             examQueryList: {
-                query: getExamListProject,
+                query: obj => this.getListApi(obj),
                 selectCheckShow: false,
                 indexShow: false,
                 columns: [
@@ -61,40 +61,18 @@ export default {
                         prop: 'name'
                     },
                     {
-                        title: '归属地图',
-                        prop: 'mapId',
-                        type: 'tag',
-                        width: '200',
-                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapIdList, ['id', 'name']); },
-                        tagType: (row) => { return ''; }
+                        title: '简介',
+                        prop: 'profile'
                     },
                     {
-                        title: '产品类型',
-                        prop: 'prdType',
+                        title: '状态',
+                        prop: 'state',
                         type: 'tag',
-                        width:  '110',
-                        columnValue: (row) => { if (row.prdType === '01') { return '现地工作站'; } else if (row.prdType === '02') { return '行调工作站'; } },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                        title: '启用/禁用',
-                        prop: 'status',
-                        type: 'tag',
-                        width:  '80',
-                        columnValue: (row) => {
-                            return row.status == '1' ? '启用' : '禁用';
+                        width: '80',
+                        columnValue: row => {
+                            return paperStateArr[row.state - 1];
                         },
-                        tagType: (row) => { return ''; }
-                    },
-                    {
-                    	title: '试卷规则状态',
-                    	prop: 'abnormal',
-                    	type: 'tag',
-                    	width: '80',
-                    	columnValue: (row) => {
-                    		return row.abnormal ? '异常' : '正常';
-                    	},
-                    	tagType: (row) => { return row.abnormal ? 'danger' : 'success'; }
+                        tagType: row => ''
                     },
                     {
                         title: '开始时间',
@@ -106,32 +84,32 @@ export default {
                     },
                     {
                         title: '满分',
-                        prop: 'fullPoint',
-                        width:  '80'
+                        prop: 'fullScore',
+                        width: '80'
                     },
                     {
                         title: '及格分',
-                        prop: 'passingPoint',
-                        width:  '80'
+                        prop: 'passScore',
+                        width: '80'
                     },
                     {
                         title: '时长',
-                        prop: 'duration',
+                        prop: 'validDuration',
                         type: 'tag',
-                        width:  '80',
-                        columnValue: (row) => {
-                            return Math.floor(row.duration / 60);
-                        },
-                        tagType: (row) => { }
+                        width: '80',
+                        columnValue: row => row.validDuration,
+                        tagType: row => {}
                     },
                     {
                         title: '创建人',
                         prop: 'creatorName',
-                        width:  '150'
+                        width: '150',
+                        formatter: row => row.creatorInfo.name
                     },
                     {
                         type: 'button',
                         title: this.$t('global.operate'),
+                        hide: () => this.hasTeachingDataManage(),
                         width: '350',
                         buttons: [
                             {
@@ -146,94 +124,138 @@ export default {
                             },
                             {
                                 name: '编辑',
-                                handleClick: this.handleEditExam,
+                                handleClick: this.handleEdit,
                                 type: 'primary',
-                                showControl: (row) => {
-                                    return row.creatorId == this.userId;
+                                showControl: row => {
+                                    return row.creatorId == this.userId && row.state === 1;
                                 }
                             },
                             {
-                                name: '启用',
-                                handleClick: this.handleEnableExam,
+                                name: '封存',
+                                handleClick: this.handleLock,
                                 type: 'warning',
-                                showControl: (row) => {
-                                    return row.creatorId == this.userId && row.status == '0';
+                                showControl: row => {
+                                    return row.creatorId == this.userId && row.state === 1;
                                 }
                             },
                             {
-                                name: '禁用',
-                                handleClick: this.handleDeleteExam,
+                                name: '失效',
+                                handleClick: this.handleInvalid,
                                 type: 'danger',
-                                showControl: (row) => {
-                                    return row.creatorId == this.userId && row.status == '1';
+                                showControl: row => {
+                                    return row.creatorId == this.userId && row.state === 2;
+                                }
+                            },
+                            {
+                                name: '删除',
+                                handleClick: this.handleDelete,
+                                type: 'danger',
+                                showControl: row => {
+                                    return row.creatorId == this.userId && row.state === 1;
                                 }
                             }
                         ]
                     }
                 ],
-                actions: [
-                    { text: '新建试卷', handler: this.examCreate }
-                ]
+                actions: [{ text: '新建试卷', handler: this.examCreate }]
             }
         };
     },
     computed: {
         userId() {
             return this.$store.state.user.id;
+        },
+        orgId() {
+            return this.$store.state.user.companyId;
         }
     },
     created() {
-        const params = localStore.get(this.$route.path) || {};
-        if (!params.status) { params.status = '1'; }
-        localStore.set(this.$route.path, params);
         this.mapIdList = [];
         getPublishMapListOnline().then(response => {
             this.mapIdList = response.data;
         });
     },
     methods: {
+        hasTeachingDataManage() {
+            return this.$route.path.includes('/teachingDataManage/');
+        },
+        getListApi(obj) {
+            if (this.hasTeachingDataManage()) {
+                return getAllPapaerListOfOrg({ ...obj });
+            } else {
+                return getPapaerListOfOrg({ ...obj, orgId: this.orgId });
+            }
+        },
         handleQueryGrade(index, row) {
             this.$router.push({ path: '/info/gradeList', query: { examId: row.id, name: row.name } });
         },
         handleGradeStatistics(index, row) {
             this.$router.push({ path: '/info/gradeStatistics', query: { examId: row.id, name: row.name } });
         },
-        handleEditExam(index, row) {
-            this.$router.push({ path: `/info/examRule/draft/edit/${row.id}/0`, query: { source: 'org' } });
+        handleEdit(index, row) {
+            this.$router.push({ path: `/info/examRule/draft/edit/${row.id}`, query: { source: 'org' } });
         },
         examCreate() {
-            this.$router.push({ path: `/info/examRule/draft/add/0/0`, query: { source: 'org' } });
+            this.$router.push({ path: `/info/examRule/draft/add/0`, query: { source: 'org' } });
         },
-        handleEnableExam(index, data) {
-            setExamEffectivey(data).then(res => {
-                this.examRefresh();
-                this.$message.success('启用试卷成功！');
-            }).catch(error => {
-                this.$message.error('启用试卷失败：' + error.message);
-            });
-        },
-        handleDeleteExam(index, data) {
-            this.$confirm('该操作将禁用试卷，是否继续？', this.$t('global.tips'), {
+        handleLock(index, data) {
+            this.$confirm('确定封存试卷吗? 该操作不能撤销!', this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
-            }).then(() => {
-                setExamEfficacy(data).then(res => {
+            })
+                .then(() => {
+                    lockPaper(data.id)
+                        .then(res => {
+                            this.examRefresh();
+                            this.$message.success('封存试卷成功！');
+                        })
+                        .catch(error => {
+                            this.$message.error('封存试卷失败' + error.message);
+                        });
+                })
+                .catch(() => {});
+        },
+        handleInvalid(index, data) {
+            this.$confirm('该操作将使试卷失效，是否继续？', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            })
+                .then(() => {
+                    invalidPaper(data.id)
+                        .then(res => {
+                            this.examRefresh();
+                            this.$message({
+                                type: 'success',
+                                message: '操作成功！'
+                            });
+                        })
+                        .catch(error => {
+                            this.$message.error('操作失败：' + error.message);
+                        });
+                })
+                .catch(() => {});
+        },
+        handleDelete(index, data) {
+            this.$confirm('确定删除该试卷吗?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            })
+                .then(() => deletePaper(data.id))
+                .then(resp => {
                     this.examRefresh();
                     this.$message({
                         type: 'success',
-                        message: '禁用试卷成功！'
+                        message: '删除成功！'
                     });
-                }).catch(res => {
-                    if (res.code == '10004') {
-                        this.$message({ type: 'error', message: '禁用失败:试卷已被使用，无法禁用!' });
-                    } else if (res.code == '10003') {
-                        this.$message({ type: 'warning', message: '禁用失败:无权限禁用!'});
-                    } else {
-                        this.$message({ type: 'error', message: '禁用试卷失败！' });
+                })
+                .catch(res => {
+                    if (res.code && res.code !== 200) {
+                        this.$message({ type: 'error', message: res.message });
                     }
                 });
-            }).catch(() => { });
         },
         examRefresh() {
             this.$nextTick(() => {
@@ -244,6 +266,4 @@ export default {
 };
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/organization/index.vue b/src/views/organization/index.vue
index 85323a41a..a06468b69 100644
--- a/src/views/organization/index.vue
+++ b/src/views/organization/index.vue
@@ -1,35 +1,25 @@
 <template>
-  <div>
-    <div class="title_content">{{ companyName + '教学管理' }}</div>
-    <el-button v-if="!hideBack" type="text" class="lessonManageBack" @click="back">返回</el-button>
-    <div class="lessonManageInfo">
-      <el-menu class="lessonManageMenu" default-active="2-1">
-        <el-menu-item index="1" @click="clickMenu">
-          <img :src="classIcon" class="teachMenu">
-          <span class="teachMenuTitle" :style="{color: $route.path.includes('classManage')?'#5BDBFF': '#000'}">班级管理</span>
-        </el-menu-item>
-        <el-submenu index="2">
-          <template slot="title">
-            <img :src="lessonIcon" class="teachMenu">
-            <span class="teachMenuTitle">课程管理</span>
-          </template>
-          <el-menu-item-group>
-            <el-menu-item index="2-1" class="lessonIcon" :style="{color: $route.path.includes('lessonManage')?'#5BDBFF': '#000'}" @click="clickMenu">发布课程管理</el-menu-item>
-            <el-menu-item index="2-2" class="lessonIcon" :style="{color: $route.path.includes('draftLessonManage')?'#5BDBFF': '#000'}" @click="clickMenu">草稿课程管理</el-menu-item>
-          </el-menu-item-group>
-        </el-submenu>
-        <el-menu-item index="3" @click="clickMenu">
-          <img :src="examIcon" class="teachMenu">
-          <span slot="title" class="teachMenuTitle" :style="{color: $route.path.includes('examManage')?'#5BDBFF': '#000'}">考试管理</span>
-        </el-menu-item>
-        <el-menu-item index="4" @click="clickMenu">
-          <img :src="ruleIcon" class="teachMenu">
-          <span slot="title" :style="{color: $route.path.includes('ruleManage')?'#5BDBFF': '#000'}" class="teachMenuTitle">评价管理</span>
-        </el-menu-item>
+  <div class="mianBox">
+    <div class="lessonManageInfo" :style="{width: widthLeft+'px'}">
+      <el-menu
+        :default-active="defaultIndex"
+        class="el-menu-vertical-demo lessonManageMenu"
+        background-color="#545c64"
+        text-color="#fff"
+        router
+        active-text-color="#ffd04b"
+      >
+        <template>
+          <el-menu-item v-for="(item, i) in menuList" :key="i" :index="item.path">
+            <img :src="item.imgUrl" class="teachMenu">
+            <span>{{ item.name }}</span>
+          </el-menu-item>
+        </template>
       </el-menu>
-      <div class="lessonManageOther">
-        <router-view />
-      </div>
+      <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
+    </div>
+    <div class="lessonManageOther" :style="{width: rightWidth, height: rightHeight}">
+      <router-view />
     </div>
   </div>
 </template>
@@ -39,9 +29,13 @@ import ClassIcon from '@/assets/teachManage/class.png';
 import LessonIcon from '@/assets/teachManage/lesson.png';
 import ExamIcon from '@/assets/teachManage/exam.png';
 import RuleIcon from '@/assets/teachManage/rule.png';
+import drapLeft from '@/views/components/drapLeft/index';
 
 export default {
     name: 'Organization',
+    components: {
+        drapLeft
+    },
     data() {
         return {
             classIcon: ClassIcon,
@@ -51,51 +45,62 @@ export default {
 
             mapIdList: [],
             lessonList: [],
-            classList: []
-
+            classList: [],
+            widthLeft: 200,
+            defaultIndex: '/teaching/organization/classManage',
+            menuList: [
+                {name: '班级管理', path: '/teaching/organization/classManage', imgUrl: ClassIcon},
+                {name: '实训管理', path: '/teaching/organization/trainingManage', imgUrl: RuleIcon},
+                {name: '理论题目管理', path: '/teaching/organization/theoryManage', imgUrl: LessonIcon},
+                {name: '考试管理', path: '/teaching/organization/examManage', imgUrl: ExamIcon}
+            ]
         };
     },
     computed: {
         companyName() {
             return this.$store.state.user.companyName;
         },
-        hideBack() {
-            return this.$route.query.enter === 'teacher';
+        rightWidth() {
+            return `calc(100% - ${this.widthLeft}px)`;
+        },
+        rightHeight() {
+            return (this.height - 110) + 'px';
+        },
+        height() {
+            return this.$store.state.app.height;
         }
     },
-    created() {
-
+    watch: {
+        '$route'(val) {
+            this.defaultIndex = val.path;
+        }
+    },
+    mounted() {
+        this.defaultIndex = this.$route.path;
     },
-
     methods:{
-        clickMenu(val) {
-            if (val.index === '2-1') {
-                this.$router.replace('/info/organization/lessonManage');
-            } else if (val.index === '2-2') {
-                this.$router.replace('/info/organization/draftLessonManage');
-            } else if (val.index === '1') {
-                this.$router.replace('/info/organization/classManage');
-            } else if (val.index === '3') {
-                this.$router.replace('/info/organization/examManage');
-            } else if (val.index === '4') {
-                this.$router.replace('/info/organization/ruleManage');
-            }
-        },
-        back() {
-            this.$router.go(-1);
+        drapWidth(width) {
+            this.widthLeft = Number(width);
         }
     }
 };
 </script>
 
 <style scoped>
-	.back_box {height: 20px;z-index: 36;width: 40px;text-align: center;position: absolute;right: 20px;top: -20px;}
-	.title_content {width: 100%;margin: 20px 0 30px;text-align: center;font-size: 28px;font-weight: bold;}
   .teachMenu{width: 18px;height: 18px;margin-right: 8px;}
   .lessonIcon{font-size: 16px;}
-  .teachMenuTitle{font-size: 18px;}
-  .lessonManageBack{position: fixed;right: 20px;top: 70px;}
-  .lessonManageOther{width: calc(100% - 200px);margin-left: 200px;}
-  .lessonManageInfo{width: 96%;margin: 0 auto;overflow: hidden;}
-  .lessonManageMenu{width: 200px;float: left;}
+  .lessonManageOther{
+	border: 1px solid #DCDFE6;
+	margin: 10px;
+	padding: 10px;
+	overflow: auto;
+  }
+  .lessonManageMenu{
+	height: 100%;
+  }
+  .mianBox {
+	width: 100%;
+	height: 100%;
+	display: flex;
+  }
 </style>
diff --git a/src/views/organization/ruleManage/index.vue b/src/views/organization/ruleManage/index.vue
index 36b48fce4..987d1dcb7 100644
--- a/src/views/organization/ruleManage/index.vue
+++ b/src/views/organization/ruleManage/index.vue
@@ -2,10 +2,10 @@
   <div style="width: 100%;height: 100%">
     <QueryListPage
       ref="ruleQueryListPage"
+      :card-padding="10"
       :query-form="ruleQueryForm"
       :pager-config="pagerConfig"
       :query-list="ruleQueryList"
-      style="width:96%;margin: 0 auto;"
     />
     <apply-class ref="applyClass" @refresh="refresh" />
   </div>
diff --git a/src/views/organization/trainingDesign/index.vue b/src/views/organization/trainingDesign/index.vue
new file mode 100644
index 000000000..9540813a5
--- /dev/null
+++ b/src/views/organization/trainingDesign/index.vue
@@ -0,0 +1,218 @@
+<template>
+  <div style="width: 100%;height: 100%;">
+    <QueryListPage v-if="showList" ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </div>
+</template>
+<script>
+import {queryMapListByUser} from '@/api/jmap/map';
+import Cookies from 'js-cookie';
+import ConstConfig from '@/scripts/ConstConfig';
+import { deleteTraining } from '@/api/trainingManage';
+import { getTrainingList } from '@/api/trainingManage';
+// getPublishTrainingDetail, loadPublishTraining,
+export default {
+    name:'TrainingManage',
+    data() {
+        return {
+            mapList:[],
+            showList: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '100px',
+                reset: false,
+                initLoadCallback: this.initLoadCallback,
+                queryObject: {
+                    mapId: {
+                        type: 'select',
+                        label: '地图名称',
+                        config: {
+                            noClear:true,
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList:{
+                height: 500,
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('trainingManage.name'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('trainingManage.description'),
+                        prop: 'description'
+                    },
+                    {
+                        title: this.$t('trainingManage.type'),
+                        width: '70',
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.covertData(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('trainingManage.labelJson'),
+                        width: '200',
+                        prop: 'labelJson',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.labelJsonData(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('trainingManage.operate'),
+                        width: '500',
+                        buttons: [
+                            {
+                                name: this.$t('trainingManage.record'),
+                                handleClick: this.drawUp,
+                                type: 'success',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.modify'),
+                                handleClick: this.handleModify,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.delete'),
+                                handleClick: this.deleteScript,
+                                type: 'danger',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.publish'),
+                                handleClick: this.publishScript,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.preview'),
+                                handleClick: this.previewScript,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.gradeRules'),
+                                handleClick: this.gradeRules,
+                                type: 'success',
+                                showControl:(row) => { return row.id; }
+                            },
+                            {
+                                name: this.$t('trainingManage.publishTrack'),
+                                handleClick: this.publishTrack,
+                                type: 'primary',
+                                showControl:(row) => { return row.id; }
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    created() {
+        queryMapListByUser().then(res=>{
+            this.mapList = [];
+            res.data.forEach(element => {
+                this.mapList.push({label:element.name, value:element.id});
+            });
+            this.queryForm.queryObject.mapId.config.data = [...this.mapList];
+            this.queryForm.queryObject.mapId.config.default = this.mapList[0].value;
+            this.showList = true;
+        });
+    },
+    methods: {
+        initLoadCallback(form) {
+            if (!form.trainingType) {
+                form.trainingType = 'training';
+            }
+            if (!form.mapId) {
+                form.mapId = this.mapList[0] ? this.mapList[0].value : '';
+            }
+        },
+        queryFunction(param) {
+            if (param.mapId) {
+                return getTrainingList(param);
+            } else {
+                return new Promise((resolve, reject)=>{
+                    const result = {data:{list:[], total:0, pageNum:0}};
+                    resolve(result);
+                });
+            }
+        },
+        covertData(row) {
+            const releaseReview = ConstConfig.ConstSelect.trainingType;
+            const lastData = Object.assign({}, row);
+            if (Cookies.get('user_lang') == 'en') {
+                releaseReview.forEach(function(element) {
+                    const rolename = element.value;
+                    if (lastData.type == rolename) {
+                        lastData.type = element.enlabel;
+                    }
+                });
+            } else {
+                releaseReview.forEach(function(element) {
+                    const rolename = element.value;
+                    if (lastData.type == rolename) {
+                        lastData.type = element.label;
+                    }
+                });
+            }
+            return lastData.type;
+        },
+        labelJsonData(row) {
+            const sList = row.labelJson ? JSON.parse(row.labelJson) : [];
+            const list = Object.prototype.toString.call(sList) === '[object Array]' ? sList : [sList];
+            return list;
+        },
+        drawUp(index, row) {
+
+        },
+        deleteScript(index, row) {
+            console.log('删除', index, row);
+            this.$confirm('确定删除该条实训数据?', '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                if (!row.id) { return; }
+                deleteTraining([row.id]).then(res => {
+                    console.log('删除实训成功', res);
+                    this.getListData();
+                }).catch(err => {
+                    console.log('删除实训失败', err);
+                    this.getListData();
+                });
+            }).catch(e => {});
+        },
+        handleModify(index, row) {
+            // console.log('修改', index, row);
+            // if (!row.id) { return; }
+            // this.$refs.create.doShow(row);
+        },
+        loadScript(index, data) {
+
+        },
+        publishScript(index, row) {
+
+        },
+        previewScript(index, row) {
+
+        },
+        gradeRules(index, row) {
+
+        },
+        publishTrack(index, row) {
+
+        }
+    }
+};
+</script>
diff --git a/src/views/organization/trainingManage/index.vue b/src/views/organization/trainingManage/index.vue
new file mode 100644
index 000000000..a54b81fb0
--- /dev/null
+++ b/src/views/organization/trainingManage/index.vue
@@ -0,0 +1,240 @@
+<template>
+  <div style="width: 100%;height: 100%;">
+    <QueryListPage v-if="showList" ref="queryListPage" :card-padding="10" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+  </div>
+</template>
+<script>
+import {queryMapListByUser, getPublishMapDetailById, getPublishMapListOnline} from '@/api/jmap/map';
+import Cookies from 'js-cookie';
+import { createSimulation } from '@/api/simulation';
+import ConstConfig from '@/scripts/ConstConfig';
+import { getSessionStorage } from '@/utils/auth';
+import { launchFullscreen } from '@/utils/screen';
+import { getAllPublishTrainingList, getManageTrainingListInOrg, publishTrainingPutOn, publishTrainingPutOff, publishTrainingDelete } from '@/api/jmap/training';
+export default {
+    name:'TrainingManage',
+    data() {
+        return {
+            loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts', 'hlsdrts', 'designhlsdrts', 'teaching', 'designteaching'],
+            mapList:[],
+            showList: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '100px',
+                reset: false,
+                queryObject: {
+                    mapId: {
+                        type: 'select',
+                        label: '地图名称',
+                        config: {
+                            default: '',
+                            data: []
+                        }
+                    },
+                    type: {
+                        type: 'select',
+                        label: '实训类型',
+                        config: {
+                            default: '',
+                            data: [
+                                {label: '单操实训', value: 'single'},
+                                {label: '场景实训', value: 'scene'}
+                            ]
+                        }
+                    }
+                }
+            },
+            queryList:{
+                query: this.queryFunction,
+                selectCheckShow: false,
+                paginationHiden: true,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('trainingManage.name'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('trainingManage.description'),
+                        prop: 'description'
+                    },
+                    {
+                        title:'所属地图',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('trainingManage.type'),
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.covertData(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('trainingManage.labelJson'),
+                        prop: 'labelJson',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getLabelJson(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('trainingManage.operate'),
+                        width: '200',
+                        buttons: [
+                            // {
+                            //     name: '加载',
+                            //     handleClick: this.loadScript,
+                            //     type: 'primary',
+                            //     showControl:(row) => { return row.mapSystem; }
+                            // }
+                            {
+                                name: '上架',
+                                handleClick: this.handlerShelf,
+                                type: 'primary',
+                                showControl: row => row.state !== 1
+                            },
+                            {
+                                name: '下架',
+                                handleClick: this.handlerSoldOut,
+                                type: 'warning',
+                                showControl: row => row.state !== 2
+                            },
+                            {
+                                name: '删除',
+                                handleClick: this.handlerDelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ]
+            }
+        };
+    },
+    computed: {
+        project() {
+            return getSessionStorage('project');
+        }
+    },
+    created() {
+        let api = queryMapListByUser;
+        if (this.hasTeachingDataManage()) {
+            api = getPublishMapListOnline;
+        }
+        api().then(res=>{
+            this.mapList = [];
+            res.data.forEach(element => {
+                this.mapList.push({label:element.name, value:element.id});
+            });
+            this.queryForm.queryObject.mapId.config.data = [...this.mapList];
+            this.queryForm.queryObject.mapId.config.default = this.mapList[0] ? this.mapList[0].value : '';
+            this.showList = true;
+        });
+    },
+    methods: {
+        handlerShelf(index, data) {
+            publishTrainingPutOn({ids: [data.id]}).then(resp=>{
+                this.queryList.reload();
+                this.$message.success('实训上架成功！');
+            }).catch(e => this.$message.error('实训上架失败！'));
+        },
+        handlerSoldOut(index, data) {
+            console.log(data, index);
+            publishTrainingPutOff({ids: [data.id]}).then(resp=>{
+                this.queryList.reload();
+                this.$message.success('实训下架成功！');
+            }).catch(e => this.$message.error('实训下架失败！'));
+        },
+        handlerDelete(index, data) {
+            this.$confirm('此操作将删除此实训, 是否继续?', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                publishTrainingDelete({ids: [data.id]}).then(response => {
+                    this.$message.success('删除实训成功');
+                    this.queryList.reload();
+                }).catch((error) => {
+                    this.$messageBox(`删除实训失败: ${error.message}`);
+                });
+            });
+        },
+        hasTeachingDataManage() {
+            return this.$route.path.includes('/teachingDataManage/');
+        },
+        queryFunction(param) {
+            delete param.pageSize;
+            delete param.pageNum;
+            if (this.hasTeachingDataManage()) {
+                return getAllPublishTrainingList(param);
+            } else {
+                if (!param.type) { delete param.type; }
+                return getManageTrainingListInOrg(param);
+            }
+        },
+        getLabelJson(row) {
+            const label = JSON.parse(row.labelJson || '[]');
+            return label;
+        },
+        covertData(row) {
+            const releaseReview = ConstConfig.ConstSelect.trainingType;
+            const lastData = Object.assign({}, row);
+            if (Cookies.get('user_lang') == 'en') {
+                releaseReview.forEach(function(element) {
+                    const rolename = element.value;
+                    if (lastData.type == rolename) {
+                        lastData.type = element.enlabel;
+                    }
+                });
+            } else {
+                releaseReview.forEach(function(element) {
+                    const rolename = element.value;
+                    if (lastData.type == rolename) {
+                        lastData.type = element.label;
+                    }
+                });
+            }
+            return lastData.type;
+        },
+        loadScript(index, row) {
+            // 子系统： mapSystem 客户端： terminal
+            // row.mapSystem
+            // let memberId = '1';
+            // if (row.playerIdJson) {
+            //     memberId = JSON.parse(row.playerIdJson)[0];
+            // }
+            // const data = {mapId: row.mapId, type:row.mapSystem || 'METRO', itemMap:{DEFAULT_MEMBER:memberId} };
+            // domConfig: Object
+            //     hasExam: false
+            //     hasTraining: false
+            //     singleClient: false
+            //     singleMember: true
+            getPublishMapDetailById(row.mapId).then(res=>{
+                const lindeCode = res.data.lineCode;
+                row.mapSystem && createSimulation(row.mapSystem).then(resp => {
+                    const query = { lineCode:lindeCode, group: resp.data, mapId: row.mapId, project: this.project, trainingId:row.id};
+                    if (this.loadingProjectList.includes(this.project)) {
+                        this.$store.dispatch('app/transitionAnimations');
+                    }
+                    this.$router.push({ path: `/display/demon`, query: query });
+                    launchFullscreen();
+                }).catch(error=>{
+                    if (error.code == 10003) {
+                        this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                    } else {
+                        this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                    }
+                    this.disabled = false;
+                });
+            }).catch(()=>{
+                console.log('获取地图详情失败');
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/package/index.vue b/src/views/package/index.vue
deleted file mode 100644
index b9a9a0f80..000000000
--- a/src/views/package/index.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <div style="height: 100%; overflow: auto;">
-    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <select-role ref="selectRole" @reloadTable="reloadTable" />
-  </div>
-</template>
-
-<script>
-import { listUserPermision } from '@/api/management/author';
-import { superAdmin, admin } from '@/router/index';
-import selectRole from './selectRole/list';
-import LangStorage from '@/utils/lang';
-
-export default {
-    name: 'Author',
-    components: {
-        selectRole
-    },
-    data() {
-        return {
-            param: '',
-            WhetherTypeList: [],
-            // EffectiveTypeList: [],
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                labelWidth: '140px',
-                reset: true,
-                leftSpan: 18,
-                queryObject: {
-                    'canDistribute': {
-                        type: 'select',
-                        label: this.$t('permission.permissionUseType'),
-                        config: {
-                            data: []
-                        }
-                    }
-                }
-            },
-            queryList: {
-                query: this.queryFunction,
-                selectCheckShow: false,
-                indexShow: true,
-                columns: [
-                    {
-                        title: this.$t('permission.permissionName'),
-                        width: '210',
-                        prop: 'permissionName'
-                    },
-                    {
-                        title: this.$t('permission.permissionUseType'),
-                        prop: 'canDistribute',
-                        type: 'tag',
-                        columnValue: (row) => {
-                            const type = LangStorage.getLang() == 'en' ? 'PermissionUseListEn' : 'PermissionUseList';
-                            return this.$ConstSelect.translate(row.canDistribute, type);
-                        },
-                        tagType: (row) => {
-                            switch (row.canDistribute) {
-                            case true: return 'success';
-                            case false: return 'danger';
-                            }
-                        }
-                    },
-                    {
-                        title: this.$t('permission.permissionTotal'),
-                        prop: 'amount'
-                    },
-                    {
-                        title: this.$t('permission.permissionRemains'),
-                        prop: 'remains'
-                    },
-                    {
-                        title: this.$t('permission.startTime'),
-                        prop: 'startTime',
-                        type: 'formatter',
-                        formatter: this.formatterDate
-
-                    },
-                    {
-                        title: this.$t('permission.endTime'),
-                        prop: 'endTime',
-                        type: 'formatter',
-                        formatter: this.formatterDate
-                    },
-                    {
-                        title: this.$t('permission.belonger'),
-                        prop: 'ownerName',
-                        isShow: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0 || this.$store.state.user.roles.indexOf(admin) > 0; }
-                    },
-                    {
-                        type: 'button',
-                        title: this.$t('global.operate'),
-                        width: '300',
-                        hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0 || this.$store.state.user.roles.indexOf(admin) < 0; },
-                        buttons: [
-                            {
-                                name: this.$t('permission.setBelonger'),
-                                handleClick: this.handleRoleVest,
-                                type: ''
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    watch: {
-        '$route.params.mapId': function (val) {
-            this.$refs.queryListPage.refresh(true);
-        }
-    },
-    mounted() {
-        this.loadInitData();
-    },
-    methods: {
-        handleRoleVest(index, row) {
-            this.$refs.selectRole.doShow(row.id);
-        },
-        loadInitData() {
-            this.queryForm.queryObject.canDistribute.config.data = this.$ConstSelect.PermissionUseList;
-        },
-        formatterDate(row, porpInfo) {
-            return row[porpInfo.property] ? row[porpInfo.property] : this.$t('global.perpetual');
-        },
-        queryFunction(params) {
-            if (this.$route.params.mapId) {
-                params.mapId = this.$route.params.mapId;
-            }
-            return listUserPermision(params);
-        },
-        reloadTable() {
-            if (this.queryList && this.queryList.reload) {
-                this.queryList.reload();
-            }
-        }
-    }
-};
-</script>
diff --git a/src/views/permissionManage/create.vue b/src/views/permissionManage/create.vue
new file mode 100644
index 000000000..d28c32c00
--- /dev/null
+++ b/src/views/permissionManage/create.vue
@@ -0,0 +1,211 @@
+<template>
+  <el-dialog v-dialogDrag :title="isEdit ? $t('orderAuthor.modifyPermissions') : $t('orderAuthor.createPermission')" :visible.sync="dialogShow" width="420px" :before-close="handleClose">
+    <div>
+      <el-form ref="form" label-position="right" :model="editModel" label-width="80px" :rules="editRules" size="mini" @submit.native.prevent>
+        <el-form-item :label="$t('orderAuthor.permissionName')" prop="name">
+          <el-input v-model="editModel.name" />
+        </el-form-item>
+        <el-form-item :label="$t('orderAuthor.describtion')">
+          <el-input v-model="editModel.des" />
+        </el-form-item>
+        <el-form-item :label="$t('orderAuthor.permissionType')" prop="permissionType">
+          <el-select v-model="editModel.permissionType" :placeholder="$t('map.pleaseSelect')">
+            <el-option
+              v-for="item in permissionTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="editModel.permissionType === 0" label="项目" prop="projectCode">
+          <el-select v-model="editModel.projectCode" :placeholder="$t('map.pleaseSelect')">
+            <el-option
+              v-for="item in projectList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="editModel.permissionType === 1 || editModel.permissionType === 2" label="线路" prop="mapId">
+          <el-select v-model="editModel.mapId" :placeholder="$t('map.pleaseSelect')" @change="mapIdChange">
+            <el-option
+              v-for="item in mapList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="editModel.permissionType === 2" :label="$t('orderAuthor.ability')" prop="abilityIds">
+          <el-select v-model="editModel.abilityIds" multiple :placeholder="$t('map.pleaseSelect')">
+            <el-option
+              v-for="item in filterAbilityList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogShow = false">{{ $t('map.cancel') }}</el-button>
+      <el-button type="primary" :loading="loading" @click="saveAs">{{ $t('map.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { createPermission, updatePermission } from '@/api/permissionManage';
+
+export default {
+    name: 'MapSaveAs',
+    props: {
+        abilityList: {
+            required:true,
+            type:Array
+        },
+        mapList: {
+            required:true,
+            type:Array
+        },
+        projectList: {
+            required:true,
+            type:Array
+        }
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            isEdit: false,
+            editModel: {
+                name: '',
+                des: '',
+                permissionType: '',
+                projectCode: '',
+                mapId: '',
+                abilityIds: []
+            },
+            editRules: {
+                name: [
+                    { required: true, message: this.$t('rules.enterPermissionName'), trigger: 'blur' }
+                ],
+                permissionType: [
+                    { required: true, message: '请选择权限类型!', trigger: 'blur' }
+                ],
+                projectCode: [
+                    { required: true, message: '请选择项目!', trigger: 'blur' }
+                ],
+                mapId: [
+                    { required: true, message: '请选择线路!', trigger: 'blur' }
+                ],
+                abilityIds: [
+                    { required: true, message: '请选择功能!', trigger: 'blur' },
+                    { validator: this.validateLimit, trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+        mapName() {
+            let name = '';
+            const findObj = this.mapList.find(item => {
+                return item.value == this.editModel.mapId;
+            });
+            if (findObj && this.editModel.mapId) {
+                name = findObj.label;
+            }
+            return name;
+        },
+        filterAbilityList() {
+            return this.abilityList.filter(item => {
+                return item.mapName == this.mapName;
+            });
+        },
+        permissionTypeList() {
+            return this.$ConstSelect.permissionTypeList;
+        }
+    },
+    methods: {
+        mapIdChange() {
+            this.editModel.abilityIds = [];
+        },
+        validateLimit(rule, value, callback) {
+            const num = value.length;
+            if (num >= 1) {
+                callback();
+            } else {
+                callback(new Error('请选择功能!'));
+            }
+        },
+        doShow(data) {
+            if (data) {
+                this.isEdit = true;
+                const abilityIds = [];
+                data.abilityVOList && data.abilityVOList.forEach(item => {
+                    abilityIds.push(item.id);
+                });
+                this.editModel = {
+                    ...data,
+                    mapId: data.mapId ? String(data.mapId) : '',
+                    abilityIds: abilityIds
+                };
+            } else {
+                this.isEdit = false;
+                this.initData();
+            }
+            this.dialogShow = true;
+        },
+        initData() {
+            this.editModel = {
+                name: '',
+                des: '',
+                permissionType: '',
+                projectCode: '',
+                mapId: '',
+                abilityIds: []
+            };
+        },
+        close() {
+            this.initData();
+            this.dialogShow = false;
+        },
+        handleClose() {
+            this.close();
+        },
+        saveAs() {
+            this.$refs['form'].validate((valid) => {
+                if (!valid) { return; }
+                this.loading = true;
+                let apiFn = createPermission;
+                if (this.isEdit) {
+                    apiFn = updatePermission;
+                }
+                const cpData = Object.assign({}, this.editModel);
+                if (this.editModel.permissionType === 0) {
+                    delete cpData.mapId;
+                    cpData.abilityIds = [];
+                } else if (this.editModel.permissionType === 1) {
+                    delete cpData.projectCode;
+                    cpData.abilityIds = [];
+                } else if (this.editModel.permissionType === 2) {
+                    delete cpData.projectCode;
+                }
+                apiFn(cpData).then((res) => {
+                    this.loading = false;
+                    this.$message.success(`${this.isEdit ? '编辑' : '新建'}成功！`);
+                    this.$emit('refresh');
+                    this.close();
+                }).catch((err) => {
+                    console.log('err', err);
+                    this.loading = false;
+                    this.$message.error(`${this.isEdit ? '编辑' : '新建'}失败！，${err.message}`);
+                });
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/permissionManage/index.vue b/src/views/permissionManage/index.vue
new file mode 100644
index 000000000..5dbe519fb
--- /dev/null
+++ b/src/views/permissionManage/index.vue
@@ -0,0 +1,247 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <create ref="create" :ability-list="abilityList" :map-list="mapList" :project-list="projectList" @refresh="reloadTable" />
+  </div>
+</template>
+
+<script>
+import { getPermissionPage } from '@/api/permissionManage';
+import Create from './create';
+import { getAllAbility } from '@/api/functionManage';
+import { queryMapListByUser } from '@/api/jmap/map';
+import { ProjectList } from '@/scripts/ProjectConfig';
+
+export default {
+    name: 'PermissionManage',
+    components: {
+        Create
+    },
+    props: {
+        onlySelect: {
+            type: Boolean,
+            default: false
+        },
+        selectIds: {
+            type: Array,
+            default: () => {
+                return [];
+            }
+        },
+        tableHeight: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            mapList: [],
+            abilityList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                columnNum: 6,
+                labelWidth: '100px',
+                leftSpan: 19,
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        columnNeed: 1,
+                        label: this.$t('orderAuthor.permissionName')
+                    },
+                    des: {
+                        type: 'text',
+                        label: this.$t('orderAuthor.describtion')
+                    },
+                    permissionType: {
+                        type: 'select',
+                        label: this.$t('orderAuthor.permissionType'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    projectCode: {
+                        type: 'select',
+                        label: '项目',
+                        config: {
+                            data: []
+                        }
+                    },
+                    mapId: {
+                        type: 'select',
+                        label: '线路',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                height: '700',
+                columns: [
+                    {
+                        title: this.$t('orderAuthor.permissionName'),
+                        width: '240',
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('orderAuthor.describtion'),
+                        prop: 'des'
+                    },
+                    {
+                        title: this.$t('orderAuthor.permissionType'),
+                        prop: 'permissionType',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.permissionType, 'permissionTypeList'); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: '项目',
+                        prop: 'projectCode',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.projectCode, this.projectList, ['value', 'label']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: '线路',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['value', 'label']); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('orderAuthor.ability'),
+                        prop: 'abilityVOList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getAbilityTags(row); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('orderAuthor.founder'),
+                        width: '160',
+                        prop: 'nickName'
+                    },
+                    {
+                        title: this.$t('orderAuthor.creationTime'),
+                        width: '160',
+                        prop: 'createTime'
+                    },
+                    {
+                        title: this.$t('orderAuthor.updateTime'),
+                        width: '160',
+                        prop: 'updateTime'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '100',
+                        buttons: [
+                            {
+                                name: this.$t('global.edit'),
+                                handleClick: this.handleEdit,
+                                showControl: (row) => { return !this.onlySelect; },
+                                type: ''
+                            },
+                            {
+                                name: '选择',
+                                handleClick: this.handleSelect,
+                                showControl: (row) => { return this.onlySelect; },
+                                isDisabled: this.selectDisabled,
+                                type: ''
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('orderAuthor.createPermission'), handler: this.create, show: !this.onlySelect }
+                ]
+            }
+        };
+    },
+    computed: {
+        projectList() {
+            return ProjectList;
+        }
+    },
+    created() {
+        this.getAllAbility();
+        if (this.tableHeight) {
+            this.queryList.height = this.tableHeight;
+        }
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            this.queryForm.queryObject.permissionType.config.data = this.$ConstSelect.permissionTypeList;
+            this.queryForm.queryObject.projectCode.config.data = ProjectList;
+            // 获取地图
+            queryMapListByUser().then(res => {
+                res.data.forEach(elem => {
+                    const obj = { value: elem.id, label: elem.name };
+                    this.queryForm.queryObject.mapId.config.data.push(obj);
+                    this.mapList.push(obj);
+                });
+            }).catch(error=>{
+                console.error(error, '获取发布地图');
+            });
+        },
+        selectDisabled(index, row) {
+            let s = false;
+            const findObj = this.selectIds.find(item => {
+                return item.permissionId == row.id;
+            });
+            if (findObj) {
+                s = true;
+            }
+            return s;
+        },
+        getAllAbility() {
+            getAllAbility().then(res => {
+                res.data && res.data.forEach(item => {
+                    this.abilityList.push({
+                        mapName: item.mapName,
+                        label: item.name,
+                        value: item.id
+                    });
+                });
+            });
+        },
+        getAbilityTags(row) {
+            let tags = [];
+            if (row.abilityVOList) {
+                row.abilityVOList.forEach(item => {
+                    tags.push(item.abilityName);
+                });
+            } else {
+                tags = '';
+            }
+            return tags;
+        },
+        queryFunction(params) {
+            return getPermissionPage(params);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        handleEdit(index, row) {
+            this.$refs.create.doShow(row);
+        },
+        handleSelect(index, row) {
+            this.$emit('handleSelect', row);
+        },
+        create() {
+            this.$refs.create.doShow();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/pis/index.vue b/src/views/pis/index.vue
index a053b5e3c..f48dda8ab 100644
--- a/src/views/pis/index.vue
+++ b/src/views/pis/index.vue
@@ -177,9 +177,9 @@ export default {
         parking: 0,
         text: '今日天气：晴，最低气温15℃，最高气温22℃，风向风力：东北风3级，空气质量：良好',
       },
-      standPisImgUrl: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/standPis.png`,
-      onboardPisImgUrl: `${this.$store.state.user.resourcesUrl}/PICTURE/2022-08-01/onboardPis.png`,
-      prefix: `${this.$store.state.user.resourcesUrl}/PICTURE/pis/`,
+      standPisImgUrl: `${this.$store.state.user.ossUrl}/PICTURE/2022-08-01/standPis.png`,
+      onboardPisImgUrl: `${this.$store.state.user.ossUrl}/PICTURE/2022-08-01/onboardPis.png`,
+      prefix: `${this.$store.state.user.ossUrl}/PICTURE/pis/`,
     }
   },
   mounted() {
diff --git a/src/views/planSchedule/index.vue b/src/views/planSchedule/index.vue
index 6b4cf9b79..0f800108c 100644
--- a/src/views/planSchedule/index.vue
+++ b/src/views/planSchedule/index.vue
@@ -60,6 +60,9 @@ export default {
                 this.$refs.schedule.setPosition();
             });
         },
+        loadChartPage() {
+            this.$refs.schedule.loadChartPage();
+        },
         dispatchDialog(dialogObj) {
             this.$nextTick(() => {
                 if (this.$refs[dialogObj.name]) {
diff --git a/src/views/planSchedule/titleBar.vue b/src/views/planSchedule/titleBar.vue
index 8a6fda1ec..c4b7887cf 100644
--- a/src/views/planSchedule/titleBar.vue
+++ b/src/views/planSchedule/titleBar.vue
@@ -3,7 +3,7 @@
     <img class="logo" :src="logoImg">
     <span> {{ mapName }} &ensp;</span>
     <span v-if="runPlanName">({{ runPlanName }})</span>
-    <span class="system-close el-icon-close" @click="back" />
+    <!--    <span class="system-close el-icon-close" @click="back" />-->
   </div>
 </template>
 
@@ -35,9 +35,9 @@ export default {
         }
     },
     methods: {
-        back() {
-            this.$emit('back');
-        }
+        // back() {
+        // this.$emit('back');
+        // }
     }
 };
 </script>
@@ -58,7 +58,7 @@ export default {
         background: -moz-linear-gradient(#0055E8, #0099F8);
         background: linear-gradient(#0055E8, #0099F8);
         color: white;
-        font: bold;
+        font-weight: bold;
         font-size: 16px;
 
         .logo {
diff --git a/src/views/publish/examRule/draft/editRule.vue b/src/views/publish/examRule/draft/editRule.vue
index 234e283c2..1bd32eef1 100644
--- a/src/views/publish/examRule/draft/editRule.vue
+++ b/src/views/publish/examRule/draft/editRule.vue
@@ -1,27 +1,59 @@
 <template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogShow" :before-close="handleCancel" :close-on-click-modal="false">
+  <el-dialog
+    v-dialogDrag
+    :title="title"
+    :visible.sync="dialogShow"
+    :before-close="handleCancel"
+    :close-on-click-modal="false"
+  >
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
-      <el-form-item :label="$t('publish.trainingType')" prop="trainingType">
-        <el-select v-model="form.trainingType" :placeholder="$t('publish.selectTypeScope')" style="width:240px;" @change="changeCourse">
-          <el-option v-for="nor in trainingTypeList" :key="nor.value" :label="nor.label" :value="nor.value" :disabled="nor.disabled" />
+      <el-form-item label="试题类型" prop="type">
+        <el-select v-model="form.type" placeholder="请选择试题类型" style="width:240px;" @change="clearSubtype">
+          <el-option
+            v-for="item in types"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('publish.operationType')" prop="operateType">
-        <el-select v-model="form.operateType" clearable :placeholder="$t('publish.selectScope')" @change="changeOperation">
-          <el-option v-for="nor in operationTypeList" :key="nor.value" :label="nor.label" :value="nor.value" :disabled="nor.disabled" />
+      <el-form-item label="规则类型" prop="subtype">
+        <el-select
+          v-model="form.subtype"
+          placeholder="请选择规则类型"
+          style="width:240px;"
+          @change="subTypesChange"
+        >
+          <el-option
+            v-for="item in subtypes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('publish.questionNumbers')" prop="number">
+      <el-form-item label="分类" required>
+        <el-select v-model="form.tags" @change="getQuestionAmount">
+          <el-option
+            v-for="item in labels"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="题目数量" prop="amount">
         <el-input-number
-          v-model="form.number"
-          :precision="0"
+          v-model="form.amount"
           :min="0"
           style="width: calc(100% - 280px); float: left; margin-right: 10px;"
         />
-        <span style="width: 190px; float: left;">{{ $t('publish.allNumberTipOne') }} {{ topicNum }} {{ $t('publish.allNumberTipTwo') }}</span>
+        <span style="width: 190px; float: left;">
+          {{ $t('publish.allNumberTipOne') }} {{ topicNum }} {{ $t('publish.allNumberTipTwo') }}
+        </span>
       </el-form-item>
-      <el-form-item :label="$t('publish.scorePerQuestion')" prop="mark">
-        <el-input-number v-model="form.mark" :precision="0" :min="0" style="width:200px" />
+      <el-form-item :label="$t('publish.scorePerQuestion')" prop="score">
+        <el-input-number v-model="form.score" :precision="0" :min="0" style="width:200px" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -32,144 +64,173 @@
 </template>
 
 <script>
-
+import { getQuestionAmount, queryTagList } from '@/api/management/exam';
 export default {
     name: 'EditRule',
     props: {
-        operationTypeMap: {
-            type: Object,
-            required:true
-        },
-        trainingOperateTypeMap: {
-            type: Object,
-            required:true
-        },
-        trainingTypeNums: {
-            type: Object,
-            required: true
-        },
-        operationTypeNums: {
-            type: Object,
-            required: true
-        },
-        trainingTypeList: {
+        ruleList: {
             type: Array,
-            required: true
+            default() {
+                return [];
+            }
         }
     },
     data() {
-        var number = (rule, value, callback) => {
+        var number = (rule, value, message) => {
             if (!value) {
-                return callback(new Error(this.$t('publish.inputQuestionNumber')));
+                return message(new Error(this.$t('publish.inputQuestionNumber')));
             }
             setTimeout(() => {
                 if (Number(value) == 0) {
-                    callback(new Error(this.$t('publish.inputQuestionNumberError')));
+                    message(new Error(this.$t('publish.inputQuestionNumberError')));
                 } else if (!Number(value)) {
-                    callback(new Error(this.$t('publish.inputValidNumber')));
+                    message(new Error(this.$t('publish.inputValidNumber')));
                 } else if (Number(value) > this.topicNum) {
-                    callback(new Error(this.$t('publish.inputNumberError')));
+                    message(new Error(this.$t('publish.inputNumberError')));
                 } else {
-                    callback();
+                    message();
                 }
             }, 100);
         };
-        var mark = (rule, value, callback) => {
+        var score = (rule, value, message) => {
             if (!value) {
-                return callback(new Error(this.$t('publish.inputScorePerQuestion')));
+                return message(new Error(this.$t('publish.inputScorePerQuestion')));
             } else {
-                callback();
+                message();
             }
         };
+        const tagsValidator = (rule, value, message) => {
+            message();
+        };
         return {
-            title: this.$t('publish.addRules'),
             form: {
-                trainingType: '',
-                operateType: '',
-                number: '',
-                mark: 0
+                id: '',
+                type: '',
+                subtype: '',
+                tags: '',
+                amount: 1,
+                score: 1
             },
+            labels: [],
             topicNum: 0,
+            index: -1,
             dialogShow: false,
-            editOk: false,
             rules: {
-                trainingType: [
-                    { required: true, message: this.$t('publish.selectTestType'), trigger: 'change' }
-                ],
-                number: [
-                    { required: true, validator: number, trigger: 'blur' }
-                ],
-                mark: [
-                    { required: true, validator: mark, trigger: 'blur' }
-                ]
-            },
-            typeList: [],
-            operationTypeList: []
+                type: [{ required: true, message: this.$t('publish.selectTestType'), trigger: 'change' }],
+                subtype: [{ required: true, message: '请选择规则类型', trigger: 'change' }],
+                amount: [{ required: true, validator: number, trigger: 'blur' }],
+                score: [{ required: true, validator: score, trigger: 'blur' }],
+                tags: [{ validator: tagsValidator, trigger: 'blur' }]
+            }
         };
     },
-    mounted() {},
+    computed: {
+        types() {
+            return [{ value: 1, label: '理论题' }, { value: 2, label: '实训题' }];
+        },
+        subtypes() {
+            const data = {
+                '1': [{ value: 1, label: '单选题' }, { value: 2, label: '多选题' }, { value: 3, label: '判断题' }],
+                '2': [{ value: 4, label: '单操实训' }, { value: 5, label: '场景实训' }]
+            };
+            return data[this.form.type];
+        },
+        title() {
+            return this.isEditMode ? this.$t('publish.modifyRules') : this.$t('publish.addRules');
+        }
+    },
     methods: {
         show(detail) {
             this.dialogShow = true;
             this.$nextTick(() => {
                 this.$refs.form.resetFields();
                 if (detail) {
-                    this.title = this.$t('publish.modifyRules');
-                    this.editOk = true;
-                    this.changeCourse(detail.trainingType);
+                    this.isEditMode = true;
+                    this.index = detail.index;
                     this.form = {
-                        trainingType: detail.trainingType,
-                        operateType: detail.operateType,
-                        number: detail.num,
-                        mark: detail.point
+                        type: detail.type,
+                        subtype: detail.subtype,
+                        amount: detail.amount,
+                        score: detail.score,
+                        id: detail.id || '',
+                        tags: detail.tags[0]
                     };
-                    this.changeOperation(detail.operateType);
+                    this.topicNum = detail.topicNum;
                 } else {
-                    this.title = this.$t('publish.addRules');
+                    this.isEditMode = false;
                 }
             });
         },
+        isDuplicated() {
+            const isDuplicated =
+				this.ruleList.length > 0 &&
+				this.ruleList.some(rule => rule.type === this.form.type && rule.subtype === this.form.subtype && rule.tags && this.form.tags && rule.tags.includes(this.form.tags));
+            return isDuplicated;
+        },
+        subTypesChange(val) {
+            const param = {
+                orgId: this.$store.state.user.companyId,
+                groupType: this.form.type,
+                subType: this.form.subtype
+            };
+            this.form.tags = '';
+            queryTagList(param).then(resp => {
+                this.labels = [{ label: '无', value: '' }, ...resp.data.map(item => ({ label: item, value: item }))];
+            });
+            this.getQuestionAmount();
+        },
+        getQuestionAmount(e) {
+            if (!(this.form.type && this.form.subtype)) return;
+            const param = {
+                orgId: this.$store.state.user.companyId,
+                groupType: this.form.type,
+                subType: this.form.subtype
+            };
+            if (this.form.tags !== '') {
+                param.tags = this.form.tags;
+            }
+            getQuestionAmount(param).then(resp => {
+                this.topicNum = resp.data;
+            });
+        },
+        clearSubtype() {
+            this.form.subtype = '';
+            this.form.tags = '';
+            this.labels = [{ label: '无', value: '' }];
+        },
         handleOk() {
-            this.$refs['form'].validate((valid) => {
+            this.$refs['form'].validate(valid => {
                 if (valid) {
-                    this.$emit( this.editOk ? 'editRuleList' : 'addRuleList', this.form);
+                    if (this.ruleList.length > 0 && !this.isEditMode) {
+                        if (this.isDuplicated()) {
+                            this.$message.warning('与已有规则重复, 请重新选择');
+                            return;
+                        }
+                    }
+                    this.$emit('submit', { ...this.form, topicNum: this.topicNum }, this.isEditMode);
                     this.handleCancel();
                 }
             });
         },
         handleCancel() {
-            this.editOk = false;
             this.topicNum = 0;
-            this.operationTypeList = [];
             this.dialogShow = false;
-        },
-        changeCourse(val) {
-            this.operationTypeList = this.operationTypeMap[val];
-            this.topicNum = this.trainingTypeNums[val];
-            this.form.operateType = '';
-        },
-        changeOperation(val) {
-            if (val) {
-                this.topicNum = this.operationTypeNums[this.form.trainingType][val];
-            } else {
-                this.topicNum = this.trainingTypeNums[this.form.trainingType];
-            }
         }
     }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    /deep/ {
-        .el-dialog {
-            width: 600px;
-        }
+/deep/ {
+	.el-dialog {
+		width: 600px;
+	}
 
-        .el-form-item__content {
-            width: calc(100% - 80px);
-        }
+	.el-form-item__content {
+		width: calc(100% - 80px);
+	}
 
-        .el-cascader {
-            width: 100%;
-        }
-    }
+	.el-cascader {
+		width: 100%;
+	}
+}
 </style>
diff --git a/src/views/publish/examRule/draft/examFrom.vue b/src/views/publish/examRule/draft/examFrom.vue
index a1bd6cad4..287145007 100644
--- a/src/views/publish/examRule/draft/examFrom.vue
+++ b/src/views/publish/examRule/draft/examFrom.vue
@@ -1,214 +1,156 @@
 <template>
-  <div class="exam-rule">
-    <el-form ref="form" :model="examData" :rules="rules" label-width="120px" class="demo-form">
-      <el-form-item :label="$t('publish.testName')" prop="name">
-        <el-input v-model="examData.name" :placeholder="$t('publish.inputTestName')" />
-      </el-form-item>
-      <el-form-item label="归属地图" prop="mapId">
-        <el-select v-model="examData.mapId" placeholder="请选择归属地图" :disabled="isEdit">
-          <el-option v-for="map in mapList" :key="map.id" :label="map.name" :value="map.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="工作站类型" prop="prdType">
-        <el-select v-model="examData.prdType" placeholder="请选择工作站类型" :disabled="isEdit">
-          <el-option v-for="prd in prdList" :key="prd.value" :label="prd.label" :value="prd.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('publish.testDuration')" prop="duration">
-        <el-input-number v-model="examData.duration" placeholder="请输入" style="float: left; width: calc(100% - 80px);" :disabled="isEdit" :min="1" />
-        <span style="width:80px; display: block;float: left; text-align: center;">&nbsp;{{ $t('publish.durationMinutes') }}</span>
-      </el-form-item>
-      <el-form-item label="开放时间要求" prop="haveDate">
-        <el-switch v-model="haveDate" />
-      </el-form-item>
-      <el-form-item v-if="haveDate" :label="$t('publish.testDate')">
-        <el-col :span="11">
-          <el-form-item prop="startDate">
-            <el-date-picker
-              v-model="examData.startDate"
-              type="datetime"
-              :placeholder="$t('publish.startTestTime')"
-              style="width: 100%;"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              :default-value="new Date()"
-              :picker-options="pickerOptions"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col class="line" :span="2">-</el-col>
-        <el-col :span="11">
-          <el-form-item prop="endDate">
-            <el-date-picker
-              v-model="examData.endDate"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              :placeholder="$t('publish.endTestTime')"
-              style="width: 100%;"
-            />
-          </el-form-item>
-        </el-col>
-      </el-form-item>
-      <el-form-item :label="$t('publish.fullScore')" prop="fullMark">
-        <el-input-number v-model="examData.fullMark" placeholder="" :disabled="isEdit" :min="1" @change="fullMarkChange" />
-      </el-form-item>
-      <el-form-item :label="$t('publish.passingScore')" prop="passMark">
-        <el-input-number v-model="examData.passMark" placeholder="" :disabled="isEdit" :min="1" />
-      </el-form-item>
-      <el-form-item v-if="!$route.path.includes('info')" :label="$t('publish.whetherToTry')" required>
-        <el-radio-group v-model="trial">
-          <el-radio label="1">{{ $t('publish.trialNo') }}</el-radio>
-          <el-radio label="2">{{ $t('publish.trialYes') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item :label="$t('publish.testDescription')" prop="desc">
-        <el-input v-model="examData.desc" type="textarea" :placeholder="$t('publish.inputTestDescription')" :disabled="isEdit" />
-      </el-form-item>
-    </el-form>
-  </div>
+	<div class="exam-rule">
+		<el-form ref="form" :model="examData" :rules="rules" label-width="120px" class="demo-form">
+			<el-form-item label="关联线路" prop="mapId" required>
+				<el-select v-model="examData.mapId">
+					<el-option
+						v-for="option in mapOptionList"
+						:key="option.value"
+						:label="option.label"
+						:value="option.value"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item :label="$t('publish.testName')" prop="name">
+				<el-input v-model="examData.name" :maxlength="50" :placeholder="$t('publish.inputTestName')" />
+			</el-form-item>
+			<el-form-item label="简介" prop="profile">
+				<el-input v-model="examData.profile" :maxlength="100" placeholder="请输入简介" />
+			</el-form-item>
+			<el-form-item :label="$t('publish.testDuration')" prop="validDuration">
+				<el-input-number
+					v-model="examData.validDuration"
+					placeholder="请输入"
+					style="float: left; width: calc(100% - 80px);"
+					:min="1"
+				/>
+				<span style="width:80px; display: block;float: left; text-align: center;"
+					>&nbsp;{{ $t('publish.durationMinutes') }}</span
+				>
+			</el-form-item>
+			<el-form-item label="开放时间要求" prop="haveDate">
+				<el-switch v-model="haveDate" />
+			</el-form-item>
+			<el-form-item v-if="haveDate" :label="$t('publish.testDate')">
+				<el-col :span="11">
+					<el-form-item prop="startTime">
+						<el-date-picker
+							v-model="examData.startTime"
+							type="datetime"
+							:placeholder="$t('publish.startTestTime')"
+							style="width: 100%;"
+							value-format="yyyy-MM-dd HH:mm:ss"
+							:default-value="new Date()"
+							:picker-options="pickerOptions"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col class="line" :span="2">-</el-col>
+				<el-col :span="11">
+					<el-form-item prop="endTime">
+						<el-date-picker
+							v-model="examData.endTime"
+							value-format="yyyy-MM-dd HH:mm:ss"
+							type="datetime"
+							:placeholder="$t('publish.endTestTime')"
+							style="width: 100%;"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-form-item>
+			<el-form-item :label="$t('publish.fullScore')" prop="fullScore">
+				<el-input-number v-model="examData.fullScore" placeholder="" :min="1" @change="fullScoreChange" />
+			</el-form-item>
+			<el-form-item :label="$t('publish.passingScore')" prop="passScore">
+				<el-input-number v-model="examData.passScore" placeholder="" :min="1" />
+			</el-form-item>
+		</el-form>
+	</div>
 </template>
 
 <script>
-import { updateExamRules } from '@/api/management/exam';
-import { getMapListByProjectCode } from '@/api/jmap/map';
-import { getSessionStorage } from '@/utils/auth';
-import { ProjectCode } from '@/scripts/ProjectConfig';
+import { queryMapListByUser } from '@/api/jmap/map'
 export default {
-    name: 'ExamFrom',
-    props: {
-        examData: {
-            type: Object,
-            default() {
-                return {};
-            }
-        }
-    },
-    data() {
-        var checkEndDate = (rule, value, callback) => {
-            if (this.examData.startDate && value) {
-                const startTime = new Date(this.examData.startDate).getTime();
-                const endTime = new Date(value).getTime();
-                if (startTime > endTime) {
-                    callback(new Error('开始时间必须小于截止时间'));
-                } else {
-                    callback();
-                }
-            } else {
-                callback();
-            }
-        };
-        var checkPassMark = (rule, value, callback) => {
-            if (value > this.examData.fullMark) {
-                callback(new Error('及格分必须小于等于满分'));
-            } else {
-                callback();
-            }
-        };
-        return {
-            pickerOptions: {
-                disabledDate(time) {
-                    return time.getTime() < new Date(new Date().toLocaleDateString()).getTime();
-                }
-            },
-            haveDate: false,
-            mapList: [],
-            prdList: [{ label: 'ATS现地工作站', value: '01' }, { label: 'ATS行调工作站', value: '02' }],
-            trial: '1',
-            options: [],
-            selectDisable: false,
-            rules: {
-                name: [
-                    { required: true, message: this.$t('publish.inputTestName'), trigger: 'blur' }
-                ],
-                prdType: [
-                    { required: true, message: '请选择产品类型', trigger: 'change' }
-                ],
-                mapId: [
-                    { required: true, message: '请选择归属地图', trigger: 'change' }
-                ],
-                duration: [
-                    { required: true, message: this.$t('publish.inputTestDuration'), trigger: 'blur' }
-                ],
-                fullMark: [
-                    { required: true, message: this.$t('publish.inputFullScore'), trigger: 'blur' }
-                ],
-                trial: [
-                    { required: true, message: this.$t('publish.selectWetherTrial'), trigger: 'blur' }
-                ],
-                passMark: [
-                    { required: true, message: this.$t('publish.inputPassingScore'), trigger: 'blur' },
-                    { validator: checkPassMark, trigger: 'blur' }
-                ],
-                endDate: [
-                    { validator: checkEndDate, trigger: 'change' }
-                ]
-            }
-        };
-    },
-    computed: {
-        isEdit() {
-            return this.$route.params.mode == 'edit';
-        }
-    },
-    created() {
-        this.refresh();
-    },
-    mounted() {
-    },
-    methods: {
-        checkedForm(type) {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    this.$emit(type);
-                }
-            });
-        },
-        fullMarkChange() {
-            this.$refs.form.validateField('passMark');
-        },
-        getDate(date) {
-            const now = new Date(date);
-            const y = now.getFullYear();
-            const m = now.getMonth() + 1;
-            const d = now.getDate();
-            return y + '-' + (m < 10 ? '0' + m : m) + '-' + (d < 10 ? '0' + d : d) + ' ' + now.toTimeString().substr(0, 8);
-        },
-        updateForm() {
-            this.$refs['form'].validate(async (valid) => {
-                if (valid) {
-                    const model = {
-                        id: this.$route.params.ruleId,
-                        name: this.examData.name,
-                        endTime: this.examData.endDate,
-                        startTime: this.examData.startDate,
-                        trial: this.trial == 2
-                    };
-                    try {
-                        await updateExamRules(model);
-                        this.$message.success(this.$t('publish.updateExamRuleSuccess'));
-                    } catch (error) {
-                        this.$messageBox(this.$t('publish.updateExamRuleFailed'));
-                    }
-                }
-            });
-        },
-        refresh() {
-            const project = ProjectCode[getSessionStorage('project')];
-            getMapListByProjectCode(project).then(resp => {
-                this.mapList = resp.data;
-            }).catch(e => {
-                this.$message.error('获取地图列表数据异常：' + e.message);
-            });
-        }
-    }
-};
+	name: 'ExamFrom',
+	props: {
+		examData: {
+			type: Object,
+			default() {
+				return {}
+			},
+		},
+	},
+	data() {
+		var checkendTime = (rule, value, message) => {
+			if (this.examData.startTime && value) {
+				const startTime = new Date(this.examData.startTime).getTime()
+				const endTime = new Date(value).getTime()
+				if (startTime > endTime) {
+					message(new Error('开始时间必须小于截止时间'))
+				} else {
+					message()
+				}
+			} else {
+				message()
+			}
+		}
+		var checkPassScore = (rule, value, message) => {
+			if (value > this.examData.fullScore) {
+				message(new Error('及格分必须小于等于满分'))
+			} else {
+				message()
+			}
+		}
+		return {
+			pickerOptions: {
+				disabledDate(time) {
+					return time.getTime() < new Date(new Date().toLocaleDateString()).getTime()
+				},
+			},
+			haveDate: false,
+			mapOptionList: [],
+			selectDisable: false,
+			rules: {
+				mapId: [{ required: true, message: '请选择线路', trigger: 'blur' }],
+				name: [{ required: true, message: this.$t('publish.inputTestName'), trigger: 'blur' }],
+				validDuration: [{ required: true, message: this.$t('publish.inputTestDuration'), trigger: 'blur' }],
+				fullScore: [{ required: true, message: this.$t('publish.inputFullScore'), trigger: 'blur' }],
+				passScore: [
+					{ required: true, message: this.$t('publish.inputPassingScore'), trigger: 'blur' },
+					{ validator: checkPassScore, trigger: 'blur' },
+				],
+				endTime: [{ validator: checkendTime, trigger: 'change' }],
+			},
+		}
+	},
+	computed: {
+		isEdit() {
+			return this.$route.params.mode === 'edit'
+		},
+	},
+	created() {
+		queryMapListByUser().then(resp => {
+			this.mapOptionList = resp.data.map(item => ({ label: item.name, value: Number(item.id) }))
+		})
+	},
+	mounted() {},
+	methods: {
+		checkForm() {
+			return this.$refs['form'].validate()
+		},
+		fullScoreChange() {
+			this.$refs.form.validateField('passScore')
+		},
+	},
+}
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .exam-rule {
-		height: 100%;
-    }
+.exam-rule {
+	height: 100%;
+}
 
-    .line {
-        font-size: 16px;
-        text-align: center;
-    }
+.line {
+	font-size: 16px;
+	text-align: center;
+}
 </style>
diff --git a/src/views/publish/examRule/draft/index.vue b/src/views/publish/examRule/draft/index.vue
index d20741d12..848320b52 100644
--- a/src/views/publish/examRule/draft/index.vue
+++ b/src/views/publish/examRule/draft/index.vue
@@ -1,26 +1,30 @@
 <template>
   <div class="joylink-card">
     <div class="exam-box">
-      <el-steps class="steps" :active="display">
+      <el-steps class="steps" :active="currentStep">
         <el-step :title="$t('publish.testDefinitionMaking')" icon="el-icon-edit" />
         <el-step :title="$t('publish.examRuleMaking')" icon="el-icon-setting" />
       </el-steps>
       <div class="joylink-card forms">
-        <template v-if="display == 1" class="definition">
-          <exam-from ref="exam" :exam-data="examData" @goNextStep="goNextStep" @createQuickly="createQuickly" />
-        </template>
-        <template v-else class="rule">
-          <rule-from ref="rule" :rule-list="ruleList" :exam-data="examData" @regulation="regulation" />
-        </template>
+        <exam-from v-show="currentStep === 1" ref="exam" :exam-data="examData" />
+        <rule-from
+          v-show="currentStep === 2"
+          ref="rule"
+          :is-edit-mode="isEditMode"
+          :rule-list="ruleList"
+          :exam-data="examData"
+        />
       </div>
       <div class="draft">
         <el-button-group>
-          <el-button v-if="isPrevStep" type="primary" @click="prevStep">{{ this.$t('global.lastStep') }}</el-button>
-          <el-button v-if="isNextStep" type="primary" @click="nextStep">{{ this.$t('global.nextStep') }}</el-button>
-          <el-button v-if="isUpdate" type="warning" @click="update">{{ $t('global.update') }}</el-button>
-          <el-button v-if="isCreate" type="primary" @click="create">{{ $t('global.create') }}</el-button>
+          <el-button v-if="showPrevStep" type="primary" @click="prevStep">{{
+            this.$t('global.lastStep')
+          }}</el-button>
+          <el-button v-if="showNextStep" type="primary" @click="nextStep">{{
+            this.$t('global.nextStep')
+          }}</el-button>
+          <el-button v-if="currentStep === 2" type="primary" @click="submit">提交</el-button>
           <el-button type="primary" @click="turnback">{{ $t('global.back') }}</el-button>
-          <el-button v-if="isFastCreate" type="primary" @click="goToCheckForm">快速创建</el-button>
         </el-button-group>
       </div>
     </div>
@@ -30,9 +34,11 @@
 <script>
 import RuleFrom from './rule';
 import ExamFrom from './examFrom';
-import { getExamLessonDetail, createExam } from '@/api/management/exam';
+import { getPaperDetail } from '@/api/management/exam';
 import { UrlConfig } from '@/scripts/ConstDic';
 
+import { createPaper, editPaper } from '@/api/management/exam';
+
 export default {
     name: 'ExamRule',
     components: {
@@ -41,180 +47,155 @@ export default {
     },
     data() {
         return {
-            display: 1,
+            currentStep: 1,
             examData: {
                 name: '',
-                mapId: '',
-                prdType: '',
-                startDate: '',
-                endDate: '',
-                desc: '',
-                type: '',
-                duration: '',
-                fullMark: '',
-                passMark: ''
+                profile: '',
+                startTime: '',
+                endTime: '',
+                validDuration: 30,
+                fullScore: 100,
+                passScore: 60,
+                mapId: ''
             },
             ruleList: []
         };
     },
     computed: {
-        isPrevStep() {
-            return this.display == 2;
+        orgId() {
+            return this.$store.state.user.companyId;
         },
-        isNextStep() {
-            return this.display == 1;
+        showPrevStep() {
+            return this.currentStep == 2;
         },
-        isUpdate() {
+        showNextStep() {
+            return this.currentStep == 1;
+        },
+        isEditMode() {
             return this.$route.params.mode == 'edit';
-        },
-        isCreate() {
-            return this.display == 2 && this.$route.params.mode !== 'edit';
-        },
-        isFastCreate() {
-            return this.display == 1 && this.$route.params.mode != 'edit' && Number(this.$route.params.ruleId);
         }
     },
     created() {
-        if (this.$route.params.ruleId != 0) {
-            getExamLessonDetail(this.$route.params.ruleId).then(res => {
+        if (this.isEditMode) {
+            getPaperDetail(this.$route.params.paperId).then(res => {
                 this.examData = {
+                    mapId: res.data.mapId,
                     name: res.data.name,
-                    mapId: res.data.mapId + '',
-                    prdType: res.data.prdType,
-                    startDate: res.data.startTime,
-                    endDate: res.data.endTime,
-                    desc: res.data.remarks,
-                    type: res.data.type,
-                    duration: Number(res.data.duration) / 60,
-                    fullMark: res.data.fullPoint,
-                    passMark: res.data.passingPoint
+                    profile: res.data.profile,
+                    startTime: res.data.startTime,
+                    endTime: res.data.endTime,
+                    validDuration: Number(res.data.validDuration),
+                    fullScore: res.data.fullScore,
+                    passScore: res.data.passScore
                 };
-                this.ruleList = res.data.examDefinitionRulesVOList;
+                this.ruleList = res.data.ruleList;
                 this.$nextTick(() => {
-                    this.$refs.exam.haveDate = !!this.examData.startDate;
+                    this.$refs.exam.haveDate = !!this.examData.startTime;
                 });
             });
         }
     },
     methods: {
-        regulation() {
-            this.display = 1;
-            this.$nextTick(() => {
-                this.$refs.exam.haveDate = !!this.examData.startDate;
-            });
-        },
-        async createQuickly() {
-            const resp = await getExamLessonDetail(this.$route.params.ruleId);
-            const ruleList = resp.data.examDefinitionRulesVOList;
-            const result = {
-                duration: Number(this.examData.duration) * 60, // 时长
-                examDefinitionRulesVOList: ruleList, // 规则
-                fullPoint: Number(this.examData.fullMark), // 满分
-                mapId: this.examData.mapId, // 课程id
-                prdType: this.examData.prdType,
-                name: this.examData.name, // 名称
-                passingPoint: Number(this.examData.passMark), // 及格分
-                remarks: this.examData.desc, // 考试说明
-                endTime: this.examData.endDate,
-                startTime: this.examData.startDate,
-                type: this.examData.type, // 类型
-                trial: this.examData.trial == 2 // 权限判断
-            };
-            let res = {};
-            try {
-                res = await createExam(result);
-                this.$message.success({ message: res.message });
-                this.$store.dispatch('exam/setRuleList', []); // 清空规则列表数据
-                const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`;
-                this.$router.replace({ path: `${path}`, query: { mapId: this.$route.query.mapId, noPreLogout: this.$route.query.noPreLogout } });
-
-            } catch (error) {
-                if (error) {
-                    this.$messageBox(`${this.$t('publish.saveRuleFailed')} ${error.message}`);
-                } else {
-                    this.$messageBox(`${this.$t('publish.saveRuleFailed')}`);
-                }
-            }
-        },
-        goToCheckForm() {
-            this.$refs.exam.checkedForm('createQuickly');
-        },
         prevStep() {
-            this.$refs.rule.regulation();
-        },
-        goNextStep() {
-            this.display = 2;
+            this.currentStep = 1;
         },
         nextStep() {
-            this.$refs.exam.checkedForm('goNextStep');
+            this.$refs.exam
+                .checkForm()
+                .then(() => {
+                    this.currentStep = 2;
+                })
+                .catch(() => {});
         },
-        update() {
-        	if(this.display === 1) {
-        		this.$refs.exam.updateForm();
-        	} else if (this.display === 2) {
-        		this.$refs.rule.updateOk();
-        	}
-        },
-        create() {
-            this.$refs.rule.creatOk();
+        submit() {
+            const scoreValid = this.$refs.rule.checkTotalScores();
+            if (!scoreValid) {
+                this.$message.warning('规则满分与试题定义不匹配');
+                return;
+            }
+            const examData = { ...this.examData, ...{ orgId: this.orgId } };
+            const ruleData = this.ruleList;
+            const uploadData = { ...examData, ruleList: ruleData };
+            console.log(JSON.stringify(uploadData));
+            const uploadMethodMap = {
+                add: createPaper,
+                edit: editPaper
+            };
+            if (this.isEditMode) {
+                uploadData.id = this.$route.params.paperId;
+            }
+
+            uploadMethodMap[this.$route.params.mode](uploadData).then(resp => {
+                if (resp.code === 200) {
+                    this.$message.success(`${this.isEditMode ? '修改' : '创建'}成功`);
+                    this.turnback();
+                } else {
+                    this.$message.error(resp.message);
+                    console.log(uploadData);
+                    console.log(resp);
+                }
+            });
         },
         turnback() {
             const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`;
             if (this.$route.query.source === 'org') {
                 this.$router.go(-1);
             } else {
-                this.$router.replace({ path: `${path}`, query: { mapId: this.$route.query.mapId, noPreLogout: this.$route.query.noPreLogout} });
+                this.$router.replace({
+                    path: `${path}`,
+                    query: { mapId: this.$route.query.mapId, noPreLogout: this.$route.query.noPreLogout }
+                });
             }
         }
     }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .joylink-card{
-        .card-title{
-            text-align: center;
-            height: 47px;
-            line-height: 47px;
-            border-bottom: 1px solid #e6e6e6;
-            font-weight:bold;
-        }
-    }
-    .card-box{
-        overflow: hidden;
-        height: 100%;
-    }
-    .exam-box {
-        padding-top: 10px;
-        overflow: auto;
+.joylink-card {
+	.card-title {
+		text-align: center;
+		height: 47px;
+		line-height: 47px;
+		border-bottom: 1px solid #e6e6e6;
+		font-weight: bold;
+	}
+}
+.card-box {
+	overflow: hidden;
+	height: 100%;
+}
+.exam-box {
+	padding-top: 10px;
+	overflow: auto;
 
-        /deep/ {
-            .el-step__icon.is-icon {
-                width: 95px;
-            }
-        }
+	/deep/ {
+		.el-step__icon.is-icon {
+			width: 95px;
+		}
+	}
 
-        .steps {
-            width: 980px;
-            margin: 0 auto;
-            padding-top: 5px;
-        }
+	.steps {
+		width: 980px;
+		margin: 0 auto;
+		padding-top: 5px;
+	}
 
-        .forms {
-            width: 800px;
-            margin: 0 auto;
-            margin-top: 20px;
-            padding: 40px;
-        }
-    }
+	.forms {
+		width: 800px;
+		margin: 0 auto;
+		margin-top: 20px;
+		padding: 40px;
+	}
+}
 
-    ::-webkit-scrollbar {
-        width: 10px;
-        height: 10px;
-    }
+::-webkit-scrollbar {
+	width: 10px;
+	height: 10px;
+}
 
-    .draft {
-        width: 500px;
-        text-align: center;
-        margin: 20px auto;
-    }
+.draft {
+	width: 500px;
+	text-align: center;
+	margin: 20px auto;
+}
 </style>
diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue
index d6941fc47..baed9ce55 100644
--- a/src/views/publish/examRule/draft/rule.vue
+++ b/src/views/publish/examRule/draft/rule.vue
@@ -1,60 +1,63 @@
 <template>
   <div class="exam-rule">
-    <span>{{ $t('publish.fullScoreTips') }} {{ examData.fullMark }} {{ $t('publish.scorePoints') }}</span>
+    <span>{{ $t('publish.fullScoreTips') }} {{ examData.fullScore }} {{ $t('publish.scorePoints') }}</span>
     <el-button class="addList" size="small" @click="handleAdd">{{ $t('publish.addRules') }}</el-button>
-    <el-table :data="ruleList" border show-summary style="width: 100%; min-height: 300px;" :summary-method="getSummaries">
-      <el-table-column prop="name" :label="$t('publish.trainingType')">
+    <el-table
+      :data="ruleList"
+      border
+      style="width: 100%; min-height: 300px;"
+      show-summary
+      :summary-method="getSummaries"
+    >
+      <el-table-column prop="type" label="试题类型">
         <template slot-scope="scope">
-          <span>{{ getOperateName(scope.row) }}</span>
+          <span>{{ types[scope.row.type] }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="num" :label="$t('publish.questionsNumber')" width="100">
-      	<template slot-scope="scope">
-           <span>{{ scope.row.num }}</span>
-            <el-tooltip v-if="checkNum(scope.row)" effect="dark" content="题库数量不足" placement="top">
-              <i class="el-icon-warning-outline"></i>
-            </el-tooltip>
+      <el-table-column prop="subtype" label="规则类型">
+        <template slot-scope="scope">
+          <span>{{ subtypes[scope.row.subtype] }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="point" :label="$t('publish.eachScore')" width="100" />
-      <el-table-column :label="$t('publish.totalScore')" width="100">
+      <el-table-column prop="score" :label="$t('publish.eachScore')" width="100" />
+      <el-table-column :label="$t('publish.totalScore')" width="90">
         <template slot-scope="scope">
-          <span>{{ Number(scope.row.num) * Number(scope.row.point) }}</span>
+          <span>{{ Number(scope.row.amount) * Number(scope.row.score) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="amount" label="题目数量" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.amount }}</span>
         </template>
       </el-table-column>
       <el-table-column label="题库题数">
-      	<template slot-scope="scope">
-          <span>{{ getTopicNum(scope.row) }}</span>
+        <template slot-scope="scope">
+          <span>{{ scope.row.topicNum }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分类">
+        <template slot-scope="scope">
+          <template v-if="scope.row.tags">
+            <el-tag v-for="tag in scope.row.tags" :key="tag">{{ tag }}</el-tag>
+          </template>
+          <template v-else>
+            <el-tag>无</el-tag>
+          </template>
         </template>
       </el-table-column>
       <el-table-column :label="$t('global.operate')" width="100">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="handleForm(scope)">{{ $t('global.edit') }}</el-button>
-          <el-button type="text" size="small" @click="deleteForm(scope)">{{ $t('global.delete') }}</el-button>
+          <el-button type="text" size="small" @click="editRow(scope)">{{ $t('global.edit') }}</el-button>
+          <el-button type="text" size="small" @click="deleteRule(scope)">{{ $t('global.delete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <edit-rule
-      ref="addRule"
-      :map-id="examData.mapId"
-      :operation-type-map="operationTypeMap"
-      :training-operate-type-map="trainingOperateTypeMap"
-      :training-type-nums="trainingTypeNums"
-      :operation-type-nums="operationTypeNums"
-      :training-type-list="trainingTypeList"
-      :prd-type="examData.prdType"
-      @addRuleList="addRuleList"
-      @editRuleList="editRuleList"
-    />
+    <edit-rule ref="addRule" :rule-list="ruleList" @submit="handleRuleSubmit" />
   </div>
 </template>
 
 <script>
-import { createExam, updateExamRule } from '@/api/management/exam';
-import { UrlConfig, getOperateTypeMap } from '@/scripts/ConstDic';
 import editRule from './editRule';
-import ConstConfig from '@/scripts/ConstConfig';
-import { getTrainingTypeAndNumByMapIdAndPrdType } from '@/api/jmap/training';
 
 export default {
     name: 'Rule',
@@ -71,217 +74,62 @@ export default {
             default() {
                 return [];
             }
+        },
+        isEditMode: {
+            type: Boolean
         }
     },
     data() {
         return {
-            typeList: [],
+            currentTotalScore: 0,
             operationTypeMap: {},
             trainingOperateTypeMap: {},
-            trainingTypeNums:{}, // 实训类型的实训数量
+            trainingTypeNums: {}, // 实训类型的实训数量
             operationTypeNums: {}, // 操作类型实训数量
             trainingTypeList: [] // 实训类型列表
         };
     },
     computed: {
+        types() {
+            return ['', '理论题', '实训题'];
+        },
+        subtypes() {
+            return ['', '单选题', '多选题', '判断题', '单操实训', '场景实训'];
+        }
     },
-    watch: {
-    },
-    async created() {
-        getTrainingTypeAndNumByMapIdAndPrdType({ mapId: this.examData.mapId, prdType: this.examData.prdType }).then(res => {
-            const list = [];
-            this.trainingTypeNums = {};
-            const operateTypeMap = {};
-            this.operationTypeNums = res.data;
-            let val;
-            for (val in ConstConfig.ConstSelect.trainingDeviceType) {
-                if (res.data[val]) {
-                    list.push({ value: val, label:  ConstConfig.ConstSelect.trainingDeviceType[val].label, disabled: false});
-                    this.trainingTypeNums[val] = 0;
-                    const operateLabelMap = getOperateTypeMap(val);
-                    operateTypeMap[val] = [];
-                    let item;
-                    for (item in res.data[val]) {
-                        this.trainingTypeNums[val] += res.data[val][item];
-                        operateTypeMap[val].push({ value: item, label:operateLabelMap[item], disabled: false });
-                    }
-                }
-            }
-            this.trainingTypeList = list;
-            this.operationTypeMap = operateTypeMap;
-        }).catch(() => {
-            this.$messageBox(this.$t('publish.refreshFailed'));
-        });
-    },
+    created() {},
     methods: {
         handleAdd() {
-            this.changeCourseDisable();
             this.$refs.addRule.show();
         },
-        async creatOk() {
-            if (this.ruleList.length) {
-                let flag = 0;
-                this.ruleList.forEach(rule => {
-                    flag = flag + (Number(rule.num) * Number(rule.point));
-                });
-                if (flag == this.examData.fullMark) {
-                    const result = {
-                        duration: Number(this.examData.duration) * 60, // 时长
-                        examDefinitionRulesVOList: this.ruleList, // 规则
-                        fullPoint: Number(this.examData.fullMark), // 满分
-                        mapId: this.examData.mapId,
-                        prdType: this.examData.prdType,
-                        name: this.examData.name, // 名称
-                        passingPoint: Number(this.examData.passMark), // 及格分
-                        remarks: this.examData.desc, // 考试说明
-                        endTime: this.examData.endDate,
-                        startTime: this.examData.startDate,
-                        type: this.examData.type, // 类型
-                        trial: this.examData.trial == 2 // 权限判断
-                    };
-                    await this.save(result);
-                } else {
-                    this.$messageBox(this.$t('publish.addExamRluesError'));
-                }
-            } else {
-                this.$messageBox(this.$t('publish.addExamRules'));
-            }
-        },
-        async updateOk() {
-        	if (this.ruleList.length) {
-                let flag = 0;
-                this.ruleList.forEach(rule => {
-                    flag = flag + (Number(rule.num) * Number(rule.point));
-                });
-                if (flag == this.examData.fullMark) {
-                    const result = {
-                    	id: this.$route.params.ruleId,
-                        duration: Number(this.examData.duration) * 60, // 时长
-                        examDefinitionRulesVOList: this.ruleList, // 规则
-                        fullPoint: Number(this.examData.fullMark), // 满分
-                        mapId: this.examData.mapId,
-                        prdType: this.examData.prdType,
-                        name: this.examData.name, // 名称
-                        passingPoint: Number(this.examData.passMark), // 及格分
-                        remarks: this.examData.desc, // 考试说明
-                        endTime: this.examData.endDate,
-                        startTime: this.examData.startDate,
-                        type: this.examData.type, // 类型
-                        trial: this.examData.trial == 2 // 权限判断
-                    };
-                    await this.update(result);
-                } else {
-                    this.$messageBox(this.$t('publish.addExamRluesError'));
-                }
-            } else {
-                this.$messageBox(this.$t('publish.addExamRules'));
-            }
-        },
-        async save(data) {
-            try {
-                const res = await createExam(data);
-                this.$message.success({ message: res.message });
-                this.$store.dispatch('exam/setRuleList', []); // 清空规则列表数据
-                const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`;
-                if (this.$route.query.source === 'org') {
-                    this.$router.go(-1);
-                } else {
-                    this.$router.replace({ path: `${path}`, query: { mapId: this.$route.query.mapId, noPreLogout: this.$route.query.noPreLogout} });
-                }
-            } catch (error) {
-                this.$messageBox(`${this.$t('publish.saveRuleFailed')} ${error.message}`);
-            }
-        },
-        async update(data) {
-            try {
-            	const res = await updateExamRule(data);
-            	this.$message.success({ message: res.message });
-            	this.$store.dispatch('exam/setRuleList', []); // 清空规则列表数据
-            	const path = `${this.$route.path.match(/(\/.*)\/examRule/)[1]}${UrlConfig.examRuleManage}`;
-            	if (this.$route.query.source === 'org') {
-            		this.$router.go(-1);
-            	} else {
-            		this.$router.replace({ path: `${path}`, query: { mapId: this.$route.query.mapId, noPreLogout: this.$route.query.noPreLogout} });
-            	}
-            } catch (error) {
-            	this.$messageBox(`${this.$t('publish.saveRuleFailed')} ${error.message}`);
-            }
-        },
-        addRuleList(data) {
-            const element = {
-                trainingType: data.trainingType,
-                operateType: data.operateType,
-                num: Number(data.number),
-                point: Number(data.mark)
+        handleRuleSubmit(formData, isEdit) {
+            const data = {
+                type: formData.type,
+                subtype: formData.subtype,
+                amount: formData.amount,
+                score: formData.score,
+                topicNum: formData.topicNum,
+                tags: [formData.tags]
             };
-            this.ruleList.push(element);
+            if (isEdit) {
+                this.$set(this.ruleList, this.editingIndex, data);
+            } else {
+                this.ruleList.push(data);
+            }
         },
-        deleteForm(data) {
+        deleteRule(data) {
             const index = data.$index;
             this.ruleList.splice(index, 1);
         },
-        editRuleList(data) {
-            const element = {
-                trainingType: data.trainingType,
-                operateType: data.operateType,
-                num: Number(data.number),
-                point: Number(data.mark)
-            };
-            this.$set(this.ruleList, this.indexCourse, element);
+
+        checkTotalScores() {
+            return this.currentTotalScore === this.examData.fullScore;
         },
-        // 判断类型是否选择过
-        changeCourseDisable() {
-            this.trainingTypeList.forEach(item => { item.disabled = false; });
-            for (const val in this.operationTypeMap) {
-                this.operationTypeMap[val].forEach( item => { item.disabled = false; });
-            }
-            this.ruleList.forEach(ele => {
-                this.trainingTypeList.forEach(item => {
-                    if (ele.trainingType == item.value && !ele.operateType) {
-                        item.disabled = true;
-                    }
-                });
-                (this.operationTypeMap[ele.trainingType] || []).forEach(item => {
-                    if (ele.operateType && ele.operateType == item.value) {
-                        item.disabled = true;
-                    }
-                });
-            });
-        },
-        getOperateName(row) {
-            const trainingName = ConstConfig.ConstSelect.trainingDeviceType[row.trainingType].label;
-            if (row.operateType) {
-                const operateName = getOperateTypeMap(row.trainingType)[row.operateType];
-                return `${trainingName}-${operateName}`;
-            } else {
-                return trainingName;
-            }
-        },
-        getTopicNum(row) {
-			//this.operationTypeNums
-			//console.log(row, this.operationTypeNums);
-			return this.operationTypeNums[row.trainingType] ?  (this.operationTypeNums[row.trainingType][row.operateType]||0): 0;
-        },
-        checkNum(row) {
-        	if(!this.operationTypeNums[row.trainingType]) {
-        		return true;
-        	} else if(!this.operationTypeNums[row.trainingType][row.operateType]){
-        		return true;
-        	} else if(row.num > this.operationTypeNums[row.trainingType][row.operateType]) {
-        		return true;
-        	} else {
-        		return false;
-        	}
-        },
-        handleForm(data) {
-        	this.changeCourseDisable();
-            this.indexCourse = data.$index;
+        editRow(data) {
+            this.editingIndex = data.$index;
             const list = JSON.stringify(data.row);
             const detail = JSON.parse(list);
-            this.$refs.addRule.show(detail);
-        },
-        regulation() {
-            this.$emit('regulation', this.course);
+            this.$refs.addRule.show({ ...detail, index: data.$index });
         },
         getSummaries({ columns, data }) {
             const sums = [];
@@ -289,9 +137,9 @@ export default {
                 if (index === 0) {
                     sums[index] = '合计';
                     return;
-                } else if (index === 1) {
-                    const values = data.map(item => Number(item.num));
-                    sums[1] = values.reduce((prev, curr) => {
+                } else if (index === 2) {
+                    const values = data.map(item => Number(item.amount));
+                    sums[2] = values.reduce((prev, curr) => {
                         const value = Number(curr);
                         if (!isNaN(value)) {
                             return prev + curr;
@@ -299,16 +147,16 @@ export default {
                             return prev;
                         }
                     }, 0);
-                } else if ( index === 3) {
-                    const values = data.map(item => Number(item.num) * Number(item.point));
-                    sums[3] = values.reduce((prev, curr) => {
+                } else if (index === 3) {
+                    const values = data.map(item => Number(item.amount) * Number(item.score));
+                    this.currentTotalScore = sums[3] = values.reduce((prev, curr) => {
                         const value = Number(curr);
                         if (!isNaN(value)) {
                             return prev + curr;
                         } else {
                             return prev;
                         }
-                    }, 0) + '分';
+                    }, 0);
                 }
             });
             return sums;
@@ -317,26 +165,26 @@ export default {
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
-    .exam-rule {
-        .addList {
-            float: right;
-            font-size: 14px;
-            color: #000;
-            margin-bottom: 8px;
-            cursor: pointer;
-        }
+.exam-rule {
+	.addList {
+		float: right;
+		font-size: 14px;
+		color: #000;
+		margin-bottom: 8px;
+		cursor: pointer;
+	}
 
-        .btn-footer {
-            width: 100%;
-            display: flex;
-            justify-content: center;
-            margin-top: 20px;
-        }
+	.btn-footer {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20px;
+	}
 
-        /deep/ .el-table__footer-wrapper {
-            .is-leaf:nth-child(3) {
-                font-size: 0;
-            }
-        }
-    }
+	/deep/ .el-table__footer-wrapper {
+		.is-leaf:nth-child(3) {
+			font-size: 0;
+		}
+	}
+}
 </style>
diff --git a/src/views/publish/publishIBP/index.vue b/src/views/publish/publishIBP/index.vue
index 2c8cea038..328740024 100644
--- a/src/views/publish/publishIBP/index.vue
+++ b/src/views/publish/publishIBP/index.vue
@@ -20,14 +20,14 @@ export default {
                 labelWidth: '80px',
                 reset: true,
                 queryObject: {
-                    mapId: {
-                        type: 'select',
-                        label: '地图名称',
-                        config: {
-                            data: []
-                        },
-                        selectChange:this.changeMap
-                    },
+                    // mapId: {
+                    //     type: 'select',
+                    //     label: '地图名称',
+                    //     config: {
+                    //         data: []
+                    //     },
+                    //     selectChange:this.changeMap
+                    // },
                     stationCode: {
                         type: 'select',
                         label: '车站名称',
@@ -40,7 +40,7 @@ export default {
 
             },
             queryList: {
-                query: getIbpList,
+                query: this.getIbpDataFunction,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -76,6 +76,9 @@ export default {
                             }
                         ]
                     }
+                ],
+                actions: [
+                    { text: '返回', handler: this.goBack }
                 ]
             }
         };
@@ -89,32 +92,53 @@ export default {
         this.loadInitData();
     },
     methods:{
-        async loadInitData() {
-            const res = await getPublishMapListOnline();
-            res.data.forEach(elem=>{
-                this.queryForm.queryObject.mapId.config.data.push({label:elem.name, value:elem.id});
-                this.mapListMap[elem.id] = elem.name;
+        loadInitData() {
+            getPublishMapListOnline().then(resp => {
+                resp.data.forEach(elem => {
+                    this.mapListMap[elem.id] = elem.name;
+                });
+            }).catch(() => {
+                this.$message.error('获取地图列表失败！');
             });
+            getStationList(this.$route.query.mapId).then(res=>{
+                this.queryForm.queryObject.stationCode.config.data = [];
+                if (res.code == 200) {
+                    res.data.forEach(station => {
+                        const param = {
+                            label: station.name,
+                            value: station.code
+                        };
+                        this.queryForm.queryObject.stationCode.config.data.push(param);
+                    });
+                }
+            });
+        },
+        goBack() {
+            this.$router.go(-1);
+        },
+        getIbpDataFunction(params) {
+            params.mapId = this.$route.query.mapId;
+            return getIbpList(params);
         },
         covertMap(row) {
             return this.mapListMap[row.mapId];
         },
-        changeMap(form) {
-            if (form.mapId) {
-                getStationList(form.mapId).then(res=>{
-                    this.queryForm.queryObject.stationCode.config.data = [];
-                    if (res.code == 200) {
-                        res.data.forEach(station => {
-                            const param = {
-                                label: station.name,
-                                value: station.code
-                            };
-                            this.queryForm.queryObject.stationCode.config.data.push(param);
-                        });
-                    }
-                });
-            }
-        },
+        // changeMap(form) {
+        //     if (form.mapId) {
+        //         getStationList(form.mapId).then(res=>{
+        //             this.queryForm.queryObject.stationCode.config.data = [];
+        //             if (res.code == 200) {
+        //                 res.data.forEach(station => {
+        //                     const param = {
+        //                         label: station.name,
+        //                         value: station.code
+        //                     };
+        //                     this.queryForm.queryObject.stationCode.config.data.push(param);
+        //                 });
+        //             }
+        //         });
+        //     }
+        // },
         handleDelete(index, row) {
             this.$confirm('此操作将删除ibp盘数据，是否继续?', this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
diff --git a/src/views/publish/publishISCS/index.vue b/src/views/publish/publishISCS/index.vue
index 7eb19b43b..33ecc490c 100644
--- a/src/views/publish/publishISCS/index.vue
+++ b/src/views/publish/publishISCS/index.vue
@@ -37,19 +37,20 @@ export default {
             queryForm: {
                 labelWidth: '80px',
                 reset: true,
-                queryObject: {
-                    mapId: {
-                        type: 'select',
-                        label: '地图名称',
-                        config: {
-                            data: []
-                        }
-                    }
-                }
-
+                textAlign: 'right',
+                leftSpan: 0
+                // queryObject: {
+                // mapId: {
+                //     type: 'select',
+                //     label: '地图名称',
+                //     config: {
+                //         data: []
+                //     }
+                // }
+                // }
             },
             queryList: {
-                query: getIscsDataByPage,
+                query: this.getIscsDataFunction,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -91,7 +92,8 @@ export default {
                     }
                 ],
                 actions: [
-                    { text: '复制', btnCode: 'copy', handler: this.handleCopy }
+                    { text: '复制', btnCode: 'copy', handler: this.handleCopy },
+                    { text: '返回', handler: this.goBack }
                 ]
             }
         };
@@ -114,11 +116,15 @@ export default {
         this.loadInitData();
     },
     methods:{
+        getIscsDataFunction(params) {
+            params.mapId = this.$route.query.mapId;
+            return getIscsDataByPage(params);
+        },
         async loadInitData() {
             const res = await getPublishMapListOnline();
             res.data.forEach(elem=>{
                 this.mapList.push({label:elem.name, value:parseInt(elem.id)});
-                this.queryForm.queryObject.mapId.config.data.push({label:elem.name, value:elem.id});
+                // this.queryForm.queryObject.mapId.config.data.push({label:elem.name, value:elem.id});
                 this.mapListMap[elem.id] = elem.name;
             });
         },
@@ -156,6 +162,9 @@ export default {
             });
 
         },
+        goBack() {
+            this.$router.go(-1);
+        },
         doSave() {
             this.$refs.dataform.validateForm(() => {
                 this.loading = true;
diff --git a/src/views/publish/publishMap/chooseTraining.vue b/src/views/publish/publishMap/chooseTraining.vue
new file mode 100644
index 000000000..f2f434c26
--- /dev/null
+++ b/src/views/publish/publishMap/chooseTraining.vue
@@ -0,0 +1,258 @@
+<template>
+  <el-dialog width="80%" :title="innerTitle" :visible.sync="innerVisible" center append-to-body>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" style="width: 98%;margin-left:1%;margin-top:20px;" />
+  </el-dialog>
+</template>
+
+<script>
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+import { pageQueryTrainingNew } from '@/api/jmap/training';
+import { getPublishMapListOnline } from '@/api/jmap/map';
+import { getCmdList } from '@/api/management/dictionary';
+import { getTrainingOperateTypeMap } from '@/scripts/ConstDic';
+
+export default {
+    name: 'TrainingGeneration',
+    components: {
+    },
+    data() {
+        return {
+            innerVisible: false,
+            innerTitle: '实训选择',
+            mapIdList: [],
+            trainingTypeList: [],
+            trainingOperateTypeMap: {
+                Switch: [],
+                Section: [],
+                Signal: [],
+                Stand: [],
+                Station: [],
+                ControlConvertMenu: [],
+                LimitControl: [],
+                TrainWindow: []
+            },
+            trainingTypeMap: {},
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                initLoadCallback: this.initForm,
+                queryObject: {
+                    prdType: {
+                        type: 'select',
+                        label: this.$t('lesson.prdType'),
+                        change: this.prdChoose,
+                        config: {
+                            data: []
+                        }
+                    },
+                    type: {
+                        type: 'select',
+                        label: this.$t('lesson.trainingType'),
+                        change: this.typeChoose,
+                        config: {
+                            data: []
+                        }
+                    },
+                    operateType: {
+                        type: 'select',
+                        label: this.$t('lesson.operationType'),
+                        config: {
+                            data: []
+                        }
+                    },
+                    name: {
+                        type: 'text',
+                        label: this.$t('lesson.trainingName')
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('lesson.trainingName'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('lesson.prdType'),
+                        prop: 'prdType',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.prdType, this.prdTypeList, ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('lesson.trainingType'),
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.type, this.trainingTypeList, ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('lesson.operationType'),
+                        prop: 'operateType',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.operateType, this.trainingOperateTypeMap[row.type], ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('lesson.minDuration'),
+                        prop: 'minDuration'
+                    },
+                    {
+                        title: this.$t('lesson.maxDuration'),
+                        prop: 'maxDuration'
+                    },
+                    {
+                        title: this.$t('lesson.remarks'),
+                        prop: 'remarks'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '250',
+                        buttons: [
+                            {
+                                name: '选中',
+                                handleClick: this.chooseTraining,
+                                type: ''
+                            }
+                        ]
+                    }
+                ],
+                actions: []
+            },
+
+            currentModel: {}
+        };
+    },
+    computed:{
+        prdTypeList() {
+            const productTypeList = ConstConfig.ConstSelect.prdType;
+            return Cookies.get('user_lang') == 'en'
+                ? productTypeList.map(elem => { return { value: elem.value, label: elem.enlabel }; })
+                : productTypeList.map(elem => { return { value: elem.value, label: elem.label }; });
+        }
+    },
+    async created() {
+        await this.loadInitData();
+        this.typeChoose();
+    },
+    mounted() {
+    },
+    beforeDestroy() {
+    },
+    methods: {
+        doShow() {
+            this.innerVisible = true;
+        },
+        async loadInitData() {
+            this.mapIdList = [];
+            this.queryForm.queryObject.prdType.config.data = [];
+            getPublishMapListOnline().then(response => {
+                this.mapIdList = response.data;
+            });
+            this.queryForm.queryObject.prdType.config.data = this.prdTypeList;
+            this.trainingOperateTypeMap = getTrainingOperateTypeMap();
+        },
+        chooseTraining(index, row) {
+            this.$emit('choose', row);
+            this.innerVisible = false;
+        },
+        async initForm(form) {
+            if (form) {
+                await this.prdChoose(form, false);
+                await this.typeChoose(form, false);
+            }
+        },
+        async prdChoose(form, isClean = true) {
+            console.log('-------------');
+            this.trainingTypeMap = {};
+            const lineCode = this.$route.query.lineCode;
+            const res = await getCmdList(lineCode, {prdType:form.prdType});
+            const trainingOperateList = [];
+            const trainingOperateConfigList = [];
+            const operateTypeMap = {
+                Switch: [],
+                Section: [],
+                Signal: [],
+                Stand: [],
+                Station: [],
+                ControlConvertMenu: [],
+                LimitControl: [],
+                TrainWindow: [],
+                Driver: []
+            };
+
+            if (isClean) {
+                form.type = '';
+                form.operateType = '';
+            }
+            this.queryForm.queryObject.type.config.data = [];
+            this.queryForm.queryObject.operateType.config.data = [];
+
+            if (res && res.code === 200) {
+                res.data.forEach(item => {
+                    if (this.trainingOperateTypeMap[item.operateObject]) {
+                        this.trainingOperateTypeMap[item.operateObject].forEach(ele => {
+                            if (ele.value == item.operate && !this.checkIncludes(operateTypeMap[item.operateObject], ele)) {
+                                operateTypeMap[item.operateObject].push(ele);
+                            }
+                        });
+                    }
+                    if (!trainingOperateList.includes(item.operateObject)) {
+                        trainingOperateList.push(item.operateObject);
+                        const objectLabel = ConstConfig.ConstSelect.trainingDeviceType[item.operateObject] || {};
+                        trainingOperateConfigList.push({value: item.operateObject, label: Cookies.get('user_lang') == 'en' ? objectLabel.enlabel : objectLabel.label});
+                    }
+                });
+                this.queryForm.queryObject.type.config.data = trainingOperateConfigList;
+
+                this.trainingTypeList = trainingOperateConfigList;
+                this.trainingTypeMap = operateTypeMap;
+            } else {
+                this.$message.error(this.$t('error.failedToObtainTrainingType'));
+            }
+        },
+        async typeChoose(form, isClean = true) {
+            this.queryForm.queryObject.operateType.config.data = [];
+            if (isClean && form) {
+                form.operateType = '';
+            }
+            if (form && form.type && this.trainingTypeMap[form.type]) {
+                this.trainingTypeMap[form.type].forEach(elem => {
+                    this.queryForm.queryObject.operateType.config.data.push({ value: elem.value, label: elem.label });
+                });
+            }
+        },
+        checkIncludes(list, obj) {
+            let flag = false;
+            list.forEach(item => {
+                if (item.value === obj.value) {
+                    flag = true;
+                }
+            });
+            return flag;
+        },
+        reloadTable() {
+            this.queryList.reload();
+        },
+        queryFunction(params) {
+            params['mapId'] = this.$route.query.mapId;
+            return pageQueryTrainingNew(params);
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.draft {
+	width: 400px;
+	text-align: center;
+	margin: 20px auto;
+}
+</style>
diff --git a/src/views/publish/publishMap/copy.vue b/src/views/publish/publishMap/copy.vue
index 22a4987fd..cec4a4626 100644
--- a/src/views/publish/publishMap/copy.vue
+++ b/src/views/publish/publishMap/copy.vue
@@ -1,6 +1,56 @@
 <template>
   <el-dialog v-dialogDrag :title="this.$t('publish.copyMapAs')" :visible.sync="dialogVisible" width="30%" center>
-    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
+      <el-form-item label="地图名称：" prop="name">
+        <el-input v-model="formModel.name" />
+      </el-form-item>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="地图数据：" prop="mapData">
+            <el-checkbox v-model="formModel.mapData" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="运行图数据：" prop="runPlan">
+            <el-checkbox v-model="formModel.runPlan" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="3d数据：" prop="map3dData">
+            <el-checkbox v-model="formModel.map3dData" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="ibp数据：" prop="ibp">
+            <el-checkbox v-model="formModel.ibp" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="iscs数据：" prop="iscs">
+            <el-checkbox v-model="formModel.iscs" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="线路配置:" prop="realLineConfig">
+            <el-checkbox v-model="formModel.realLineConfig" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="子系统数据：" prop="mapSystem">
+            <el-checkbox v-model="formModel.mapSystem" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="实训数据：" prop="training">
+            <el-checkbox v-model="formModel.training" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
       <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
@@ -17,23 +67,20 @@ export default {
             dialogVisible: false,
             formModel: {
                 name: '',
-                copyOtherData: false
+                mapData: false,
+                runPlan: false,
+                map3dData: false,
+                ibp: false,
+                iscs: false,
+                realLineConfig: false,
+                mapSystem: false,
+                training: false
             },
             loading: false,
             mapId: '',
-            form:{
-                labelWidth: '100px',
-                items: [
-                    { prop: 'name', label: this.$t('publish.mapName'), type: 'text', required: true},
-                    { prop: 'copyOtherData', label: this.$t('publish.whetherToCopyData'), type: 'switch', required: true}
-                ]
-            },
             rules: {
                 name: [
                     { required: true, message: this.$t('rules.pleaseEnterMapName'), trigger: 'blur' }
-                ],
-                copyOtherData: [
-                    { required: true, message: this.$t('global.choose'), trigger: 'change' }
                 ]
             }
         };
@@ -51,7 +98,20 @@ export default {
                 return;
             }
             this.loading = true;
-            copyMapAs(this.mapId, this.formModel).then(resp =>{
+            const data = {
+                name: this.formModel.name,
+                copyDataConfig: {
+                    mapData: this.formModel.mapData,
+                    runPlan: this.formModel.runPlan,
+                    map3dData: this.formModel.map3dData,
+                    ibp: this.formModel.ibp,
+                    iscs: this.formModel.iscs,
+                    realLineConfig: this.formModel.realLineConfig,
+                    mapSystem: this.formModel.mapSystem,
+                    training: this.formModel.training
+                }
+            };
+            copyMapAs(this.mapId, data).then(resp =>{
                 this.$message.success(this.$t('tip.copyMapSuccess'));
                 this.loading = false;
                 this.dialogVisible = false;
diff --git a/src/views/publish/publishMap/editSubsystem.vue b/src/views/publish/publishMap/editSubsystem.vue
new file mode 100644
index 000000000..7e941c0fc
--- /dev/null
+++ b/src/views/publish/publishMap/editSubsystem.vue
@@ -0,0 +1,429 @@
+<template>
+  <el-dialog
+    :title="title"
+    :before-close="close"
+    :visible.sync="visible"
+    center
+    fullscreen
+  >
+    <div style="padding: 0 150px">
+      <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="120px" size="small">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="线路功能名称：" prop="name">
+              <el-input v-model="ruleForm.name" style="width: 200px;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="系统：" prop="type">
+              <el-select v-model="ruleForm.type" placeholder="请选择类型" @change="typeChange">
+                <el-option label="地铁CBTC" value="METRO" />
+                <el-option label="大铁CTC" value="RAILWAY" />
+                <el-option label="应急调度" value="EMERGENCY" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="描述：" prop="desc">
+          <el-input
+            v-model="ruleForm.desc"
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <el-card style="padding: 10px;">
+          <el-table
+            :data="endTableData"
+            border
+            size="mini"
+            style="width: 100%;margin-top: 10px;max-height: 300px;overflow: scroll;"
+          >
+            <el-table-column
+              prop="label"
+              label="后端配置项"
+            />
+            <el-table-column
+              prop="value"
+              label="value"
+            >
+              <template slot-scope="scope">
+                <el-checkbox v-if="scope.row.type === 'checkbox'" v-model="scope.row.value" />
+                <el-select v-else-if="scope.row.type === 'select'" v-model="scope.row.value" size="mini" clearable>
+                  <el-option
+                    v-for="item in scope.row.optionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+                <div v-if="scope.row.type === 'trainingChoose'" style="display: flex;">
+                  <div style="width: 200px;">{{ trainingName? trainingName: '-' }}</div>
+                  <el-button style="margin-left: 10px;" type="primary" size="mini" @click="handleChoose">选择</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <el-card style="padding: 10px;margin-top: 20px;">
+          <el-table
+            :data="frontTableData"
+            border
+            size="mini"
+            style="width: 100%;margin-top: 10px;max-height: 300px;overflow: scroll;"
+          >
+            <el-table-column
+              prop="label"
+              label="前端配置项"
+            />
+            <el-table-column
+              prop="value"
+              label="value"
+            >
+              <template slot-scope="scope">
+                <el-checkbox v-if="scope.row.type === 'checkbox'" v-model="scope.row.value" />
+                <el-select v-else-if="scope.row.type === 'select'" v-model="scope.row.value" size="mini" clearable>
+                  <el-option
+                    v-for="item in scope.row.optionList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="close">取 消</el-button>
+        <el-button type="primary" @click="commit">确 定</el-button>
+      </div>
+    </div>
+    <choose-training ref="chooseTraining" @choose="choose" />
+  </el-dialog>
+</template>
+
+<script>
+import { updateMapFunction, createMapFunction } from '@/api/trainingPlatform';
+import { querySimulationMemberByMapId, querySimulationStationsByMapId } from '@/api/jmap/map';
+import { getPassengerFlowData } from '@/api/simulation';
+import { queryPaperList } from '@/api/management/exam';
+import { getTrainingDetailNew } from '@/api/jmap/training';
+import ChooseTraining from './chooseTraining';
+import { ClientList, TrainingTypeList } from '@/scripts/ConstDic';
+
+export default {
+    name: 'EditSubsystem',
+    components: {
+        ChooseTraining
+    },
+    data() {
+        return {
+            visible: false,
+            title: '',
+            trainingName: '',
+            mapSystemId: '',
+            memberList: [],
+            examList: [],
+            lpfDataList: [],
+            frontTableData: [
+                { key: 'singleMember', label: '是否单角色', value: false, type: 'checkbox' },
+                { key: 'singleClient', label: '是否单客户端', value: false, type: 'checkbox' },
+                { key: 'client', label: '初始客户端', value: '', type: 'select', optionList: ClientList},
+                { key: 'hasTraining', label: '是否有实训', value: false, type: 'checkbox'},
+                { key: 'trainingType', label: '实训类型', value: '', type: 'select', optionList: TrainingTypeList },
+                { key: 'hasExam', label: '是否有考试', value: false, type: 'checkbox' },
+                { key: 'trainingDesign', label: '是否实训设计', value: false, type: 'checkbox' },
+                { key: 'hasLpf', label: '是否有大客流', value: false, type: 'checkbox' },
+                { key: 'hasVoice', label: '是否有语音指令', value: false, type: 'checkbox' },
+                { key: 'joint', label: '是否综合演练', value: false, type: 'checkbox' },
+                { key: 'hasDeviceManage', label: '是否有设备管理', value: false, type: 'checkbox' },
+                { key: 'hasMemberManage', label: '是否有成员管理', value: false, type: 'checkbox' }
+            ],
+            endTableData: [
+                { key: 'DEFAULT_MEMBER', label: '默认仿真成员', value: '', type: 'select', optionList: [] },
+                { key: 'LPF', label: '大客流', value: '', type: 'select', optionList: [] },
+                { key: 'REAL_DEVICE', label: '真实设备', value: '', type: 'checkbox' },
+                { key: 'TRAINING', label: '加载实训', value: '', type: 'trainingChoose' },
+                { key: 'EXAM', label: '加载考试', value: '', type: 'select', optionList: [] }
+            ],
+            rules: {
+                name: [
+                    { required: true, message: '请输入线路功能名称', trigger: 'blur' }
+                ],
+                type: [
+                    { required: true, message: '请选择线路功能类型', trigger: 'change' }
+                ]
+            },
+            ruleForm: {
+                name: '',
+                type: '',
+                desc: ''
+            },
+            memberMetroList: [],
+            memberRailwayList: [],
+            memberEmergencyList: []
+        };
+    },
+    async mounted() {
+        try {
+            queryPaperList({ mapId: this.$route.query.mapId, findState: 3 }).then(resp => {
+                resp.data.forEach(item => {
+                    this.examList.push({ label: item.name, value: item.id });
+                });
+                const exam = this.endTableData.find(item => item.key === 'EXAM');
+                exam.optionList = this.examList;
+            }).catch(e => {
+                this.$message.error('获取试卷列表失败！');
+            });
+            getPassengerFlowData(this.$route.query.mapId).then(resp => {
+                resp.data.forEach(item => {
+                    this.lpfDataList.push({ label: item.name, value: item.id });
+                });
+                const lpf = this.endTableData.find(item => item.key === 'LPF');
+                lpf.optionList = this.lpfDataList;
+            }).catch(e => {
+                this.$message.error('获取大客流数据失败！');
+            });
+            try {
+                const stationResp = await querySimulationStationsByMapId(this.$route.query.mapId);
+                const memberResp = await querySimulationMemberByMapId(this.$route.query.mapId);
+                this.memberMetroList = [];
+                this.memberRailwayList = [];
+                this.memberEmergencyList = [];
+                const {METRO = [], RAILWAY = [], EMERGENCY = []} = memberResp.data;
+                METRO.forEach(member => {
+                    const data = this.handleMember(member, stationResp.data);
+                    this.memberMetroList.push(data);
+                });
+                RAILWAY.forEach(member => {
+                    const data = this.handleMember(member, stationResp.data);
+                    this.memberRailwayList.push(data);
+                });
+                EMERGENCY.forEach(member => {
+                    const data = this.handleMember(member, stationResp.data);
+                    this.memberEmergencyList.push(data);
+                });
+            } catch {
+                this.$message.error('获取成员列表失败！');
+            }
+
+        } catch (e) {
+            console.error(e);
+            this.$message.error('初始化数据失败！');
+        }
+    },
+    methods: {
+        doShow(row) {
+            if (row && row.id) {
+                this.mapSystemId = row.id;
+                this.ruleForm.name = row.name;
+                this.ruleForm.desc = row.desc || '';
+                this.ruleForm.type = row.paramVO.type;
+                this.typeChange(this.ruleForm.type);
+                this.frontTableData.forEach(item => {
+                    item.value = row.paramVO.domConfig[item.key];
+                });
+                this.endTableData.forEach(item => {
+                    if (row.paramVO.itemMap && row.paramVO.itemMap[item.key]) {
+                        if (row.paramVO.itemMap[item.key] === 'true') {
+                            item.value = true;
+                        } else if (row.paramVO.itemMap[item.key] === 'false') {
+                            item.value = false;
+                        } else {
+                            item.value = row.paramVO.itemMap[item.key] === null ? '' : row.paramVO.itemMap[item.key];
+                        }
+                    }
+                    if (item.key === 'TRAINING' && row.paramVO.itemMap && row.paramVO.itemMap[item.key]) {
+                        getTrainingDetailNew(this.ruleForm.trainingId).then(resp => { this.trainingName = resp.data.name; }).catch(e=> { console.error(e); });
+                    }
+                });
+                this.title = '修改线路功能';
+            } else {
+                this.title = '创建线路功能';
+            }
+            this.visible = true;
+        },
+        typeChange(val) {
+            if (val === 'METRO') {
+                this.memberList = [...this.memberMetroList];
+            } else if (val === 'RAILWAY') {
+                this.memberList = [...this.memberRailwayList];
+            } else if (val === 'EMERGENCY') {
+                this.memberList = [...this.memberEmergencyList];
+            }
+            if (['C_ATS', 'C_ATS_BS', 'C_PA', 'C_CCTV', 'GPC'].includes(this.ruleForm.client)) {
+                const temMemberList = this.memberList.filter(member => member.memberType === 'DISPATCHER');
+                this.memberList = [...temMemberList];
+            } else if (['L_ATS', 'LCW', 'L_CCTV', 'L_PA'].includes(this.ruleForm.client)) {
+                const temMemberList = this.memberList.filter(member => member.memberType === 'STATION_SUPERVISOR');
+                this.memberList = [...temMemberList];
+            }
+            const defaultMember = this.endTableData.find(item => item.key === 'DEFAULT_MEMBER');
+            defaultMember.optionList = this.memberList;
+        },
+        handleMember(member, stationList) {
+            const data = { value: member.id, label: '', memberType: member.type };
+            const device = stationList.find(station => station.code === member.deviceCode) || {};
+            switch (member.type) {
+            case 'DISPATCHER':
+                data.label = '行调' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SUPERVISOR':
+                data.label = '行值-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DRIVER':
+                data.label = '司机-' + member.deviceCode;
+                break;
+            case 'MAINTAINER':
+                data.label = '通号' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEPOT_DISPATCHER':
+                data.label = '调度-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SIGNAL_BUILDING':
+                data.label = '信号楼-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_ASSISTANT':
+                data.label = '助理-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_MASTER':
+                data.label = '站长-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SIGNALER':
+                data.label = '信号员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_PASSENGER':
+                data.label = '客运员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SWITCH_MAN':
+                data.label = '扳道员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_FACILITATOR':
+                data.label = '引导员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_WORKER':
+                data.label = '工务工-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEVICE_MANAGER':
+                data.label = '设备管理员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'TRAIN_MASTER':
+                data.label = '车务段段长' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ELECTRIC_DISPATCHER':
+                data.label = '工电调度' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'PARENT_DEPARTMENT':
+                data.label = '上级部分' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SCHEDULING':
+                data.label = '派班员' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SHIFT_MANAGER':
+                data.label = '值班主任' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ENVIRONMENT_DISPATCHER':
+                data.label = '环控调度' + (member.name ? `-${member.name}` : '');
+                break;
+            }
+            return data;
+        },
+        close() {
+            this.mapSystemId = '';
+            this.ruleForm = {
+                name: '',
+                type: '',
+                desc: ''
+            };
+            this.frontTableData = [
+                { key: 'singleMember', label: '是否单角色', value: false, type: 'checkbox' },
+                { key: 'singleClient', label: '是否单客户端', value: false, type: 'checkbox' },
+                { key: 'client', label: '初始客户端', value: '', type: 'select', optionList: ClientList},
+                { key: 'hasTraining', label: '是否有实训', value: false, type: 'checkbox'},
+                { key: 'trainingType', label: '实训类型', value: '', type: 'select', optionList: TrainingTypeList },
+                { key: 'hasExam', label: '是否有考试', value: false, type: 'checkbox' },
+                { key: 'trainingDesign', label: '是否实训设计', value: false, type: 'checkbox' },
+                { key: 'hasLpf', label: '是否有大客流', value: false, type: 'checkbox' },
+                { key: 'hasVoice', label: '是否有语音指令', value: false, type: 'checkbox' },
+                { key: 'joint', label: '是否综合演练', value: false, type: 'checkbox' },
+                { key: 'hasDeviceManage', label: '是否有设备管理', value: false, type: 'checkbox' },
+                { key: 'hasMemberManage', label: '是否有成员管理', value: false, type: 'checkbox' }
+            ];
+            this.endTableData = [
+                { key: 'DEFAULT_MEMBER', label: '默认仿真成员', value: '', type: 'select', optionList: [] },
+                { key: 'LPF', label: '大客流', value: '', type: 'select', optionList: this.lpfDataList },
+                { key: 'REAL_DEVICE', label: '真实设备', value: '', type: 'checkbox' },
+                { key: 'TRAINING', label: '加载实训', value: '', type: 'trainingChoose' },
+                { key: 'EXAM', label: '加载考试', value: '', type: 'select', optionList: this.examList }
+            ];
+            this.memberList = [];
+            this.trainingName = '';
+            this.visible = false;
+            this.$refs.ruleForm.resetFields();
+        },
+        commit() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    const itemMap = {};
+                    this.endTableData.forEach(item => {
+                        itemMap[item.key] = item.value === '' ? null : item.value;
+                    });
+                    const domConfig = {};
+                    this.frontTableData.forEach(item => {
+                        domConfig[item.key] = item.value;
+                    });
+                    if (!domConfig.trainingType) {
+                        delete domConfig.trainingType;
+                    }
+                    const data = {
+                        mapId: this.$route.query.mapId,
+                        name: this.ruleForm.name,
+                        desc: this.ruleForm.desc,
+                        paramVO: {
+                            type: this.ruleForm.type,
+                            itemMap:itemMap,
+                            domConfig: domConfig
+                        }
+                    };
+                    if (this.title === '创建线路功能') {
+                        createMapFunction(data).then(resp => {
+                            this.visible = false;
+                            this.$emit('tableReload');
+                            this.$message.success('创建线路功能成功！');
+                            this.close();
+                        }).catch(() => {
+                            this.$message.error('创建线路功能失败！');
+                        });
+                    } else {
+                        data.id = this.mapSystemId;
+                        updateMapFunction(data).then(resp => {
+                            this.visible = false;
+                            this.$emit('tableReload');
+                            this.close();
+                            this.$message.success('修改线路功能成功！');
+                        }).catch(() => {
+                            this.$message.error('修改线路功能失败！');
+                        });
+                    }
+                }
+            });
+        },
+        handleChoose() {
+            this.$refs.chooseTraining.doShow();
+        },
+        choose(data) {
+            this.trainingName = data.name;
+            const training = this.endTableData.find(item => item.type === 'trainingChoose');
+            training.value = data.id;
+        }
+    }
+};
+</script>
+
+<style scoped>
+	.dialog-footer {
+		text-align: center;
+	}
+</style>
diff --git a/src/views/publish/publishMap/exportMap.vue b/src/views/publish/publishMap/exportMap.vue
index 801479c10..3d7b3a02f 100644
--- a/src/views/publish/publishMap/exportMap.vue
+++ b/src/views/publish/publishMap/exportMap.vue
@@ -27,9 +27,9 @@ export default {
                 { label: '3d数据', value: 'MAP_3D_DATA' },
                 { label: 'ibp数据', value: 'ibp' },
                 { label: 'iscs数据', value: 'iscs' },
-                { label: '指令定义', value: 'COMMAND_DEFINITION' },
-                { label: '剧本数据', value: 'script' },
-                { label: '线路配置', value: 'REAL_LINE_CONFIG'}
+                { label: '线路配置', value: 'REAL_LINE_CONFIG'},
+                { label: '子系统数据', value: 'mapFunction' },
+                { label: '实训数据', value: 'training' }
             ]
         };
     },
@@ -59,9 +59,9 @@ export default {
                     map3dData: this.checkList.includes('MAP_3D_DATA'),
                     ibp: this.checkList.includes('ibp'),
                     iscs: this.checkList.includes('iscs'),
-                    script:this.checkList.includes('script'),
-                    commandDefinition: this.checkList.includes('COMMAND_DEFINITION'),
-                    realLineConfig: this.checkList.includes('REAL_LINE_CONFIG')
+                    realLineConfig: this.checkList.includes('REAL_LINE_CONFIG'),
+                    mapFunction: this.checkList.includes('mapFunction'),
+                    training: this.checkList.includes('training')
                 };
                 const res = await getPublishMapExportNew(this.row.id, data);
                 const resultData = res.data;
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 8a6beadc2..c8ea9f9f3 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -122,7 +122,7 @@ export default {
                     {
                         type: 'button',
                         title: this.$t('global.operate'),
-                        width: this.$i18n.locale == 'en' ? '650' : '650',
+                        width:  '750',
                         buttons: [
                             {
                                 name: '编辑信息',
@@ -186,6 +186,35 @@ export default {
                                 name: '领取权限',
                                 handleClick: this.handlePermission,
                                 type: 'default'
+                            },
+                            {
+                                name: '线路功能管理',
+                                handleClick: this.subsystemManage,
+                                type: 'default'
+                            },
+                            {
+                                name: 'ISCS数据管理',
+                                handleClick: this.iscsDataManager
+                            },
+                            {
+                                name: '发布ISCS管理',
+                                handleClick: this.publishIscsManager
+                            },
+                            {
+                                name: '发布IBP管理',
+                                handleClick: this.publishIbpManage
+                            },
+                            {
+                                name: '加载计划运行图管理',
+                                handleClick: this.runPlanCommonManage
+                            },
+                            {
+                                name: '模板运行图管理',
+                                handleClick: this.runPlanTemplateManage
+                            },
+                            {
+                                name: '每日运行图管理',
+                                handleClick: this.runPlanEveryDayManage
                             }
                         ]
                     }
@@ -271,7 +300,8 @@ export default {
         },
 
         publicList(index, row) {
-            this.$router.push({ path: `/publish/map/detail`, query: { mapId: row.id } });
+            // this.$router.push({ path: `/publish/map/detail`, query: { mapId: row.id } });
+            this.$router.push({ path: `/systemManagement/lineDataManage/PublishMapDetail`, query: { mapId: row.id } });
         },
 
         handlePutaway(index, row) {
@@ -465,6 +495,27 @@ export default {
             this.mapId = row.id;
             this.dialogVisible = true;
         },
+        subsystemManage(index, row) {
+            this.$router.push({path:'/systemManagement/lineDataManage/subsystem', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
+        iscsDataManager(index, row) {
+            this.$router.push({path:'/systemManagement/lineDataManage/iscsData', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
+        publishIscsManager(index, row) {
+            this.$router.push({path: '/systemManagement/lineDataManage/publishIscs', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
+        publishIbpManage(index, row) {
+            this.$router.push({path: '/systemManagement/lineDataManage/publishIbp', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
+        runPlanCommonManage(index, row) {
+            this.$router.push({path: '/systemManagement/lineDataManage/runPlanCommon', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
+        runPlanTemplateManage(index, row) {
+            this.$router.push({path: '/systemManagement/lineDataManage/runPlanTemplate', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
+        runPlanEveryDayManage(index, row) {
+            this.$router.push({path: '/systemManagement/lineDataManage/runPlanEveryDay', query: {mapId: row.id, lineCode: row.lineCode}});
+        },
         permissionCommit() {
             getPermissionQuickly(this.mapId, this.permissionNum).then(resp => {
                 this.dialogVisible = false;
diff --git a/src/views/publish/publishMap/iscsDataManage/addIscsDevice.vue b/src/views/publish/publishMap/iscsDataManage/addIscsDevice.vue
new file mode 100644
index 000000000..c69dc8929
--- /dev/null
+++ b/src/views/publish/publishMap/iscsDataManage/addIscsDevice.vue
@@ -0,0 +1,200 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
+      <el-form-item label="code" prop="code">
+        <el-input v-model="formModel.code" style="width: 200px;" />
+      </el-form-item>
+      <el-form-item label="车站" prop="station">
+        <el-select v-model="formModel.station" placeholder="请选择">
+          <el-option
+            v-for="item in stationList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="系统" prop="system">
+        <el-select v-model="formModel.system" placeholder="请选择">
+          <el-option
+            v-for="item in systemList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备位置" prop="position">
+        <el-select v-model="formModel.position" placeholder="请选择">
+          <el-option
+            v-for="item in positionList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备类型" prop="type">
+        <el-select v-model="formModel.type" placeholder="请选择">
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { createIscsDevcie, updateIscsDevice } from '@/api/iscs';
+import { getStationList } from '@/api/runplan';
+export default {
+    name: 'DeviceAdd',
+    props: {
+        positionList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        typeList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        systemList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                code: '',
+                system: '',
+                mapId: '',
+                station: '',
+                position: '',
+                type: ''
+            },
+            stationList: [],
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                code: [
+                    { required: true, message: '请输入设备code', trigger: 'blur' }
+                ],
+                mapId: [
+                    { required: true, message: '请选择地图', trigger: 'change' }
+                ],
+                system: [
+                    { required: true, message: '请选择系统', trigger: 'change' }
+                ],
+                station: [
+                    { required: true, message: '请选择车站', trigger: 'change' }
+                ],
+                position: [
+                    { required: true, message: '请选择设备位置', trigger: 'change' }
+                ],
+                type: [
+                    { required: true, message: '请选择设备类型', trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改ISCS设备' : '创建ISCS设备';
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    mounted() {
+        getStationList(this.mapId).then(resp => {
+            this.stationList = resp.data;
+        }).catch(() => {
+            this.$message.error('获取车站列表失败！');
+        });
+    },
+    methods: {
+        show(data) {
+            if (data) {
+                this.formModel.id = data.id;
+                this.formModel.system = data.system;
+                this.formModel.code = data.code;
+                this.formModel.station = data.station;
+                this.formModel.position = data.position;
+                this.formModel.type = data.type;
+            }
+            this.formModel.mapId = this.mapId;
+            this.dialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.ruleForm.resetFields();
+            });
+        },
+        doSave() {
+            this.$refs.ruleForm.validate(() => {
+                this.loading = true;
+                const data = {
+                    id: this.formModel.id,
+                    mapId: this.formModel.mapId,
+                    system: this.formModel.system,
+                    code: this.formModel.code,
+                    station: this.formModel.station,
+                    position: this.formModel.position,
+                    type: this.formModel.type
+                };
+                if (data.id) {
+                    updateIscsDevice(data.id, data).then(resp => {
+                        this.$message.success('修改ISCS设备数据成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                } else {
+                    createIscsDevcie(data).then(resp => {
+                        this.$message.success('创建ISCS设备数据成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                mapId: '',
+                system: '',
+                code: '',
+                station: '',
+                position: '',
+                type: ''
+            };
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/publish/publishMap/iscsDataManage/addIscsResources.vue b/src/views/publish/publishMap/iscsDataManage/addIscsResources.vue
new file mode 100644
index 000000000..ab43c1fe4
--- /dev/null
+++ b/src/views/publish/publishMap/iscsDataManage/addIscsResources.vue
@@ -0,0 +1,224 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
+      <el-form-item label="系统" prop="system">
+        <el-select v-model="formModel.system" placeholder="请选择">
+          <el-option
+            v-for="item in systemList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="formModel.type" placeholder="请选择">
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="音频资源" prop="resourceIds">
+        <el-select v-model="formModel.resourceIds" multiple placeholder="请选择">
+          <el-option
+            v-for="item in audioResourcesList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { createIscsResources, updateIscsResources } from '@/api/iscs';
+import { queryAllAudioResources } from '@/api/audioResources';
+export default {
+    name: 'DeviceAdd',
+    props: {
+        mapList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        systemList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        typeList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                mapId: '',
+                type: '',
+                system: '',
+                resourceIds: []
+            },
+            audioResourcesList: [],
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                mapId: [
+                    { required: true, message: '请选择地图', trigger: 'change' }
+                ],
+                system: [
+                    { required: true, message: '请选择系统', trigger: 'change' }
+                ],
+                type: [
+                    { required: true, message: '请选择类型', trigger: 'change' }
+                ],
+                resourceIds: [
+                    { required: true, message: '请选择资源', trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改ISCS资源' : '创建ISCS资源';
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    mounted() {
+        queryAllAudioResources().then(resp => {
+            this.audioResourcesList = resp.data;
+        }).catch(() => {
+            this.$message.error('获取音频资源列表失败！');
+        });
+    },
+    methods: {
+        show(data) {
+            this.formModel.mapId = this.mapId;
+            if (data) {
+                this.formModel.id = data.id;
+                this.formModel.system = data.system;
+                this.formModel.type = data.type;
+                this.formModel.resourceIds = data.resourceIds;
+            }
+            this.dialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.ruleForm.resetFields();
+            });
+        },
+        doSave() {
+            this.$refs.ruleForm.validate(() => {
+                this.loading = true;
+                const data = {
+                    id: this.formModel.id,
+                    mapId: this.formModel.mapId,
+                    system: this.formModel.system,
+                    type: this.formModel.type,
+                    resourceIds: this.formModel.resourceIds
+                };
+                if (data.id) {
+                    updateIscsResources(data.id, data).then(resp => {
+                        this.$message.success('修改ISCS资源数据成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                } else {
+                    createIscsResources(data).then(resp => {
+                        this.$message.success('创建ISCS资源数据成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                mapId: '',
+                system: '',
+                type: '',
+                resourceIds: []
+            };
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.chat-box-footer-create{
+		font-size: 16px;
+		text-align: center;
+		color: #fff;
+		position: relative;
+		left: 5px;
+		top: 6px;
+		line-height: 30px;
+		cursor: pointer;
+		width: 40px;
+		height: 40px;
+		border-radius: 50%;
+		background: green;
+		border: none;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.chat-box-footer-send{
+		background: #F2F2F2;
+		right: 55px;
+		cursor: pointer;
+	.icon-yuyin{
+		color: #333;
+		font-size: 24px;
+		margin: 0;
+	}
+	&.active{
+	.icon-yuyin{
+		color: green;
+	}
+	}
+	.close_icon{
+		position: absolute;
+		top: 8px;
+		left: 45px;
+		font-size: 16px;
+		color: #333;
+		font-weight: 600;
+		padding: 3px;
+	}
+	}
+	#record_progress_bar{
+		width: 40px;
+		height: 40px;
+		position: absolute;
+		left: 0;
+		top: 0;
+		border-radius: 50%;
+	}
+</style>
diff --git a/src/views/publish/publishMap/iscsDataManage/addVoice.vue b/src/views/publish/publishMap/iscsDataManage/addVoice.vue
new file mode 100644
index 000000000..8d7dac412
--- /dev/null
+++ b/src/views/publish/publishMap/iscsDataManage/addVoice.vue
@@ -0,0 +1,217 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="580px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="60px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formModel.name" />
+      </el-form-item>
+      <el-form-item label="描述" prop="desc">
+        <el-input v-model="formModel.desc" />
+      </el-form-item>
+      <el-form-item label="url" prop="url">
+        <el-row>
+          <el-col :span="18">
+            <el-input v-model="formModel.url" :disabled="true" style="width: 340px;" />
+          </el-col>
+          <el-col :span="6">
+            <el-upload
+              ref="replaceUploader"
+              v-model="newChapter.title"
+              :file-list="replaceList"
+              class="avatar-uploader"
+              action="https://joylink.club/jlfile/api/upload/AUDIO?appId=00001&appSecret=joylink00001"
+              :limit="1"
+              :show-file-list="true"
+              :on-remove="handleRemove"
+              :on-success="handleReplaceAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload>
+          </el-col>
+        </el-row>
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { createAudioResources, updateAudioResources} from '@/api/audioResources';
+export default {
+    name: 'DeviceAdd',
+    data() {
+        return {
+            replaceList: [],
+            newChapter: { title: '' },
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                name: '',
+                desc: '',
+                url: ''
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: '请输入音频资源名称', trigger: 'blur' }
+                ],
+                desc: [
+                    { required: true, message: '请输入音频资源描述', trigger: 'blur' }
+                ],
+                url: [
+                    { required: true, message: '请录入音频资源', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改音频资源' : '创建音频资源';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        handleReplaceAvatarSuccess(response, file, fileList) {
+            if (response.code == '200') {
+                this.formModel.url = response.data;
+            } else {
+                this.$message.error('音频上传失败！');
+            }
+        },
+        handleRemove() {
+            this.formModel.url = '';
+        },
+        /**
+		 *上传文件限制--只能上传mp3格式的文件
+		 */
+        beforeAvatarUpload(file) {
+            var testmsg = file.name.substring(file.name.lastIndexOf('.') + 1);
+            const extension = testmsg === 'mp3' || testmsg === 'wav';
+            if (!extension) {
+                this.$message({
+                    message:'上传文件只能是mp3格式！',
+                    type:'error'
+                });
+            }
+            return extension;
+        },
+
+        show(data) {
+            this.dialogVisible = true;
+            if (data) {
+                this.formModel.id = data.id;
+                this.formModel.name = data.name;
+                this.formModel.desc = data.desc;
+                this.formModel.url = data.url;
+            } else {
+                this.$nextTick(() => {
+                    this.$refs.ruleForm.resetFields();
+                });
+            }
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = {
+                        id: this.formModel.id,
+                        name: this.formModel.name,
+                        desc: this.formModel.desc,
+                        url: this.formModel.url
+                    };
+                    if (data.id) {
+                        updateAudioResources(data.id, data).then(resp => {
+                            this.$message.success('修改音频资源数据成功！');
+                            this.handleClose();
+                            this.$emit('reloadTable');
+                        }).catch(error => {
+                            this.$message.error(error.message);
+                            this.loading = false;
+                        });
+                    } else {
+                        createAudioResources(data).then(resp => {
+                            this.$message.success('创建音频资源数据成功！');
+                            this.handleClose();
+                            this.$emit('reloadTable');
+                        }).catch(error => {
+                            this.$message.error(error.message);
+                            this.loading = false;
+                        });
+                    }
+                }
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                name: '',
+                desc: '',
+                url: ''
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+	.chat-box-footer-create{
+		font-size: 16px;
+		text-align: center;
+		color: #fff;
+		position: relative;
+		left: 5px;
+		top: 6px;
+		line-height: 30px;
+		cursor: pointer;
+		width: 40px;
+		height: 40px;
+		border-radius: 50%;
+		background: green;
+		border: none;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.chat-box-footer-send{
+		background: #F2F2F2;
+		right: 55px;
+		cursor: pointer;
+	.icon-yuyin{
+		color: #333;
+		font-size: 24px;
+		margin: 0;
+	}
+	&.active{
+	.icon-yuyin{
+		color: green;
+	}
+	}
+	.close_icon{
+		position: absolute;
+		top: 8px;
+		left: 45px;
+		font-size: 16px;
+		color: #333;
+		font-weight: 600;
+		padding: 3px;
+	}
+	}
+	#record_progress_bar{
+		width: 40px;
+		height: 40px;
+		position: absolute;
+		left: 0;
+		top: 0;
+		border-radius: 50%;
+	}
+</style>
diff --git a/src/views/publish/publishMap/iscsDataManage/batchAddIscsDevice.vue b/src/views/publish/publishMap/iscsDataManage/batchAddIscsDevice.vue
new file mode 100644
index 000000000..c19947d04
--- /dev/null
+++ b/src/views/publish/publishMap/iscsDataManage/batchAddIscsDevice.vue
@@ -0,0 +1,178 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
+      <el-form-item label="地图" prop="mapId">
+        <el-select v-model="formModel.mapId" placeholder="请选择" @change="mapIdChange">
+          <el-option
+            v-for="item in mapList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="系统" prop="system">
+        <el-select v-model="formModel.system" placeholder="请选择">
+          <el-option
+            v-for="item in systemList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备位置" prop="position">
+        <el-select v-model="formModel.position" multiple placeholder="请选择">
+          <el-option
+            v-for="item in positionList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备类型" prop="type">
+        <el-select v-model="formModel.type" placeholder="请选择">
+          <el-option
+            v-for="item in typeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { batchCreateIscsDevcie } from '@/api/iscs';
+import { getStationList } from '@/api/runplan';
+export default {
+    name: 'DeviceAdd',
+    props: {
+        mapList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        positionList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        typeList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        },
+        systemList: {
+            type: Array,
+            default: function () {
+                return [];
+            }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                system: '',
+                mapId: '',
+                position: [],
+                type: ''
+            },
+            stationList: [],
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                mapId: [
+                    { required: true, message: '请选择地图', trigger: 'change' }
+                ],
+                system: [
+                    { required: true, message: '请选择系统', trigger: 'change' }
+                ],
+                position: [
+                    { required: true, message: '请选择设备位置', trigger: 'change' }
+                ],
+                type: [
+                    { required: true, message: '请选择设备类型', trigger: 'change' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return '批量创建ISCS设备';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        show() {
+            this.dialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.ruleForm.resetFields();
+            });
+        },
+        mapIdChange(value) {
+            getStationList(value).then(resp => {
+                this.stationList = resp.data;
+            }).catch(() => {
+                this.$message.error('获取车站列表失败！');
+            });
+        },
+        doSave() {
+            this.$refs.ruleForm.validate(() => {
+                this.loading = true;
+                const data = [];
+                this.stationList.forEach(station => {
+                    if (!station.depot) {
+                        this.formModel.position.forEach(item => {
+                            data.push({
+                                mapId: this.formModel.mapId,
+                                system: this.formModel.system,
+                                station: station.code,
+                                code: station.code + '-' + this.formModel.system + '-' + item,
+                                position: item,
+                                type: this.formModel.type
+                            });
+                        });
+                    }
+                });
+
+                batchCreateIscsDevcie(data).then(resp => {
+                    this.$message.success('批量创建ISCS设备数据成功！');
+                    this.handleClose();
+                    this.$emit('reloadTable');
+                }).catch(error => {
+                    this.$message.error(error.message);
+                    this.loading = false;
+                });
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                mapId: '',
+                system: '',
+                position: '',
+                type: ''
+            };
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/publish/publishMap/iscsDataManage/generateVoice.vue b/src/views/publish/publishMap/iscsDataManage/generateVoice.vue
new file mode 100644
index 000000000..ac6049346
--- /dev/null
+++ b/src/views/publish/publishMap/iscsDataManage/generateVoice.vue
@@ -0,0 +1,148 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="580px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="60px">
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formModel.name" />
+      </el-form-item>
+      <el-form-item label="描述" prop="desc">
+        <el-input v-model="formModel.desc" />
+      </el-form-item>
+    </el-form>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { generateAudio } from '@/api/audioResources';
+export default {
+    name: 'Generate',
+    data() {
+        return {
+            replaceList: [],
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                name: '',
+                desc: ''
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                name: [
+                    { required: true, message: '请输入音频资源名称', trigger: 'blur' }
+                ],
+                desc: [
+                    { required: true, message: '请输入音频资源描述', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return '生成音频资源';
+        }
+    },
+    mounted() {
+    },
+    methods: {
+        handleRemove() {
+            this.formModel.url = '';
+        },
+
+        show() {
+            this.dialogVisible = true;
+            this.$nextTick(() => {
+                this.$refs.ruleForm.resetFields();
+            });
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = {
+                        id: this.formModel.id,
+                        name: this.formModel.name,
+                        desc: this.formModel.desc
+                    };
+                    generateAudio(data).then(resp => {
+                        this.$message.success('生成音频资源数据成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                name: '',
+                desc: ''
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.chat-box-footer-create{
+	font-size: 16px;
+	text-align: center;
+	color: #fff;
+	position: relative;
+	left: 5px;
+	top: 6px;
+	line-height: 30px;
+	cursor: pointer;
+	width: 40px;
+	height: 40px;
+	border-radius: 50%;
+	background: green;
+	border: none;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.chat-box-footer-send{
+	background: #F2F2F2;
+	right: 55px;
+	cursor: pointer;
+	.icon-yuyin{
+		color: #333;
+		font-size: 24px;
+		margin: 0;
+	}
+	&.active{
+		.icon-yuyin{
+			color: green;
+		}
+	}
+	.close_icon{
+		position: absolute;
+		top: 8px;
+		left: 45px;
+		font-size: 16px;
+		color: #333;
+		font-weight: 600;
+		padding: 3px;
+	}
+}
+#record_progress_bar{
+	width: 40px;
+	height: 40px;
+	position: absolute;
+	left: 0;
+	top: 0;
+	border-radius: 50%;
+}
+</style>
diff --git a/src/views/publish/publishMap/iscsDataManage/index.vue b/src/views/publish/publishMap/iscsDataManage/index.vue
new file mode 100644
index 000000000..321d5cf4f
--- /dev/null
+++ b/src/views/publish/publishMap/iscsDataManage/index.vue
@@ -0,0 +1,428 @@
+<template>
+  <div style="padding: 5px;">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="iscs系统设备" name="iscsDevice">
+        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="deviceQueryForm" :query-list="deviceQueryList" />
+      </el-tab-pane>
+      <el-tab-pane label="iscs系统资源" name="iscsResource">
+        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="resourceQueryForm" :query-list="resourceQueryList" />
+      </el-tab-pane>
+      <el-tab-pane label="音频资源管理" name="voiceResource">
+        <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="voiceQueryForm" :query-list="voiceQueryList" />
+      </el-tab-pane>
+    </el-tabs>
+    <add-resources
+      ref="addResources"
+      :system-list="iscsSystemList"
+      :type-list="iscsResourcesTypeList"
+      @reloadTable="resourceReloadTable"
+    />
+    <add-iscs-device
+      ref="addDevice"
+      :position-list="iscsPositionList"
+      :type-list="iscsTypeList"
+      :system-list="iscsSystemList"
+      @reloadTable="deviceReloadTable"
+    />
+    <batch-add-iscs-device
+      ref="batchAdd"
+      :map-list="mapList"
+      :position-list="iscsPositionList"
+      :type-list="iscsTypeList"
+      :system-list="iscsSystemList"
+      @reloadTable="deviceReloadTable"
+    />
+    <add-voice ref="addVoice" @reloadTable="voiceReloadTable" />
+    <generate-voice ref="generateVoice" @reloadTable="voiceReloadTable" />
+  </div>
+</template>
+
+<script>
+import { iscsPositionMap, iscsTypeMap, iscsPositionList, iscsTypeList, iscsSystemMap, iscsSystemList, iscsResourcesTypeMap, iscsResourcesTypeList } from '@/scripts/ConstDic';
+import { pagedIscsDevice, deleteIscsDevice, pagedIscsResources, deleteIscsResources } from '@/api/iscs';
+import { getPublishMapListOnline } from '@/api/jmap/map';
+import AddResources from './addIscsResources';
+import AddIscsDevice from './addIscsDevice';
+import BatchAddIscsDevice from './batchAddIscsDevice';
+import { pagedAudioResources, deleteAudioResources } from '@/api/audioResources';
+import AddVoice from './addVoice';
+import GenerateVoice from './generateVoice';
+export default {
+    name: 'IscsDataManage',
+    components: {
+        AddResources,
+        AddIscsDevice,
+        BatchAddIscsDevice,
+        AddVoice,
+        GenerateVoice
+    },
+    data() {
+        return {
+            mapList: [],
+            activeName: 'iscsDevice',
+            iscsPositionList: iscsPositionList,
+            iscsTypeList: iscsTypeList,
+            iscsSystemList: iscsSystemList,
+            iscsResourcesTypeList: iscsResourcesTypeList,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            deviceQueryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    code: {
+                        type: 'text',
+                        label: 'code'
+                    },
+                    system: {
+                        type: 'select',
+                        label: '系统',
+                        config: {
+                            data: iscsSystemList
+                        }
+                    },
+                    position: {
+                        type: 'select',
+                        label: '设备位置',
+                        config: {
+                            data: iscsPositionList
+                        }
+                    },
+                    type: {
+                        type: 'select',
+                        label: '设备类型',
+                        config: {
+                            data: iscsTypeList
+                        }
+                    }
+                }
+            },
+            deviceQueryList: {
+                query: this.queryDeviceFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: 'code',
+                        prop: 'code'
+                    },
+                    {
+                        title: '地图',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getMapName(row.mapId); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '车站编号',
+                        prop: 'station'
+                    },
+                    {
+                        title: '系统',
+                        prop: 'system',
+                        type: 'tag',
+                        columnValue: (row) => { return iscsSystemMap[row.system]; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '设备位置',
+                        prop: 'position',
+                        type: 'tag',
+                        columnValue: (row) => { return iscsPositionMap[row.position]; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '设备类型',
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return iscsTypeMap[row.type]; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDeleteDevice,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createIscsDevice},
+                    { text: '批量创建', handler: this.batchCrateIscsDevice },
+                    { text: '返回', handler: this.goBack }
+                ]
+            },
+            resourceQueryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    system: {
+                        type: 'select',
+                        label: '系统',
+                        config: {
+                            data: iscsSystemList
+                        }
+                    },
+                    type: {
+                        type: 'select',
+                        label: '类型',
+                        config: {
+                            data: iscsResourcesTypeList
+                        }
+                    }
+                }
+
+            },
+            resourceQueryList: {
+                query: this.queryResourcesFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '地图',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getMapName(row.mapId); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '系统',
+                        prop: 'system',
+                        type: 'tag',
+                        columnValue: (row) => { return iscsSystemMap[row.system]; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '类型',
+                        prop: 'type',
+                        type: 'tag',
+                        columnValue: (row) => { return iscsResourcesTypeMap[row.type]; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '资源',
+                        prop: 'resources',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getResources(row.resources); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        buttons: [
+                            // {
+                            //     name: '编辑',
+                            //     handleClick: this.editConfig
+                            // },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDeleteResources,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createAudioResources},
+                    { text: '返回', handler: this.goBack }
+                ]
+            },
+            voiceQueryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '名称:'
+                    },
+                    desc: {
+                        type: 'text',
+                        label: '描述'
+                    }
+                }
+            },
+            voiceQueryList: {
+                query:  pagedAudioResources,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '描述',
+                        prop: 'desc'
+                    },
+                    {
+                        title: 'url',
+                        prop: 'url'
+                    },
+                    {
+                        title: '创建时间',
+                        prop: 'createTime',
+                        type: 'tag',
+                        columnValue: (row) => { return this.handleTime(row.createTime); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: '编辑',
+                                handleClick: this.editVoiceConfig
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDeleteVoice,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createAudioResources},
+                    { text: '生成', handler: this.generateAudioResources },
+                    { text: '返回', handler: this.goBack }
+                ]
+            }
+        };
+    },
+    computed: {
+        mapId() {
+            return this.$route.query.mapId;
+        }
+    },
+    mounted() {
+        getPublishMapListOnline().then(resp => {
+            this.mapList = resp.data;
+            const list = [];
+            this.mapList.forEach(elem => {
+                list.push({ label: elem.name, value: elem.id });
+            });
+            // this.deviceQueryForm.queryObject.mapId.config.data = list;
+        }).catch(() => {
+            this.$message.error('获取地图列表失败！');
+        });
+    },
+    methods: {
+        goBack() {
+            this.$router.go(-1);
+        },
+        queryDeviceFunction(params) {
+            params.mapId = this.mapId;
+            return pagedIscsDevice(params);
+        },
+        queryResourcesFunction(params) {
+            params.mapId = this.mapId;
+            return pagedIscsResources(params);
+        },
+        // 删除
+        handleDeleteDevice(index, row) {
+            this.$confirm('此操作将删除该ISCS设备数据！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteIscsDevice(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.deviceReloadTable();
+                }).catch(() => {
+                    this.deviceReloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        getMapName(mapId) {
+            const mapInfo = this.mapList.find(elem => elem.id == mapId);
+            return mapInfo ? mapInfo.name : '';
+        },
+        getResources(resources) {
+            const array = [];
+            resources.forEach(elem => {
+                array.push(elem.name);
+            });
+            return array;
+        },
+        createIscsDevice() {
+            this.$refs.addDevice.show();
+        },
+        batchCrateIscsDevice() {
+            this.$refs.batchAdd.show();
+        },
+        handleDeleteResources(index, row) {
+            this.$confirm('此操作将删除该ISCS资源数据！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteIscsResources(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.resourceReloadTable();
+                }).catch(() => {
+                    this.resourceReloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        createAudioResources() {
+            this.$refs.addResources.show();
+        },
+        editConfig(index, row) {
+            this.$refs.addResources.show(row);
+        },
+        resourceReloadTable() {
+            this.resourceQueryList.reload();
+        },
+        deviceReloadTable() {
+            this.deviceQueryList.reload();
+        },
+        voiceReloadTable() {
+            this.voiceQueryList.reload();
+        },
+        handleTime(time) {
+            const timeList = time.split('T');
+            let newTime = '';
+            if (timeList.length > 1) {
+                newTime = timeList[0] + ' ' + timeList[1];
+            } else {
+                newTime = time;
+            }
+            return newTime;
+        },
+        // 删除
+        handleDeleteVoice(index, row) {
+            this.$confirm('此操作将删除该音频资源数据！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteAudioResources(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.voiceReloadTable();
+                }).catch(() => {
+                    this.voiceReloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        editVoiceConfig(index, row) {
+            this.$refs.addVoice.show(row);
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/publish/publishMap/subsystem.vue b/src/views/publish/publishMap/subsystem.vue
new file mode 100644
index 000000000..64bcfe080
--- /dev/null
+++ b/src/views/publish/publishMap/subsystem.vue
@@ -0,0 +1,281 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <edit-subsystem ref="editSubsystem" @tableReload="reloadTable" />
+    <el-dialog
+      width="30%"
+      :title="title"
+      :before-close="doCloseGenerate"
+      :visible.sync="visible"
+      center
+    >
+      <el-form ref="ruleForm" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="系统：" prop="simTypes">
+          <el-select v-model="form.simTypes" multiple placeholder="请选择生成仿真类型">
+            <el-option label="地铁CBTC" value="METRO" />
+            <el-option label="大铁CTC" value="RAILWAY" />
+            <el-option label="应急调度" value="EMERGENCY" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="doCloseGenerate">取 消</el-button>
+        <el-button type="primary" @click="generateCommit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { queryMapFunctionPaged, deleteMapFunction, generateMapFunctionNew, deleteAllMapFunction } from '@/api/trainingPlatform';
+import { getPublishMapListOnline } from '@/api/jmap/map';
+import EditSubsystem from './editSubsystem';
+const simTypeMap = {
+    METRO: '地铁CBTC',
+    RAILWAY: '大铁CTC',
+    EMERGENCY: '应急调度'
+};
+// const clientMap = {
+//     C_ATS: '中心ATS工作站',
+//     C_ATS_BS: '中心ATS大屏',
+//     C_PA: '中心PA系统',
+//     C_CCTV: '中心视频监控系统',
+//     L_ATS: '现地ATS工作站',
+//     LCW: '本地控制工作站',
+//     L_CCTV: '现地视频监控系统',
+//     L_PA: '现地PA系统',
+//     GPC: '调度台终端',
+//     IPC: '联锁工作站',
+//     STPC: '车务终端',
+//     DMP: '车务管理终端',
+//     ISCS: 'ISCS',
+//     IBP: 'IBP',
+//     PSL: 'PSL',
+//     RUN_PLAN_DESIGN: '运行图编制',
+//     DRIVE: '列车驾驶'
+// };
+export default {
+    name: 'PublishMap',
+    components: {
+        EditSubsystem
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            title: '一键生成线路功能',
+            visible: false,
+            rules: {
+                type: [
+                    { required: true, message: '请选择生成仿真系统类型', trigger: 'change' }
+                ]
+            },
+            form: {
+                simTypes: []
+            },
+            queryForm: {
+                labelWidth: '80px',
+                reset: true,
+                leftSpan: 15,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '名称'
+                    }
+                }
+
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '地图',
+                        prop: 'mapId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.mapId, this.mapList, ['id', 'name']); },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '系统',
+                        prop: 'simType',
+                        type: 'tag',
+                        columnValue: (row) => { return simTypeMap[row.simType]; },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '分组',
+                        prop: 'subset'
+                    },
+                    //         DEFAULT_MEMBER: false,
+                    // LPF: false,
+                    // REAL_DEVICE: false,
+                    // TRAINING: false,
+                    // EXAM: false
+                    {
+                        title: '默认扮演成员',
+                        prop: 'DEFAULT_MEMBER',
+                        type: 'tag',
+                        columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('DEFAULT_MEMBER') ? '是' : '否'; },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '大客流',
+                        prop: 'LPF',
+                        type: 'tag',
+                        columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('LPF') ? '是' : '否'; },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '真实设备',
+                        prop: 'REAL_DEVICE',
+                        type: 'tag',
+                        columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('REAL_DEVICE') ? '是' : '否'; },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '加载实训',
+                        prop: 'TRAINING',
+                        type: 'tag',
+                        columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('TRAINING') ? '是' : '否'; },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '加载试卷',
+                        prop: 'EXAM',
+                        type: 'tag',
+                        columnValue: (row) => { return row.paramVO.itemMap && row.paramVO.itemMap.hasOwnProperty('EXAM') ? '是' : '否'; },
+                        tagType: () => { return 'success'; }
+                    },
+                    {
+                        title: '描述',
+                        prop: 'desc'
+                    },
+                    {
+                        type: 'button',
+                        title: '操作',
+                        width: '300',
+                        buttons: [
+                            {
+                                name: '更新',
+                                handleClick: this.updateRow
+                            },
+                            {
+                                name: '删除',
+                                handleClick: this.deleteRow
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: '一键生成', handler: this.generateMapSystem },
+                    { text: '一键删除', handler: this.deleteAll },
+                    { text: '功能分组', handler: this.systemSubset },
+                    { text: '新建', handler: this.handleAddSubsystem },
+                    { text: '返回', handler: this.goBack }
+                ]
+            }
+        };
+    },
+    computed: {
+        isShow() {
+            return this.$store.getters['roles'].indexOf('05');
+        }
+    },
+    created() {
+        this.mapList = [];
+        getPublishMapListOnline().then(resp => {
+            this.mapList = resp.data;
+        });
+    },
+    methods: {
+        deleteAll() {
+            this.$confirm('此操作将删除该线路下所有功能，是否继续？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                deleteAllMapFunction(this.$route.query.mapId).then(() => {
+                    this.reloadTable();
+                }).catch(() => {
+                    this.$message.error('一键删除线路功能失败！');
+                });
+            });
+
+        },
+        queryFunction(params) {
+            params['mapId'] = this.$route.query.mapId;
+            return queryMapFunctionPaged(params);
+        },
+        deleteRow(index, row) {
+            this.$confirm('删除线路功能，是否继续？', '提 示', {
+                confirmButtonText: '确 定',
+                cancelButtonText: '取 消',
+                type: 'warning'
+            }).then(() => {
+                deleteMapFunction(row.id).then(resp => {
+                    this.reloadTable();
+                }).catch(error => {
+                    this.$message.error(`删除线路功能: ${error.message}`);
+                });
+            }).catch( () => { });
+        },
+        generateMapSystem() {
+            this.visible = true;
+        },
+        systemSubset() {
+            this.$router.push({ path:'/systemManagement/lineDataManage/systemSubset', query:{ mapId: this.$route.query.mapId, lineCode: this.$route.query.lineCode }});
+        },
+        doCloseGenerate() {
+            this.form.simTypes = [];
+            this.visible = false;
+        },
+        generateCommit() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    generateMapFunctionNew(this.$route.query.mapId, this.form).then(resp => {
+                        if (resp.data && resp.data.length) {
+                            let message = '';
+                            resp.data.forEach(item => {
+                                message = message + item + '；';
+                            });
+                            this.$messageBox(message);
+                        }
+                        this.reloadTable();
+                        this.doCloseGenerate();
+                    }).catch(error => {
+                        this.$message.error(`一键生成线路系统失败: ${error.message}`);
+                    });
+                }
+            });
+        },
+        updateRow(index, row) {
+            this.$refs.editSubsystem.doShow(row);
+        },
+        handleAddSubsystem() {
+            this.$refs.editSubsystem.doShow();
+        },
+        reloadTable() {
+            this.queryList.reload();
+        },
+        goBack() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+/deep/
+.el-button+.el-button{
+	margin-top: 5px;
+	margin-left: 5px;
+}
+</style>
diff --git a/src/views/publish/publishMap/systemSubset.vue b/src/views/publish/publishMap/systemSubset.vue
new file mode 100644
index 000000000..7a9206178
--- /dev/null
+++ b/src/views/publish/publishMap/systemSubset.vue
@@ -0,0 +1,153 @@
+<template>
+  <div style="width: 100%;height: 100%;padding: 50px 30px;">
+    <el-card style="width: 100%;height: 100%;padding: 20px;">
+      <el-row>
+        <el-col :span="4">
+          <el-card style="width: 100%;height: 100%;padding: 15px;">
+            <el-checkbox-group v-model="checkList">
+              <template v-for="item in functionList">
+                <el-checkbox :key="item.id" :label="item" :disabled="!!item.subset" style="display: block;margin: 5px;">{{ item.name }}</el-checkbox>
+              </template>
+            </el-checkbox-group>
+          </el-card>
+        </el-col>
+        <el-col :span="4">
+          <div style="width: 100%;height: 100%;text-align: center;padding: 15px;">
+            <div>分组按钮</div>
+            <div style="display: flex; flex-direction: column-reverse;align-items: center;">
+              <template v-for="item in subsetList">
+                <el-button :key="item" type="primary" style="margin: 5px;" @click="handleSubset(item)">{{ `分组至${item}` }}</el-button>
+              </template>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="16">
+          <div style="text-align: left;margin-bottom: 10px;">
+            <el-input v-model="subset" placeholder="请输入内容" style="width: 400px">
+              <el-button slot="append" @click="addSubset">添加分组</el-button>
+            </el-input>
+          </div>
+          <div style="display: flex;">
+            <template v-for="item in subsetList">
+              <el-card :key="item" class="box-card">
+                <div slot="header" class="clearfix">
+                  <span>{{ item }}</span>
+                  <el-button style="float: right; padding: 3px 0" type="text" @click="removeSubset(item)">删除分组</el-button>
+                </div>
+                <div>
+                  <el-tag v-for="elem in subsetMap[item]" :key="elem.id" style="margin: 5px;" closable @close="deleteFunction(elem, item)">
+                    {{ elem.name }}
+                  </el-tag>
+                </div>
+              </el-card>
+            </template>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="text-align: center;margin-top: 10px;">
+        <el-button type="primary" @click="update">更新</el-button>
+        <el-button @click="goBack">返回</el-button>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { queryMapFunctionList, updateMapFunctionSubset } from '@/api/trainingPlatform';
+export default {
+    name: 'SystemSubset',
+    data() {
+        return {
+            functionList: [],
+            checkList: [],
+            subsetList: [],
+            subsetMap: {},
+            subset: ''
+        };
+    },
+    mounted() {
+        queryMapFunctionList({mapId: this.$route.query.mapId}).then(resp => {
+            this.functionList = resp.data;
+            this.functionList.forEach(item => {
+                if (item.subset && this.subsetList.includes(item.subset)) {
+                    this.subsetMap[item.subset].push(item);
+                } else if (item.subset) {
+                    this.subsetList.push(item.subset);
+                    this.subsetMap[item.subset] = [item];
+                }
+            });
+        }).catch(() => {
+            this.$message.error('获取地图功能列表失败！');
+        });
+    },
+    methods: {
+        handleSubset(subset) {
+            this.checkList.forEach(item => {
+                this.$set(item, 'subset', subset);
+                this.subsetMap[subset].push(item);
+            });
+            this.checkList = [];
+            console.log(this.subsetMap, this.functionList);
+        },
+        removeSubset(subset) {
+            this.subsetMap[subset].forEach(item => {
+                this.$set(item, 'subset', '');
+            });
+            delete this.subsetMap[subset];
+            const index = this.subsetList.findIndex(elem => elem === subset);
+            this.subsetList.splice(index, 1);
+        },
+        deleteFunction(functionItem, subset) {
+            this.$set(functionItem, 'subset', '');
+            const index = this.subsetMap[subset].findIndex(elem => elem.id === functionItem.id);
+            this.subsetMap[subset].splice(index, 1);
+        },
+        addSubset() {
+            if (this.subset) {
+                this.subsetList.push(this.subset);
+                this.subsetMap[this.subset] = [];
+                this.subset = '';
+            }
+        },
+        update() {
+            const data = {'': []};
+            this.subsetList.forEach(item => {
+                data[item] = [];
+                this.subsetMap[item].forEach(elem => {
+                    data[item].push(elem.id);
+                });
+            });
+            this.functionList.forEach(item => {
+                if (!item.subset) {
+                    data[''].push(item.id);
+                }
+            });
+            updateMapFunctionSubset(data).then(resp => {
+                this.$message.success('更新线路功能成功！');
+            }).catch(() => {
+                this.$message.error('更新线路功能失败！');
+            });
+        },
+        goBack() {
+            this.$router.go(-1);
+        }
+    }
+};
+</script>
+
+<style scoped>
+.clearfix:before,
+.clearfix:after {
+	display: table;
+	content: "";
+}
+.clearfix:after {
+	clear: both
+}
+
+.box-card {
+	width: 350px;
+	height: 200px;
+	margin: 5px;
+}
+</style>
diff --git a/src/views/publish/runPlanCommon/draft.vue b/src/views/publish/runPlanCommon/draft.vue
index 4fe1a25e3..2178ea61f 100644
--- a/src/views/publish/runPlanCommon/draft.vue
+++ b/src/views/publish/runPlanCommon/draft.vue
@@ -8,7 +8,7 @@
       <div style="padding-top: 40px; padding-bottom: 20px;">
         <el-form ref="form" :model="model" :rules="rules" label-width="140px" size="small">
           <el-form-item :label="`${$t('publish.selectMap')}:`" prop="mapId">
-            <el-select v-model="model.mapId" filterable>
+            <el-select v-model="model.mapId" :disabled="true" filterable>
               <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -96,6 +96,7 @@ export default {
             getPublishMapListOnline().then(resp => {
                 this.mapList = resp.data;
             });
+            this.model.mapId = this.$route.query.mapId;
         },
         handleChoose() {
             this.$refs.choose.doShow(this.model.mapId);
diff --git a/src/views/publish/runPlanCommon/index.vue b/src/views/publish/runPlanCommon/index.vue
index 0daba7ba9..c7474e655 100644
--- a/src/views/publish/runPlanCommon/index.vue
+++ b/src/views/publish/runPlanCommon/index.vue
@@ -29,15 +29,17 @@ export default {
             queryForm: {
                 labelWidth: '140px',
                 reset: true,
-                queryObject: {
-                    mapId: {
-                        type: 'select',
-                        label: this.$t('publish.mapName'),
-                        config: {
-                            data: []
-                        }
-                    }
-                }
+                textAlign: 'right',
+                leftSpan: 0
+                // queryObject: {
+                //     mapId: {
+                //         type: 'select',
+                //         label: this.$t('publish.mapName'),
+                //         config: {
+                //             data: []
+                //         }
+                //     }
+                // }
             },
             queryList: {
                 query: this.queryFunction,
@@ -100,7 +102,8 @@ export default {
                     }
                 ],
                 actions: [
-                    { text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleCreateCommonPlan }
+                    { text: this.$t('global.add'), btnCode: 'employee_insert', handler: this.handleCreateCommonPlan },
+                    { text: '返回', handler: this.goBack }
                 ]
             },
 
@@ -115,9 +118,9 @@ export default {
             this.mapList = [];
             getPublishMapListOnline().then(resp => {
                 this.mapList = resp.data;
-                this.mapList.forEach(elem => {
-                    this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
-                });
+                // this.mapList.forEach(elem => {
+                //     this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                // });
             });
             this.templatePlanList = [];
             listAllTempLateRunPlan().then(resp => {
@@ -126,10 +129,14 @@ export default {
         },
         queryFunction(params) {
             params['userId'] = '';
+            params.mapId = this.$route.query.mapId;
             return getRunPlanLoadList(params);
         },
         handleCreateCommonPlan() {
-            this.$router.push({ path: `${UrlConfig.publish.runPlanCommon}/add` });
+            this.$router.push({ path: `/systemManagement/lineDataManage/runPlanCommon/add`, query: { mapId: this.$route.query.mapId, lineCode: this.$route.query.mapId } });
+        },
+        goBack() {
+            this.$router.go(-1);
         },
         // 删除
         handleDelete(index, row) {
diff --git a/src/views/publish/runPlanEveryDay/index.vue b/src/views/publish/runPlanEveryDay/index.vue
index 62c6b0a56..defe1b10b 100644
--- a/src/views/publish/runPlanEveryDay/index.vue
+++ b/src/views/publish/runPlanEveryDay/index.vue
@@ -8,7 +8,6 @@
 import { superAdmin } from '@/router/index';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 import { runPlanEveryDayList, deleteRunPlanEveryDay } from '@/api/runplan';
-import { UrlConfig } from '@/scripts/ConstDic';
 
 export default {
     name: 'RunPlanEveryDay',
@@ -26,18 +25,18 @@ export default {
                     name: {
                         type: 'text',
                         label: this.$t('publish.runPlanName')
-                    },
-                    mapId: {
-                        type: 'select',
-                        label: this.$t('publish.mapName'),
-                        config: {
-                            data: []
-                        }
                     }
+                    // mapId: {
+                    //     type: 'select',
+                    //     label: this.$t('publish.mapName'),
+                    //     config: {
+                    //         data: []
+                    //     }
+                    // }
                 }
             },
             queryList: {
-                query: runPlanEveryDayList,
+                query: this.getRunPlanEveryDayData,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -80,6 +79,9 @@ export default {
                             }
                         ]
                     }
+                ],
+                actions: [
+                    { text: '返回', handler: this.goBack }
                 ]
             },
 
@@ -94,11 +96,18 @@ export default {
             this.mapList = [];
             getPublishMapListOnline().then(response => {
                 this.mapList = response.data;
-                response.data.forEach(elem => {
-                    this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
-                });
+                // response.data.forEach(elem => {
+                //     this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                // });
             });
         },
+        goBack() {
+            this.$router.go(-1);
+        },
+        getRunPlanEveryDayData(params) {
+            params.mapId = this.$route.query.mapId;
+            return runPlanEveryDayList(params);
+        },
         handleDelete(index, row) {
             this.$confirm(this.$t('publish.wellDelRunPlanEveryDay'), this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
@@ -117,7 +126,7 @@ export default {
         // 预览
         handleView(index, row) {
             const data = this.mapList.filter(elem=>{ return elem.id == row.mapId; })[0];
-            this.$router.push({ path: `${UrlConfig.publish.runPlanView}/everyDay`, query: { lineCode: data.lineCode, planId: row.id, mapId: row.mapId } });
+            this.$router.push({ path: `/systemManagement/lineDataManage/runPlanView/everyDay`, query: { lineCode: data.lineCode, planId: row.id, mapId: row.mapId } });
         },
         reloadTable() {
             this.queryList.reload();
diff --git a/src/views/publish/runPlanEveryDay/runPlanView.vue b/src/views/publish/runPlanEveryDay/runPlanView.vue
index 69d7b9b31..4eae74b98 100644
--- a/src/views/publish/runPlanEveryDay/runPlanView.vue
+++ b/src/views/publish/runPlanEveryDay/runPlanView.vue
@@ -356,9 +356,7 @@ export default {
             }
         },
         back() { // 返回判断
-            if (this.$route.params.mode === 'everyDay') {
-                this.$router.replace({ path: `${UrlConfig.publish.runPlanEveryDay}` });
-            } else if (this.$route.params.mode === 'template') {
+            if (this.$route.params.mode === 'template') {
                 this.$router.replace({ path: `${UrlConfig.publish.runPlanTemplate}` });
             } else if (this.$route.params.mode === 'common') {
                 this.$router.replace({ path: `${UrlConfig.publish.runPlanCommon}` });
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index 10e9a62f7..43d951ab4 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -33,18 +33,18 @@ export default {
                     name: {
                         type: 'text',
                         label: this.$t('publish.runPlanName')
-                    },
-                    mapId: {
-                        type: 'select',
-                        label: this.$t('publish.mapName'),
-                        config: {
-                            data: []
-                        }
                     }
+                    // mapId: {
+                    //     type: 'select',
+                    //     label: this.$t('publish.mapName'),
+                    //     config: {
+                    //         data: []
+                    //     }
+                    // }
                 }
             },
             queryList: {
-                query: runPlanTemplateList,
+                query: this.getRunPlanTemplateData,
                 selectCheckShow: false,
                 indexShow: true,
                 columns: [
@@ -103,6 +103,9 @@ export default {
                             }
                         ]
                     }
+                ],
+                actions: [
+                    { text: '返回', handler: this.goBack }
                 ]
             },
             currentModel: {},
@@ -117,11 +120,18 @@ export default {
             this.mapIdList = [];
             getPublishMapListOnline().then(response => {
                 this.mapIdList = response.data;
-                response.data.forEach(elem => {
-                    this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
-                });
+                // response.data.forEach(elem => {
+                //     this.queryForm.queryObject.mapId.config.data.push({ value: elem.id, label: elem.name });
+                // });
             });
         },
+        getRunPlanTemplateData(params) {
+            params.mapId = this.$route.query.mapId;
+            return runPlanTemplateList(params);
+        },
+        goBack() {
+            this.$router.go(-1);
+        },
         // 删除
         handleDelete(index, row) {
             this.$confirm(this.$t('publish.wellDelTemplate'), this.$t('global.tips'), {
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 1c145ad5b..46b0ed3c3 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -208,7 +208,7 @@ export default {
                     type: 'role',
                     children: result.deviceListData[1]
                 }, {
-                    label: '车辆段信号楼',
+                    label: '车辆段/停车场调度',
                     id: 'depotDispatcher',
                     type: 'role',
                     children: result.deviceListData[4]
@@ -224,7 +224,7 @@ export default {
                     children: result.deviceListData[6]
                 },
                 {
-                    label: '停车场信号楼',
+                    label: '车辆段/停车场信号楼',
                     id: 'parkingLotSignalBuilding',
                     type: 'role',
                     children: result.deviceListData[7]
@@ -338,7 +338,7 @@ export default {
             const covertmember = this.covert(lastData, ConstConfig.ConstSelect.roleTypeNew);
             const newMember = covertmember[0];
             this.memberList.push(newMember);
-            const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段信号楼', '上级部门', '电力调度', '停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长'];
+            const deviceTypeList = ['行调', '行值', '司机', '通号', '车辆段/停车场调度', '上级部门', '电力调度', '车辆段/停车场信号楼', '车站助理', '车站站长', '车站信号员', '车站客运员', '车站扳道员', '车站引导员', '车站工务工', '设备管理员', '车务段段长'];
             const index = deviceTypeList.indexOf(newMember.type);
             if (index >= 0) {
                 const treeDataIn = this.treeData[index];
@@ -540,7 +540,7 @@ export default {
                     }
                 });
                 this.openWindow = window.open(routeData.href);
-            } else if (role.type == '车辆段信号楼') {
+            } else if (role.type == '车辆段/停车场调度') {
                 prdType = '05';
                 role.type = 'DEPOT_DISPATCHER';
                 this.$store.dispatch('training/setRoles', 'DEPOT_DISPATCHER');
@@ -552,10 +552,10 @@ export default {
                 prdType = '';
                 role.type = 'ELECTRIC_DISPATCHER';
                 this.$store.dispatch('training/setRoles', 'ELECTRIC_DISPATCHER');
-            } else if (role.type == '停车场信号楼') {
+            } else if (role.type == '车辆段/停车场信号楼') {
                 prdType = '';
-                role.type = 'PARKING_LOT_SIGNAL_BUILDING';
-                this.$store.dispatch('training/setRoles', 'PARKING_LOT_SIGNAL_BUILDING');
+                role.type = 'SIGNAL_BUILDING';
+                this.$store.dispatch('training/setRoles', 'SIGNAL_BUILDING');
 
             } else if (role.type == '车站助理') {
                 prdType = '01';
@@ -618,10 +618,10 @@ export default {
                     'DISPATCHER':'行调',
                     'DRIVER':'司机',
                     'MAINTAINER':'通号',
-                    'DEPOT_DISPATCHER':'车辆段信号楼',
+                    'DEPOT_DISPATCHER':'车辆段/停车场调度',
                     'PARENT_DEPARTMENT':'上级部门',
                     'ELECTRIC_DISPATCHER':'电力调度',
-                    'PARKING_LOT_SIGNAL_BUILDING':'停车场信号楼',
+                    'SIGNAL_BUILDING':'车辆段/停车场信号楼',
                     'STATION_ASSISTANT':'车站助理',
                     'STATION_MASTER':'车站站长',
                     'STATION_SIGNALER':'车站信号员',
diff --git a/src/views/system/companyManage/index.vue b/src/views/system/companyManage/index.vue
index 6b52d581d..575239929 100644
--- a/src/views/system/companyManage/index.vue
+++ b/src/views/system/companyManage/index.vue
@@ -8,9 +8,9 @@
 
 <script>
 import { getCompanyListPaging, deleteCompany, getCompanyQrCode } from '@/api/company';
+import { getAllBackProjectConfig} from '@/api/projectConfig';
 import EditCompany from './add';
 import QrCode from '@/components/QrCode';
-import { ProjectList } from '@/scripts/ProjectConfig';
 export default {
     name: 'CompanyManage',
     components: {
@@ -52,7 +52,7 @@ export default {
                         title: '关联项目',
                         prop: 'projectCodes',
                         type: 'tagMore',
-                        columnValue: (row) => { return this.$convertField(row.projectCodes, this.projectListNew, ['value', 'label'], true); },
+                        columnValue: (row) => { return this.$convertField(row.projectCodes || [], this.projectListNew, ['value', 'label'], true); },
                         tagType: (row) => { return 'success'; }
                     },
                     // {
@@ -96,9 +96,15 @@ export default {
         };
     },
     created() {
-        ProjectList.forEach(elem => {
-            // this.projectMap[elem.value.toUpperCase()] = elem.label;
-            this.projectListNew.push({value: elem.value.toUpperCase(), label: elem.label});
+        getAllBackProjectConfig().then(res=>{
+            const response = res.data || [];
+            const projectList = [];
+            response.forEach(elem => {
+                projectList.push({value: elem.code, label: elem.name});
+            });
+            this.projectListNew = projectList;
+        }).catch(() => {
+            this.$message.error('获取项目列表失败');
         });
     },
     methods: {
@@ -123,7 +129,7 @@ export default {
             this.$router.go(-1);
         },
         handleOrgDetail(index, row) {
-            this.$router.push({ path: `/system/companyManage/orgDetail`, query: { orgId: row.id } });
+            this.$router.push({ path: `/systemManagement/systemDataManagement/orgDetail`, query: { orgId: row.id } });
         },
         handleGenerateQrCode(index, row) {
             // let state = 2;
diff --git a/src/views/system/companyManage/orgDetail.vue b/src/views/system/companyManage/orgDetail.vue
index 0ee631242..bea2a4a9a 100644
--- a/src/views/system/companyManage/orgDetail.vue
+++ b/src/views/system/companyManage/orgDetail.vue
@@ -36,17 +36,31 @@
               移出
             </el-button>
           </span>
+          <span v-if="node.data.type === 'ORG'" @click.stop>
+            <el-button
+              type="text"
+              size="small"
+              @click="() => addNode(node,data)"
+            >
+              添加
+            </el-button>
+          </span>
         </span>
       </el-tree>
     </el-card>
+    <selectUserRole ref="selectUserRole" @add="addTreeUser" />
   </div>
 </template>
 
 <script>
 import { getOrgTreeById, deleteDepartUserRelation } from '@/api/company';
 import localStore from 'storejs';
+import selectUserRole from './selectUserRole.vue';
 export default {
     name: 'OrgDetail',
+    components: {
+        selectUserRole
+    },
     data() {
         return {
             filterText: '',
@@ -71,6 +85,12 @@ export default {
         localStore.set('orgDetail-treeKey-' + this.$route.query.orgId, this.expandedKeys);
     },
     methods: {
+        addTreeUser(data, parentId) {
+            this.$refs.tree && this.$refs.tree.append(data, parentId);
+        },
+        addNode(node, data) {
+            this.$refs.selectUserRole.doShow(data);
+        },
         initData() {
             getOrgTreeById(this.$route.query.orgId).then(resp => {
                 this.treeData = [];
diff --git a/src/views/system/companyManage/selectUserRole.vue b/src/views/system/companyManage/selectUserRole.vue
new file mode 100644
index 000000000..231d90189
--- /dev/null
+++ b/src/views/system/companyManage/selectUserRole.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog v-dialogDrag title="绑定组织成员" :visible.sync="dialogVisible" width="30%" :before-close="doClose" center :close-on-click-modal="false">
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doConfirm">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { getBindUserRoles, getManageUserList } from '@/api/management/user';
+import ConstConfig from '@/scripts/ConstConfig';
+
+export default {
+    name:'SelectUserRole',
+    props: {
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            userList: [],
+            formModel: {
+                keyId: '',
+                orgName: '',
+                orgId: '',
+                uid: '',
+                role:''
+            }
+        };
+    },
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '150px',
+                items: [
+                    { prop: 'orgName', label: '组织', type: 'text', disabled:true, rightWidth:true },
+                    { prop: 'uid', label: '用户', type: 'select', options: this.userList},
+                    { prop: 'role', label: '角色', type: 'select', options: ConstConfig.ConstSelect.schoolRoleList}
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                uid: [
+                    { required: true, message: '请选择用户', trigger: 'change' }
+                ],
+                role: [
+                    { required: true, message: '请选择角色', trigger: 'change' }
+                ]
+            };
+            return crules;
+        }
+    },
+    created() {
+        getManageUserList().then(resp => {
+            if (resp && resp.data && resp.data.length) {
+                resp.data.forEach(item => {
+                    this.userList.push({label: item.name, value: item.id});
+                });
+            }
+        }).catch((error) => {
+            console.error(error);
+        });
+    },
+    methods:{
+        doShow(row) {
+            this.dialogVisible = true;
+            this.formModel.orgName = row.name;
+            this.formModel.orgId = row.id;
+            this.formModel.uid = '';
+            this.formModel.role = '';
+            this.formModel.keyId = row.keyId;
+        },
+        doClose() {
+            this.dialogVisible = false;
+            this.formModel = {
+                keyId: '',
+                orgName: '',
+                orgId: '',
+                uid: '',
+                role:''
+            };
+        },
+        getUserName(id) {
+            let name = '';
+            const findItem = this.userList.find(item => {
+                return item.value == id;
+            });
+            if (findItem) {
+                name = findItem.label;
+            }
+            return name;
+        },
+        doConfirm() {
+            this.$refs.dataform.validateForm(() => {
+                const formModel = Object.assign({}, this.formModel);
+                delete formModel.orgName;
+                getBindUserRoles(formModel).then(res=>{
+                    const nodeData = {
+                        keyId: this.formModel.keyId + 'USER' + this.formModel.uid,
+                        name: this.getUserName(this.formModel.uid),
+                        orgRole: this.formModel.role,
+                        type: 'USER',
+                        userId: this.formModel.uid
+                    };
+                    this.$emit('add', nodeData, this.formModel.keyId);
+                    this.doClose();
+                }).catch((error) => {
+                    this.$message.error('绑定组织成员失败: ' + error.message);
+                });
+            });
+        }
+    }
+};
+</script>
+
diff --git a/src/views/system/deviceManage/add.vue b/src/views/system/deviceManage/add.vue
index c6895d4ae..04146c38f 100644
--- a/src/views/system/deviceManage/add.vue
+++ b/src/views/system/deviceManage/add.vue
@@ -13,19 +13,13 @@ import { createDevice, deviceIsExist} from '@/api/project';
 import ConstConfig from '@/scripts/ConstConfig';
 export default {
     name: 'DeviceAdd',
-    props: {
-        projectCode: {
-            type: String,
-            required: true
-        }
-    },
     data() {
         return {
             dialogVisible: false,
             formModel: {
                 code: '',
                 type: '',
-                projectCode: ''
+                project: ''
             },
             LessonList: [],
             UserList: [],
@@ -40,7 +34,8 @@ export default {
                 labelWidth: '120px',
                 items: [
                     { prop: 'code', label: this.$t('system.deviceCode'), type: 'text', required: true, placeholder: this.$t('rules.enterDeviceCode') },
-                    { prop: 'type', label: this.$t('system.deviceType1'), type: 'select', required: true, options: this.deviceTypeList, placeholder: this.$t('rules.selectDeviceType') }
+                    { prop: 'type', label: this.$t('system.deviceType1'), type: 'select', required: true, options: this.deviceTypeList, placeholder: this.$t('rules.selectDeviceType') },
+                    {prop: 'project', label:'所属项目', type: 'select', required: true, options:ConstConfig.ConstSelect.projectList }
                 ]
             };
             return form;
@@ -52,6 +47,9 @@ export default {
                 ],
                 type: [
                     { required: true, message: this.$t('rules.selectDeviceType'), trigger: 'change' }
+                ],
+                project: [
+                    { required: true, message: '请选择所属项目', trigger: 'change' }
                 ]
             };
             return crules;
@@ -65,7 +63,6 @@ export default {
     methods: {
         show(data) {
             this.dialogVisible = true;
-            this.formModel.projectCode = this.projectCode;
         },
         doSave() {
             const self = this;
@@ -73,7 +70,7 @@ export default {
                 const params = {
                     code: this.formModel.code,
                     type: this.formModel.type,
-                    projectCode: this.formModel.projectCode
+                    project: this.formModel.project
                 };
                 deviceIsExist(params.code).then(response => {
                     if (!response.data) {
@@ -95,7 +92,7 @@ export default {
             this.formModel = {
                 code: '',
                 type: '',
-                projectCode: ''
+                project: ''
             };
             this.$refs.dataform.resetForm();
             this.dialogVisible = false;
diff --git a/src/views/system/deviceManage/editConfig.vue b/src/views/system/deviceManage/editConfig.vue
index 4ad076c1a..9fe7f96d5 100644
--- a/src/views/system/deviceManage/editConfig.vue
+++ b/src/views/system/deviceManage/editConfig.vue
@@ -21,18 +21,50 @@
           />
         </el-select>
       </el-form-item>
-    </el-form>
-    <el-form v-show="data.type === 'LW'" ref="formLw" :model="formLw" label-width="100px" :rules="rulesLw">
-      <el-form-item label="关联地图:" prop="mapId">
-        <el-select v-model="formLw.mapId" placeholder="请选择" size="small" @change="mapIdChange">
+      <el-form-item label="关联角色:" prop="roleCode">
+        <el-select v-model="formIbp.roleCode" placeholder="请选择" size="small" @change="changeRoleIBP">
           <el-option
-            v-for="item in mapList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
+            v-for="item in roleList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="关联客户端:" prop="client">
+        <el-select v-model="formIbp.client" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in clientList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-form v-show="['IM','CW','DRIVE','DEPOT'].includes(data.type)" ref="formIm" :model="formIm" label-width="100px" :rules="rulesIm">
+      <el-form-item label="关联角色:" prop="roleCode">
+        <el-select v-model="formIm.roleCode" placeholder="请选择" size="small" @change="changeRoleIM">
+          <el-option
+            v-for="item in roleList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="关联客户端:" prop="client">
+        <el-select v-model="formIm.client" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in clientList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <el-form v-show="data.type === 'LW'" ref="formLw" :model="formLw" label-width="100px" :rules="rulesLw">
       <el-form-item label="关联车站:" prop="stationCode">
         <el-select v-model="formLw.stationCode" placeholder="请选择" size="small">
           <el-option
@@ -43,6 +75,26 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="关联角色:" prop="roleCode">
+        <el-select v-model="formLw.roleCode" placeholder="请选择" size="small" @change="changeRoleLW">
+          <el-option
+            v-for="item in roleList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="关联客户端:" prop="client">
+        <el-select v-model="formLw.client" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in clientList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-form v-show="data.type === 'ISCS_LW' || data.type === 'ISCS_CW'" ref="formIscs" :model="formIscs" label-width="100px" :rules="rulesIscs">
       <el-form-item :label="data.type === 'ISCS_LW'?'现地工作站:': '行调工作站'" prop="deviceCode">
@@ -75,6 +127,26 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="关联角色:" prop="roleCode">
+        <el-select v-model="formIscs.roleCode" placeholder="请选择" size="small" @change="changeRoleIscs">
+          <el-option
+            v-for="item in roleList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="关联客户端:" prop="client">
+        <el-select v-model="formIscs.client" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in clientList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
@@ -85,48 +157,88 @@
 
 <script>
 import { getDeviceDetail, getDevicesByType, setDeviceConfig } from '@/api/project';
-import { getAllMapOnline, getStationListNeedAttendant } from '@/api/jmap/map';
+import { getAllMapOnline, querySimulationMemberByMapId, querySimulationStationsByMapId } from '@/api/jmap/map';
+import { getBackProjectConfigByCode } from '@/api/projectConfig';
+import { getMapFunctioById } from '@/api/trainingPlatform';
+import ConstConfig from '@/scripts/ConstConfig';
 export default {
     name: 'EditConfig',
     data() {
         return {
             dialogVisible: false,
             data: {},
-            mapList: [],
+            clientListMap:{},
+            roleList:[],
             lwList: [],
+            formIm:{
+                roleCode:'',
+                client:''
+            },
             formIbp: {
                 part: '',
-                deviceCode: ''
+                deviceCode: '',
+                roleCode:'',
+                client:''
             },
             formLw: {
-                mapId: '',
-                stationCode: ''
+                stationCode: '',
+                roleCode:'',
+                client:''
             },
             formIscs: {
                 deviceCode: '',
                 picture: '',
-                stationCode: ''
+                stationCode: '',
+                roleCode:'',
+                client:''
             },
+            clientList: [],
             pictureList: [
                 { label: '广播系统', value: 'paMain' },
                 { label: '乘客信息', value: 'pidsMain' }
             ],
+            rulesIm:{
+                roleCode: [
+                    { required: true, message: '请选择关联角色', trigger: 'change'}
+                ],
+                client: [
+                    { required: true, message: '请选择关联客户端', trigger: 'change'}
+                ]
+            },
             rulesIbp: {
                 part: [
                     { required: true, message: '请选择显示位置', trigger: 'change' }
                 ],
                 deviceCode: [
                     { required: true, message: '请选择归属车站', trigger: 'change'}
+                ],
+                roleCode: [
+                    { required: true, message: '请选择关联角色', trigger: 'change'}
+                ],
+                client: [
+                    { required: true, message: '请选择关联客户端', trigger: 'change'}
                 ]
             },
             rulesLw: {
                 stationCode: [
                     { required: true, message: '请选择关联车站', trigger: 'change'}
+                ],
+                roleCode: [
+                    { required: true, message: '请选择关联角色', trigger: 'change'}
+                ],
+                client: [
+                    { required: true, message: '请选择关联客户端', trigger: 'change'}
                 ]
             },
             rulesIscs: {
                 deviceCode: [
                     { required: true, message: '请选择关联设备', trigger: 'change'}
+                ],
+                roleCode: [
+                    { required: true, message: '请选择关联角色', trigger: 'change'}
+                ],
+                client: [
+                    { required: true, message: '请选择关联客户端', trigger: 'change'}
                 ]
             },
             partList: [{label: '左', value: 'LEFT'}, {label: '右', value: 'RIGHT'}, {label: '全部', value: 'WHOLE'}],
@@ -142,11 +254,21 @@ export default {
         initData(row) {
             getDeviceDetail(row.id).then(resp => {
                 if (resp.data.config && resp.data.type === 'VR_IBP') {
-                    this.formIbp = JSON.parse(resp.data.config);
+                    this.formIbp = {part: '', deviceCode: '', roleCode:'', client:''};
+                    const form = JSON.parse(resp.data.config);
+                    this.formIbp = Object.assign(this.formIbp, form);
                 } else if (resp.data.config && resp.data.type === 'LW') {
-                    this.formLw = JSON.parse(resp.data.config);
+                    this.formLw = {stationCode: '', roleCode:'', client:''};
+                    const form = JSON.parse(resp.data.config);
+                    this.formLw = Object.assign(this.formLw, form);
+                } else if (resp.data.config && ['IM', 'CW', 'DRIVE', 'DEPOT'].includes(resp.data.type)) {
+                    this.formIm = { roleCode:'', client:''};
+                    const form = JSON.parse(resp.data.config);
+                    this.formIm = Object.assign(this.formIm, form);
                 } else if (resp.data.config && (resp.data.type === 'ISCS_LW' || resp.data.type === 'ISCS_CW')) {
-                    this.formIscs = JSON.parse(resp.data.config);
+                    this.formIscs = {deviceCode: '', picture: '', stationCode: '', roleCode:'', client:''};
+                    const form = JSON.parse(resp.data.config);
+                    this.formIscs = Object.assign(this.formIscs, form);
                 }
             }).catch(()=> {
                 this.$message.error('获取项目设备详情失败！');
@@ -154,12 +276,10 @@ export default {
         },
         doShow(row) {
             this.initData(row);
-            this.dialogVisible = true;
             this.data = row;
-            this.mapList = [];
             this.stationList = [];
             if (['VR_IBP', 'ISCS_LW'].includes(this.data.type)) {
-                getDevicesByType('LW').then(res => {
+                getDevicesByType(row.project, 'LW').then(res => {
                     if (res.data && res.data.length) {
                         this.lwList = res.data;
                     }
@@ -167,7 +287,7 @@ export default {
                     this.$message.error('获取设备列表失败！');
                 });
             } else if (this.data.type === 'ISCS_CW') {
-                getDevicesByType('CW').then(res => {
+                getDevicesByType(row.project, 'CW').then(res => {
                     if (res.data && res.data.length) {
                         this.lwList = res.data;
                     }
@@ -175,14 +295,15 @@ export default {
                     this.$message.error('获取设备列表失败！');
                 });
             }
-            getAllMapOnline().then(res => {
-                if (res.data && res.data.length) {
-                    this.mapList = res.data;
-                    this.formLw.mapId = this.mapList[0].id;
-                    this.mapIdChange(this.mapList[0].id);
+            getBackProjectConfigByCode(row.project).then(res=>{
+                const data = res.data;
+                this.dialogVisible = true;
+                this.roleList = [];
+                if (data.functionId) {
+                    if (data.mapId) { this.mapIdChange(data.mapId, data.functionId); }
+                } else {
+                    this.$message.error('请先配置项目信息');
                 }
-            }).catch(() => {
-                this.$message.error('获取地图列表失败！');
             });
         },
         doSave() {
@@ -209,6 +330,25 @@ export default {
                         self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
                     });
                 });
+            } else if (['IM', 'CW', 'DRIVE', 'DEPOT'].includes(this.data.type)) {
+                this.$refs.formIm.validate(() => {
+                    const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(this.formIm) };
+                    setDeviceConfig(data).then(response => {
+                        if (self.data.type == 'IM') {
+                            self.$message.success('设置教员机配置成功');
+                        } else if (self.data.type == 'CW') {
+                            self.$message.success('设置行调工作站配置成功');
+                        } else if (self.data.type == 'DEPOT') {
+                            self.$message.success('设置车辆段终端配置成功');
+                        } else {
+                            self.$message.success('设置列车驾驶终端配置成功');
+                        }
+                        self.handleClose();
+                        self.$emit('reloadTable');
+                    }).catch(error => {
+                        self.$message.error(this.$t('tip.modifyTheFailure') + error.message);
+                    });
+                });
             } else if (this.data.type === 'ISCS_LW') {
                 this.$refs.formIscs.validate(() => {
                     const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(this.formIscs) };
@@ -237,22 +377,138 @@ export default {
             this.dialogVisible = false;
             this.data = {};
             this.lwList = [];
+            this.formIbp = {part: '', deviceCode: '', roleCode:'', client:''};
+            this.formLw = {stationCode: '', roleCode:'', client:''};
+            this.formIm = { roleCode:'', client:''};
+            this.formIscs = {deviceCode: '', picture: '', stationCode: '', roleCode:'', client:''};
             this.$refs.formIbp.resetFields();
             this.$refs.formLw.resetFields();
             this.$refs.formIscs.resetFields();
         },
-        mapIdChange(mapId) {
+        mapIdChange(mapId, functionId) {
             if (mapId) {
-                getStationListNeedAttendant(mapId).then(resp => {
+                // const stationResp = await querySimulationStationsByMapId(this.$route.query.mapId);
+                querySimulationStationsByMapId(mapId).then(resp => {
                     if (resp.data && resp.data.length) {
                         this.stationList = resp.data;
                     }
                 }).catch(() => {
                     this.$message.error('获取车站列表失败');
                 });
+                querySimulationMemberByMapId(mapId).then(resp => {
+                    if (resp.data) {
+                        getMapFunctioById(functionId).then(response=>{
+                            if (resp.data) {
+                                const roleList = resp.data[response.data.simType];
+                                const clientListMapIn = ConstConfig.ConstSelect.clientMap;
+                                this.clientListMap = clientListMapIn[response.data.simType];
+                                const covertRoleList = [];
+                                roleList.forEach(member => {
+                                    const data = this.handleMember(member, this.stationList);
+                                    covertRoleList.push(data);
+                                });
+                                this.clientList = [];
+                                this.roleList = covertRoleList;
+                                const roleCode = this.formIbp.roleCode || this.formIm.roleCode || this.formLw.roleCode || this.formIscs.roleCode;
+                                const role = this.roleList.find(each=>{ return each.value == roleCode; });
+                                if (role) { this.clientList = this.clientListMap[role.memberType] || []; }
+                            }
+                        });
+                    }
+                }).catch(() => {
+                    this.$message.error('获取角色列表失败');
+                });
+
             } else {
                 this.stationList = [];
             }
+        },
+        changeRoleIBP(role) {
+            this.formIbp.client = '';
+            this.changeRole(role);
+        },
+        changeRoleIM(role) {
+            this.formIm.client = '';
+            this.changeRole(role);
+        },
+        changeRoleLW(role) {
+            this.formLw.client = '';
+            this.changeRole(role);
+        },
+        changeRoleIscs(role) {
+            this.formIscs.client = '';
+            this.changeRole(role);
+        },
+        changeRole(role) {
+            const roleMember = this.roleList.find(each=>{ return each.value == role; });
+            this.clientList = this.clientListMap[roleMember.memberType] || [];
+        },
+        handleMember(member, stationList) {
+            const data = { value: member.id, label: '', memberType: member.type };
+            const device = stationList.find(station => station.code === member.deviceCode) || {};
+            switch (member.type) {
+            case 'DISPATCHER':
+                data.label = '行调' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SUPERVISOR':
+                data.label = '行值-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DRIVER':
+                data.label = '司机-' + member.deviceCode;
+                break;
+            case 'MAINTAINER':
+                data.label = '通号' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEPOT_DISPATCHER':
+                data.label = '调度-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SIGNAL_BUILDING':
+                data.label = '信号楼-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_ASSISTANT':
+                data.label = '助理-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_MASTER':
+                data.label = '站长-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SIGNALER':
+                data.label = '信号员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_PASSENGER':
+                data.label = '客运员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SWITCH_MAN':
+                data.label = '扳道员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_FACILITATOR':
+                data.label = '引导员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_WORKER':
+                data.label = '工务工-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEVICE_MANAGER':
+                data.label = '设备管理员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'TRAIN_MASTER':
+                data.label = '车务段段长' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ELECTRIC_DISPATCHER':
+                data.label = '工电调度' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'PARENT_DEPARTMENT':
+                data.label = '上级部分' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SCHEDULING':
+                data.label = '派班员' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SHIFT_MANAGER':
+                data.label = '值班主任' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ENVIRONMENT_DISPATCHER':
+                data.label = '环控调度' + (member.name ? `-${member.name}` : '');
+                break;
+            }
+            return data;
         }
     }
 };
diff --git a/src/views/system/deviceManage/editConfigGateway.vue b/src/views/system/deviceManage/editConfigGateway.vue
index d4693c46b..a771f616e 100644
--- a/src/views/system/deviceManage/editConfigGateway.vue
+++ b/src/views/system/deviceManage/editConfigGateway.vue
@@ -43,6 +43,29 @@
     <!--</el-form-item>-->
     <!--</el-form>-->
     <el-input v-model="jsonConfig" autosize type="textarea" />
+    <el-form v-show="['PIS_STAND','PIS_TRAIN'].includes(data.type)" ref="formPis" :model="formPis" label-width="100px" :rules="rulesPis" style="margin-top:10px">
+      <!--  -->
+      <el-form-item label="关联角色:" prop="roleCode">
+        <el-select v-model="formPis.roleCode" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in roleList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="关联客户端:" prop="client">
+        <el-select v-model="formPis.client" placeholder="请选择" size="small">
+          <el-option
+            v-for="item in clientList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
       <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
@@ -52,7 +75,11 @@
 
 <script>
 import { setDeviceConfig, getDeviceDetail } from '@/api/project';
-import { getAllMapOnline, getStationListNeedAttendant, getPsdListByStandCode, getStandListByStationCode } from '@/api/jmap/map';
+import ConstConfig from '@/scripts/ConstConfig';
+// getAllMapOnline, getStationListNeedAttendant, getPsdListByStandCode, getStandListByStationCode
+import {querySimulationMemberByMapId, querySimulationStationsByMapId } from '@/api/jmap/map';
+import { getBackProjectConfigByCode } from '@/api/projectConfig';
+import { getMapFunctioById } from '@/api/trainingPlatform';
 
 export default {
     name: 'EditConfigGateway',
@@ -60,13 +87,18 @@ export default {
         return {
             dialogVisible: false,
             inline: true,
-            formModel: {},
-            formLeft: {},
-            formRight: {},
-            leftRules: {},
-            rightRules: {},
-            setDeviceConfigFunction: null,
+            // formModel: {},
+            // formLeft: {},
+            // formRight: {},
+            // leftRules: {},
+            // rightRules: {},
+            // setDeviceConfigFunction: null,
+            clientList: ConstConfig.ConstSelect.clientList,
             data: {},
+            formPis:{
+                roleCode:'',
+                client:''
+            },
             titleMap: {
                 SWITCH: '道岔',
                 PSD:'屏蔽门',
@@ -78,15 +110,24 @@ export default {
                 UDP_CLIENT: 'UDP客户端',
                 PIS_STAND: '站台PIS',
                 PIS_TRAIN: '列车PIS',
+                UDP_LOW:'UDP下位机'
             },
-            mapId: '',
             mapList: [],
-            stationCode: '',
+            roleList:[],
+            // stationCode: '',
             stationList: [],
-            standList: [],
-            standCode: '',
-            psdList: [],
-            jsonConfig: ''
+            // standList: [],
+            // standCode: '',
+            // psdList: [],
+            jsonConfig: '',
+            rulesPis: {
+                roleCode: [
+                    { required: true, message: '请选择关联角色', trigger: 'change'}
+                ],
+                client: [
+                    { required: true, message: '请选择关联客户端', trigger: 'change'}
+                ]
+            }
         };
     },
     computed: {
@@ -105,37 +146,58 @@ export default {
         initData(row) {
             this.jsonConfig = '{}';
             getDeviceDetail(row.id).then(resp => {
+                this.formPis = {roleCode:'', client:''};
                 if (resp.data.config) {
-                    this.formModel = JSON.parse(resp.data.config);
-                    this.jsonConfig = JSON.stringify(JSON.parse(resp.data.config), null, 4);
+                    // this.formModel = JSON.parse(resp.data.config);
+                    const config = JSON.parse(resp.data.config);
+                    const jsonConfig = Object.assign({}, config);
+                    delete jsonConfig.roleCode;
+                    delete jsonConfig.client;
+                    this.jsonConfig = JSON.stringify(jsonConfig, null, 4);
+                    if (['PIS_STAND', 'PIS_TRAIN'].includes(row.type)) {
+                        getBackProjectConfigByCode(row.project).then(res=>{
+                            const data = res.data;
+                            this.dialogVisible = true;
+                            this.roleList = [];
+                            if (config.roleCode) { this.formPis.roleCode = config.roleCode; }
+                            if (config.client) { this.formPis.client = config.client; }
+                            if (data.functionId) {
+                                if (data.mapId) { this.mapIdChange(data.mapId, data.functionId); }
+                            } else {
+                                this.$message.error('请先配置项目信息');
+                            }
+                        });
+                    }
                 }
             }).catch((e)=> {
                 this.$message.error('获取项目设备详情失败！');
             });
-            if (row.type === 'PSL' || row.type === 'PSC') {
-                getAllMapOnline().then(resp => {
-                    if (resp.data && resp.data.length) {
-                        this.mapList = resp.data;
-                        this.mapId = this.mapList[0].id;
-                        this.mapIdChange(this.mapList[0].id);
-                    }
-                }).catch(() => {
-                    this.$message.error('获取地图列表失败');
-                });
-            }
+            // if (row.type === 'PSL' || row.type === 'PSC') {
+            //     getAllMapOnline().then(resp => {
+            //         if (resp.data && resp.data.length) {
+            //             this.mapList = resp.data;
+            //             this.mapId = this.mapList[0].id;
+            //             this.mapIdChange(this.mapList[0].id);
+            //         }
+            //     }).catch(() => {
+            //         this.$message.error('获取地图列表失败');
+            //     });
+            // }
         },
         doShow(row) {
-            this.initData(row);
-            // this.initForm(row);
-            this.dialogVisible = true;
             this.data = row;
+            // this.initForm(row);
+            this.stationList = [];
+            this.initData(row);
+            this.dialogVisible = true;
         },
         doSave() {
             const self = this;
             let flag = true;
-            if (this.$refs.form) {
-                this.$refs.form.validate((valid) => {
+            if (this.$refs.formPis) {
+                this.$refs.formPis.validate((valid) => {
                     flag = valid;
+                    this.jsonConfig = JSON.stringify(Object.assign(JSON.parse(this.jsonConfig), this.formPis));
                 });
             }
             // const form = JSON.parse(this.jsonConfig);
@@ -160,53 +222,146 @@ export default {
             // }
         },
         handleClose() {
-            this.formModel = {};
+            // this.formModel = {};
             this.data = {};
             this.mapList = [];
             this.stationList = [];
-            this.standList = [];
-            this.psdList = [];
+            // this.standList = [];
+            // this.psdList = [];
             this.mapId = '';
-            this.stationCode = '';
-            this.standCode = '';
+            // this.stationCode = '';
+            // this.standCode = '';
             this.dialogVisible = false;
             this.$refs.form && this.$refs.form.resetFields();
         },
-        mapIdChange(mapId) {
-            this.stationList = [];
+        mapIdChange(mapId, functionId) {
             if (mapId) {
-                getStationListNeedAttendant(mapId).then(resp => {
+                querySimulationStationsByMapId(mapId).then(resp => {
                     if (resp.data && resp.data.length) {
                         this.stationList = resp.data;
                     }
                 }).catch(() => {
                     this.$message.error('获取车站列表失败');
                 });
-            }
-        },
-        stationCodeChange(stationCode) {
-            this.standList = [];
-            if (stationCode) {
-                getStandListByStationCode(this.mapId, stationCode).then(resp => {
-                    if (resp.data && resp.data.length) {
-                        this.standList = resp.data;
+                querySimulationMemberByMapId(mapId).then(resp => {
+                    if (resp.data) {
+                        getMapFunctioById(functionId).then(response=>{
+                            if (resp.data) {
+                                const roleList = resp.data[response.data.simType];
+                                const covertRoleList = [];
+                                roleList.forEach(member => {
+                                    const data = this.handleMember(member, this.stationList);
+                                    covertRoleList.push(data);
+                                });
+                                this.roleList = covertRoleList;
+                            }
+                        });
                     }
                 }).catch(() => {
-                    this.$message.error('获取站台列表失败');
+                    this.$message.error('获取角色列表失败');
                 });
             }
+            // this.stationList = [];
+            // if (mapId) {
+            //     getStationListNeedAttendant(mapId).then(resp => {
+            //         if (resp.data && resp.data.length) {
+            //             this.stationList = resp.data;
+            //         }
+            //     }).catch(() => {
+            //         this.$message.error('获取车站列表失败');
+            //     });
+            // }
         },
-        standCodeChange(standCode) {
-            this.psdList = [];
-            if (standCode) {
-                getPsdListByStandCode(this.mapId, standCode).then(resp => {
-                    if (resp.data && resp.data.length) {
-                        this.psdList = resp.data;
-                    }
-                }).catch(() => {
-                    this.$message.error('获取屏蔽门列表失败');
-                });
+        // stationCodeChange(stationCode) {
+        //     this.standList = [];
+        //     if (stationCode) {
+        //         getStandListByStationCode(this.mapId, stationCode).then(resp => {
+        //             if (resp.data && resp.data.length) {
+        //                 this.standList = resp.data;
+        //             }
+        //         }).catch(() => {
+        //             this.$message.error('获取站台列表失败');
+        //         });
+        //     }
+        // },
+        // standCodeChange(standCode) {
+        //     this.psdList = [];
+        //     if (standCode) {
+        //         getPsdListByStandCode(this.mapId, standCode).then(resp => {
+        //             if (resp.data && resp.data.length) {
+        //                 this.psdList = resp.data;
+        //             }
+        //         }).catch(() => {
+        //             this.$message.error('获取屏蔽门列表失败');
+        //         });
+        //     }
+        // }
+        handleMember(member, stationList) {
+            const data = { value: member.id, label: '', memberType: member.type };
+            const device = stationList.find(station => station.code === member.deviceCode) || {};
+            switch (member.type) {
+            case 'DISPATCHER':
+                data.label = '行调' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SUPERVISOR':
+                data.label = '行值-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DRIVER':
+                data.label = '司机-' + member.deviceCode;
+                break;
+            case 'MAINTAINER':
+                data.label = '通号' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEPOT_DISPATCHER':
+                data.label = '调度-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SIGNAL_BUILDING':
+                data.label = '信号楼-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_ASSISTANT':
+                data.label = '助理-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_MASTER':
+                data.label = '站长-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SIGNALER':
+                data.label = '信号员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_PASSENGER':
+                data.label = '客运员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SWITCH_MAN':
+                data.label = '扳道员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_FACILITATOR':
+                data.label = '引导员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_WORKER':
+                data.label = '工务工-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEVICE_MANAGER':
+                data.label = '设备管理员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'TRAIN_MASTER':
+                data.label = '车务段段长' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ELECTRIC_DISPATCHER':
+                data.label = '工电调度' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'PARENT_DEPARTMENT':
+                data.label = '上级部分' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SCHEDULING':
+                data.label = '派班员' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SHIFT_MANAGER':
+                data.label = '值班主任' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ENVIRONMENT_DISPATCHER':
+                data.label = '环控调度' + (member.name ? `-${member.name}` : '');
+                break;
             }
+            return data;
         }
     }
 };
diff --git a/src/views/system/deviceManage/editConfigScreen.vue b/src/views/system/deviceManage/editConfigScreen.vue
index f62d2a5b2..305b05310 100644
--- a/src/views/system/deviceManage/editConfigScreen.vue
+++ b/src/views/system/deviceManage/editConfigScreen.vue
@@ -10,14 +10,18 @@
 
 <script>
 import { getDevicesByType, getDeviceDetail, setDeviceConfig } from '@/api/project';
-import { getAllMapOnline, getStationListNeedAttendant, getPsdListByStandCode, getStandListByStationCode } from '@/api/jmap/map';
-
+// getStationListNeedAttendant
+import { getAllMapOnline, getPublishMapListOnline, querySimulationStationsByMapId, getPsdListByStandCode, getStandListByStationCode, querySimulationMemberByMapId} from '@/api/jmap/map';
+import ConstConfig from '@/scripts/ConstConfig';
+import { getBackProjectConfigByCode } from '@/api/projectConfig';
+import { getMapFunctioById } from '@/api/trainingPlatform';
 export default {
     name: 'EditConfigScreen',
     data() {
         return {
             dialogVisible: false,
             data: {},
+            clientList:[],
             screenList: [
                 { label: '第一屏', value: 1 },
                 { label: '第二屏', value: 2 },
@@ -36,7 +40,9 @@ export default {
                 psdCode: '',
                 mapId: '',
                 stationCode: '',
-                standCode: ''
+                standCode: '',
+                roleCode:'',
+                client:''
             },
             rules: {
                 addr: [
@@ -53,18 +59,26 @@ export default {
                 ],
                 psdCode: [
                     { required: true, message: '请选择关联屏蔽门', trigger: 'change'}
+                ],
+                roleCode: [
+                    { required: true, message: '请选择关联角色', trigger: 'change'}
+                ],
+                client: [
+                    { required: true, message: '请选择关联客户端', trigger: 'change'}
                 ]
             },
-            mapList: [],
             stationList: [],
             standList: [],
-            psdList: []
+            psdList: [],
+            roleList:[],
+            clientListMap:{}
         };
     },
     computed: {
         title() {
             return '编辑设备配置';
         },
+        // 'LSW', 'CCTV', 'VR_PSD', 'PLC_GATEWAY', 'SANDBOX', 'ILW'
         formItem() {
             let form = {labelWidth: '150px', item: []};
             if (this.data.type === 'PLC_GATEWAY') {
@@ -80,10 +94,11 @@ export default {
                     labelWidth: '150px',
                     items: [
                         { prop: 'deviceCode', label: '教研机:', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code' },
-                        { prop: 'mapId', label: '关联地图:', type: 'select', options: this.mapList, optionLabel: 'name', optionValue: 'id', deviceChange: this.mapIdChange},
                         { prop: 'stationCode', label: '关联车站:', type: 'select', options: this.stationList, optionLabel: 'name', optionValue: 'code', deviceChange: this.stationCodeChange},
                         { prop: 'standCode', label: '关联站台:', type: 'select', options: this.standList, optionLabel: 'name', optionValue: 'code', deviceChange: this.standCodeChange},
-                        { prop: 'psdCode', label: '关联屏蔽门:', type: 'select', options: this.psdList, optionLabel: 'code', optionValue: 'code' }
+                        { prop: 'psdCode', label: '关联屏蔽门:', type: 'select', options: this.psdList, optionLabel: 'code', optionValue: 'code' },
+                        { prop: 'roleCode', label: '关联角色:', type: 'select', options: this.roleList, optionLabel: 'label', optionValue: 'value', deviceChange:this.roleChange },
+                        { prop: 'client', label: '关联客户端:', type: 'select', options: this.clientList, optionLabel: 'label', optionValue: 'value' }
                     ]
                 };
             } else if (this.data.type === 'LSW') {
@@ -91,28 +106,36 @@ export default {
                     labelWidth: '150px',
                     items: [
                         { prop: 'deviceCode', label: '教研机:', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code' },
-                        { prop: 'quadrant', label: '屏幕配置:', type: 'select', options: this.screenList, optionLabel: 'label', optionValue: 'value'}
+                        { prop: 'quadrant', label: '屏幕配置:', type: 'select', options: this.screenList, optionLabel: 'label', optionValue: 'value'},
+                        { prop: 'roleCode', label: '关联角色:', type: 'select', options: this.roleList, optionLabel: 'label', optionValue: 'value', deviceChange:this.roleChange },
+                        { prop: 'client', label: '关联客户端:', type: 'select', options: this.clientList, optionLabel: 'label', optionValue: 'value' }
                     ]
                 };
             } else if (this.data.type === 'CCTV') {
                 form = {
                     labelWidth: '150px',
                     items: [
-                        { prop: 'deviceCode', label: '教研机:', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code' }
+                        { prop: 'deviceCode', label: '教研机:', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code' },
+                        { prop: 'roleCode', label: '关联角色:', type: 'select', options: this.roleList, optionLabel: 'label', optionValue: 'value', deviceChange:this.roleChange },
+                        { prop: 'client', label: '关联客户端:', type: 'select', options: this.clientList, optionLabel: 'label', optionValue: 'value' }
                     ]
                 };
             } else if ( this.data.type === 'SANDBOX') {
                 form = {
                     labelWidth: '150px',
                     items: [
-                        { prop: 'deviceCode', label: '教研机', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code'}
+                        { prop: 'deviceCode', label: '教研机', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code'},
+                        { prop: 'roleCode', label: '关联角色:', type: 'select', options: this.roleList, optionLabel: 'label', optionValue: 'value', deviceChange:this.roleChange },
+                        { prop: 'client', label: '关联客户端:', type: 'select', options: this.clientList, optionLabel: 'label', optionValue: 'value' }
                     ]
                 };
             } else if (this.data.type === 'ILW') {
                 form = {
                     labelWidth: '150px',
                     items: [
-                        { prop: 'deviceCode', label: '教研机', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code'}
+                        { prop: 'deviceCode', label: '教研机', type: 'select', options: this.deviceList, optionLabel: 'code', optionValue: 'code'},
+                        { prop: 'roleCode', label: '关联角色:', type: 'select', options: this.roleList, optionLabel: 'label', optionValue: 'value', deviceChange:this.roleChange },
+                        { prop: 'client', label: '关联客户端:', type: 'select', options: this.clientList, optionLabel: 'label', optionValue: 'value' }
                     ]
                 };
             }
@@ -121,7 +144,7 @@ export default {
     },
     methods: {
         initData(row) {
-            getDevicesByType('IM').then(resp => {
+            getDevicesByType(row.project, 'IM').then(resp => {
                 this.deviceList = resp.data;
             }).catch(()=> {
                 this.$message.error('获取项目设备详情失败！');
@@ -137,34 +160,141 @@ export default {
                     quadrant: data.quadrant,
                     deviceCode: data.deviceCode,
                     psdCode: data.psdCode,
+                    roleCode:data.roleCode || '',
+                    client:data.client || '',
                     addr: data.addr,
                     quantity: data.quantity
                 };
+                if (['VR_PSD', 'LSW', 'CCTV', 'SANDBOX', 'ILW'].includes(row.type)) {
+                    // getPublishMapListOnline().then(resp => {
+                    //     if (resp.data && resp.data.length) {
+                    //         this.mapList = resp.data;
+                    //         if (this.formData.mapId) { this.mapIdChange(this.formData.mapId); }
+                    //     }
+                    // }).catch(() => {
+                    //     this.$message.error('获取地图列表失败');
+                    // });
+                    getBackProjectConfigByCode(row.project).then(res=>{
+                        const data = res.data;
+                        this.dialogVisible = true;
+                        this.roleList = [];
+                        if (data.functionId) {
+                            if (data.mapId) { this.mapIdChange(data.mapId, data.functionId); }
+                        } else {
+                            this.$message.error('请先配置项目信息');
+                        }
+                    });
+                }
             });
-            if (row.type === 'VR_PSD') {
-                getAllMapOnline().then(resp => {
-                    if (resp.data && resp.data.length) {
-                        this.mapList = resp.data;
-                        this.formData.mapId = this.mapList[0].id;
-                        this.mapIdChange(this.mapList[0].id);
-                    }
-                }).catch(() => {
-                    this.$message.error('获取地图列表失败');
-                });
-            }
         },
-        mapIdChange(mapId) {
+        mapIdChange(mapId, functionId) {
             this.stationList = [];
             if (mapId) {
-                getStationListNeedAttendant(mapId).then(resp => {
+                querySimulationStationsByMapId(mapId).then(resp => {
                     if (resp.data && resp.data.length) {
                         this.stationList = resp.data;
                     }
+                    const self = this;
+                    querySimulationMemberByMapId(mapId).then(resp => {
+                        if (resp.data) {
+                            getMapFunctioById(functionId).then(response=>{
+                                if (resp.data) {
+                                    const roleList = resp.data[response.data.simType];
+                                    const clientListMapIn = ConstConfig.ConstSelect.clientMap;
+                                    this.clientListMap = clientListMapIn[response.data.simType];
+                                    const covertRoleList = [];
+                                    roleList.forEach(member => {
+                                        const data = self.handleMember(member, self.stationList);
+                                        covertRoleList.push(data);
+                                    });
+                                    this.clientList = [];
+                                    self.roleList = covertRoleList;
+                                    const roleCode = this.formData.roleCode;
+                                    const role = this.roleList.find(each=>{ return each.value == roleCode; });
+                                    if (role) { this.clientList = this.clientListMap[role.memberType] || []; }
+                                }
+                            });
+                        }
+                    }).catch(() => {
+                        this.$message.error('获取角色列表失败');
+                    });
                 }).catch(() => {
                     this.$message.error('获取车站列表失败');
                 });
             }
         },
+        roleChange(role) {
+            this.formData.client = '';
+            const roleMember = this.roleList.find(each=>{ return each.value == role; });
+            if (roleMember) { this.clientList = this.clientListMap[roleMember.memberType] || []; }
+        },
+        handleMember(member, stationList) {
+            const data = { value: member.id, label: '', memberType: member.type };
+            const device = stationList.find(station => station.code === member.deviceCode) || {};
+            switch (member.type) {
+            case 'DISPATCHER':
+                data.label = '行调' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SUPERVISOR':
+                data.label = '行值-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DRIVER':
+                data.label = '司机-' + member.deviceCode;
+                break;
+            case 'MAINTAINER':
+                data.label = '通号' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEPOT_DISPATCHER':
+                data.label = '调度-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SIGNAL_BUILDING':
+                data.label = '信号楼-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_ASSISTANT':
+                data.label = '助理-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_MASTER':
+                data.label = '站长-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SIGNALER':
+                data.label = '信号员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_PASSENGER':
+                data.label = '客运员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_SWITCH_MAN':
+                data.label = '扳道员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_FACILITATOR':
+                data.label = '引导员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'STATION_WORKER':
+                data.label = '工务工-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'DEVICE_MANAGER':
+                data.label = '设备管理员-' + device.name + (member.name ? `-${member.name }` : '');
+                break;
+            case 'TRAIN_MASTER':
+                data.label = '车务段段长' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ELECTRIC_DISPATCHER':
+                data.label = '工电调度' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'PARENT_DEPARTMENT':
+                data.label = '上级部分' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SCHEDULING':
+                data.label = '派班员' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'SHIFT_MANAGER':
+                data.label = '值班主任' + (member.name ? `-${member.name }` : '');
+                break;
+            case 'ENVIRONMENT_DISPATCHER':
+                data.label = '环控调度' + (member.name ? `-${member.name}` : '');
+                break;
+            }
+            return data;
+        },
         stationCodeChange(stationCode) {
             this.standList = [];
             if (stationCode) {
@@ -195,7 +325,10 @@ export default {
                 this.$refs.dataForm.validateForm(() => {
                     const param = {
                         deviceCode: this.formData.deviceCode,
-                        quadrant: this.formData.quadrant
+                        quadrant: this.formData.quadrant,
+                        roleCode: this.formData.roleCode,
+                        mapId:this.formData.mapId,
+                        client: this.formData.client
                     };
                     const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
                     setDeviceConfig(data).then(() => {
@@ -209,7 +342,10 @@ export default {
             } else if (this.data.type == 'CCTV') {
                 this.$refs.dataForm.validateForm(() => {
                     const param = {
-                        deviceCode: this.formData.deviceCode
+                        deviceCode: this.formData.deviceCode,
+                        roleCode: this.formData.roleCode,
+                        mapId:this.formData.mapId,
+                        client: this.formData.client
                     };
                     const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
                     setDeviceConfig(data).then(() => {
@@ -224,7 +360,10 @@ export default {
                 this.$refs.dataForm.validateForm(() => {
                     const param = {
                         deviceCode: this.formData.deviceCode,
-                        psdCode: this.formData.psdCode
+                        psdCode: this.formData.psdCode,
+                        mapId:this.formData.mapId,
+                        roleCode: this.formData.roleCode,
+                        client: this.formData.client
                     };
                     const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
                     setDeviceConfig(data).then(() => {
@@ -253,7 +392,10 @@ export default {
             } else if (this.data.type === 'SANDBOX') {
                 this.$refs.dataForm.validateForm(() => {
                     const param = {
-                        deviceCode: this.formData.deviceCode
+                        deviceCode: this.formData.deviceCode,
+                        roleCode: this.formData.roleCode,
+                        mapId:this.formData.mapId,
+                        client: this.formData.client
                     };
                     const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
                     setDeviceConfig(data).then(() => {
@@ -267,7 +409,9 @@ export default {
             } else if (this.data.type === 'ILW') {
                 this.$refs.dataForm.validateForm(() => {
                     const param = {
-                        deviceCode: this.formData.deviceCode
+                        deviceCode: this.formData.deviceCode,
+                        roleCode: this.formData.roleCode,
+                        client: this.formData.client
                     };
                     const data = {id: this.data.id, project: this.data.project, code: this.data.code, type: this.data.type, config: JSON.stringify(param) };
                     setDeviceConfig(data).then(() => {
@@ -283,11 +427,11 @@ export default {
         handleClose() {
             this.dialogVisible = false;
             this.data = {};
-            this.mapList = [];
             this.stationList = [];
             this.standList = [];
             this.psdList = [];
-            this.mapId = '';
+            // this.mapId = '';
+            this.roleList = [];
             this.stationCode = '';
             this.standCode = '';
             this.deviceList = [];
diff --git a/src/views/system/deviceManage/index.vue b/src/views/system/deviceManage/index.vue
index c5d829e44..b9551597b 100644
--- a/src/views/system/deviceManage/index.vue
+++ b/src/views/system/deviceManage/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <device-add ref="add" :project-code="projectCode" @reloadTable="reloadTable" />
+    <device-add ref="add" @reloadTable="reloadTable" />
     <edit-config-gateway ref="editConfigGateway" @reloadTable="reloadTable" />
     <edit-config ref="editConfig" @reloadTable="reloadTable" />
     <edit-config-screen ref="editConfigScreen" @reloadTable="reloadTable" />
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { getProjectDeviceList, deleteProjectDevice } from '@/api/project';
+import { getProjectDeviceList, deleteProjectDevice, getDeviceDetail } from '@/api/project';
 import DeviceAdd from './add';
 import EditConfigGateway from './editConfigGateway';
 import EditConfig from './editConfig';
@@ -29,7 +29,7 @@ export default {
         EditConfigIbp
     },
     data() {
-        const noShowPathType = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'IBP', 'SECTION', 'TRAIN', 'UDP_CLIENT'];
+        const noShowPathType = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'IBP', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PLC_GATEWAY', 'UDP_LOW', 'PSC'];
         return {
             examResultList: [],
             url: '',
@@ -37,39 +37,9 @@ export default {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
             },
+            // projectCode:'',
             deviceTypeList:ConstConfig.ConstSelect.projectDeviceTypeList,
-            projectList: [
-                {label:'西铁院', value: 'XTY'},
-                {label: '贵州装备', value:'GZB'},
-                {label: '哈尔滨', value:'HEB'},
-                {label: '苏电院', value:'SDY'},
-                {label: '中航锐创（实训室）', value: 'RICHOR_JOINT'},
-                {label: '上饶沙盘', value: 'SR_SANDBOX'},
-                {label: '江西工贸', value: 'JXGM'},
-                {label: '扬州工业', value: 'RICHOR_YGY'},
-                {label: '红河财经', value: 'RICHOR_HHCJ'},
-                {label: '苏安院', value: 'SAY'},
-                {label: '众合-陕铁院', value: 'UNITTEC_STY'},
-                {label: '教学通用', value: 'TEACHING'},
-                {label: '长兴技校', value: 'RICHOR_CXJS'},
-                {label: '京津冀联盟', value: 'JJJLM'}
-            ],
-            projectMap: {
-                designxty: 'XTY',
-                designgzb: 'GZB',
-                designheb: 'HEB',
-                designsdy: 'SDY',
-                designrichorjoint: 'RICHOR_JOINT',
-                designsrsandbox: 'SR_SANDBOX',
-                designjxgm: 'JXGM',
-                designygy: 'RICHOR_YGY',
-                designsay: 'SAY',
-                designunittecsty: 'UNITTEC_STY',
-                designrichorhhcj: 'RICHOR_HHCJ',
-                designteaching: 'TEACHING',
-                designrichorcxjs: 'RICHOR_CXJS'
-
-            },
+            projectList: ConstConfig.ConstSelect.projectList,
             queryForm: {
                 labelWidth: '120px',
                 reset: true,
@@ -85,6 +55,13 @@ export default {
                         config: {
                             data: ConstConfig.ConstSelect.projectDeviceTypeList
                         }
+                    },
+                    projectCode:{
+                        type: 'select',
+                        label: '所属项目',
+                        config: {
+                            data: ConstConfig.ConstSelect.projectList
+                        }
                     }
                 }
 
@@ -148,16 +125,12 @@ export default {
             currentModel: {}
         };
     },
-    computed: {
-        projectCode() {
-            return this.projectMap[getSessionStorage('project')];
-        }
-    },
     created() {
+        // this.projectCode = getSessionStorage('project') || '';
     },
     methods: {
         beforeQuery(params) {
-            params.projectCode = this.projectCode;
+            // params.projectCode = this.projectCode;
             return params;
         },
         createProjectDevice() {
@@ -206,11 +179,11 @@ export default {
         },
         editConfig(index, row) {
             const configGatewayList = ['SWITCH', 'SIGNAL', 'PSD', 'PSL', 'PSC', 'UDP_LOW', 'SECTION', 'TRAIN', 'UDP_CLIENT', 'PIS_STAND', 'PIS_TRAIN'];
-            if (['LW', 'VR_IBP', 'ISCS_LW', 'ISCS_CW'].includes(row.type)) {
+            if (['LW', 'VR_IBP', 'ISCS_LW', 'ISCS_CW', 'IM', 'CW', 'DRIVE', 'DEPOT'].includes(row.type)) {
                 this.$refs.editConfig.doShow(row);
             } else if (configGatewayList.includes(row.type)) {
                 this.$refs.editConfigGateway.doShow(row);
-            } else if (row.type == 'LSW' || row.type == 'CCTV' || row.type == 'VR_PSD' || row.type === 'PLC_GATEWAY' || row.type === 'SANDBOX' || row.type === 'ILW') {
+            } else if (['LSW', 'CCTV', 'VR_PSD', 'PLC_GATEWAY', 'SANDBOX', 'ILW'].includes(row.type)) {
                 this.$refs.editConfigScreen.doShow(row);
             } else if (row.type === 'IBP') {
                 this.$refs.editConfigIbp.doShow(row);
@@ -222,21 +195,30 @@ export default {
             this.queryList.reload();
         },
         getPath(index, row) {
-            let url = '';
-            url = `${window.location.protocol}//${window.location.host}/cbtc/login?project=${row.project.toLowerCase().replace(/_/, '')}&projectDevice=${row.code}&type=${row.type}`;
-            this.url = url;
-            this.$messageBox();
-            this.$confirm(`登录路径：${url}`, '登录路径', {
-                confirmButtonText: '复制路径',
-                cancelButtonText: '关闭',
-                type: 'success'
-            }).then(() => {
-                const inputText = document.getElementById('device-manage-url');
-                inputText.select(); // 选择对象
-                document.execCommand('Copy'); // 执行浏览器复制命令
-                this.$message.success('登录路径已经复制到粘贴板');
+            getDeviceDetail(row.id).then(res=>{
+                if (res.data) {
+                    let url = '';
+                    url = `${window.location.protocol}//${window.location.host}/cbtc/login?project=${row.project.toLowerCase().replace(/_/, '')}&projectDevice=${row.code}&type=${row.type}`;
+                    this.url = url;
+                    this.$messageBox();
+                    this.$confirm(`登录路径：${url}`, '登录路径', {
+                        confirmButtonText: '复制路径',
+                        cancelButtonText: '关闭',
+                        type: 'success'
+                    }).then(() => {
+                        const inputText = document.getElementById('device-manage-url');
+                        inputText.select(); // 选择对象
+                        document.execCommand('Copy'); // 执行浏览器复制命令
+                        this.$message.success('登录路径已经复制到粘贴板');
+                    });
+                }
             });
         }
     }
 };
 </script>
+<style lang="scss">
+.el-message-box__message p {
+    word-break: break-word;
+}
+</style>
diff --git a/src/views/system/existingSimulation/index.vue b/src/views/system/existingSimulation/index.vue
index 86bdc1ed4..aa1c06895 100644
--- a/src/views/system/existingSimulation/index.vue
+++ b/src/views/system/existingSimulation/index.vue
@@ -5,11 +5,9 @@
   </div>
 </template>
 <script>
-import ConstConfig from '@/scripts/ConstConfig';
-import Cookies from 'js-cookie';
 import ViewMember from './viewMember';
-// import { getExistingSimulation, deleteExistingSimulation } from '@/api/simulation';
-import { getExistSimulationList, destroySimulation } from '@/api/rtSimulation';
+import { getExistSimulationList, getSuperviseSimulation } from '@/api/rtSimulation';
+import { destroySimulationByAdmin, enterSimulationByTeacher } from '@/api/simulation';
 export default {
     name: 'SimulationManage',
     components: {
@@ -35,28 +33,16 @@ export default {
                     userName: {
                         type: 'text',
                         label: this.$t('system.userName')
-                    },
-                    prdType: {
-                        type: 'select',
-                        label: this.$t('system.prdType'),
-                        config: {
-                            data: []
-                        }
                     }
                 }
-
             },
             simulationTypeList: [{label: '仿真', value: 'SIMULATION'}, {label: '课程', value: 'LESSON'}, {label: '考试', value: 'EXAM'}, {label: '剧本编制', value: 'SCRIPT_MAKING'}],
             queryList: {
-                query: getExistSimulationList,
+                query: this.queryFunction,
                 selectCheckShow: false,
                 paginationHiden: true,
                 indexShow: true,
                 columns: [
-                    // {
-                    //     title: this.$t('system.userName'),
-                    //     prop: 'creator.name'
-                    // },
                     {
                         title: '仿真ID',
                         prop: 'id'
@@ -76,14 +62,6 @@ export default {
                         title: '仿真倍速',
                         prop: 'speed'
                     },
-                    // {
-                    //     title: '类型',
-                    //     prop: 'type',
-                    //     type: 'tag',
-                    //     columnValue: (row) => { return this.$convertField(row.type, this.simulationTypeList, ['value', 'label']); },
-                    //     tagType: (row) => { return ''; }
-                    //
-                    // },
                     {
                         title: this.$t('system.mapName'),
                         prop: 'map.name',
@@ -95,20 +73,6 @@ export default {
                             return 'success';
                         }
                     },
-                    {
-                        title: this.$t('system.prdType'),
-                        prop: 'prodType',
-                        type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.prodType, this.prdTypeList, ['value', 'label']); },
-                        tagType: (row) => { return ''; }
-
-                    },
-                    // {
-                    //     title: this.$t('system.simulationGroupId'),
-                    //     prop: 'userList',
-                    //     type: 'basicText',
-                    //     columnValue: (row) => { return this.listJoiningTogether(row.userList); }
-                    // },
                     {
                         type: 'button',
                         title: this.$t('global.operate'),
@@ -118,6 +82,11 @@ export default {
                                 handleClick: this.viewMember,
                                 type: ''
                             },
+                            {
+                                name: '进入仿真',
+                                handleClick: this.enterSimulation,
+                                type: ''
+                            },
                             {
                                 name: this.$t('system.destory'),
                                 handleClick: this.handleDelete,
@@ -130,28 +99,14 @@ export default {
             currentModel: {}
         };
     },
-    computed:{
-        prdTypeList() {
-            const productTypeList = ConstConfig.ConstSelect.prdType;
-            return Cookies.get('user_lang') == 'en'
-                ? productTypeList.map(elem => { return { value: elem.value, label: elem.enlabel }; })
-                : productTypeList.map(elem => { return { value: elem.value, label: elem.label }; });
-        }
-    },
-    created() {
-        this.queryForm.queryObject.prdType.config.data = this.prdTypeList;
-    },
     methods: {
-        // listJoiningTogether(sessionList) {
-        //     let sessionId = '';
-        //     if (sessionList && sessionList.length > 0) {
-        //         sessionList.forEach((item) => {
-        //             sessionId = sessionId + item.name + '(' + item.id + ')' + ',';
-        //         });
-        //         sessionId = sessionId.substring(0, sessionId.length - 1);
-        //     }
-        //     return sessionId;
-        // },
+        queryFunction(params) {
+            if (this.$route.path.includes('regulationSimulation')) {
+                return getSuperviseSimulation(params);
+            } else {
+                return getExistSimulationList(params);
+            }
+        },
         viewMember(index, row) {
             this.$refs.viewMember.doShow(row.id);
         },
@@ -161,7 +116,7 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                destroySimulation(row.id).then(response => {
+                destroySimulationByAdmin(row.id).then(response => {
                     this.$message.success(this.$t('system.deleteSuccess'));
                     this.reloadTable();
                 }).catch(() => {
@@ -170,6 +125,24 @@ export default {
                 });
             });
         },
+        enterSimulation(index, row) {
+            enterSimulationByTeacher(row.id).then(resp => {
+                const query = {
+                    lineCode: row.map.lineCode,
+                    group: row.id,
+                    mapId: row.map.id,
+                    simType: row.workParamVO.type,
+                    project: this.project
+                };
+                if (row.workParamVO && row.workParamVO.domConfig && row.workParamVO.domConfig.client) {
+                    query.client = row.workParamVO.domConfig.client;
+                }
+                if (row.workParamVO && row.workParamVO.domConfig && row.workParamVO.domConfig.singleClient) {
+                    query.singleClient = row.workParamVO.domConfig.singleClient;
+                }
+                this.$router.push({ path: `/display/demon`, query: query });
+            });
+        },
         reloadTable() {
             this.queryList.reload();
         }
diff --git a/src/views/system/frontProjectConfigManage/add.vue b/src/views/system/frontProjectConfigManage/add.vue
new file mode 100644
index 000000000..d9ac4302e
--- /dev/null
+++ b/src/views/system/frontProjectConfigManage/add.vue
@@ -0,0 +1,123 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="130px">
+      <el-form-item label="配置编码:" prop="markKey">
+        <el-input v-model="formModel.markKey" style="width: 260px;" />
+      </el-form-item>
+      <el-form-item label="关联项目:" prop="project">
+        <el-select v-model="formModel.project" placeholder="请选择" style="width: 260px;">
+          <el-option
+            v-for="item in projectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { updateFrontProjectConfig, saveFrontProjectConfig, checkFrontProjectExist} from '@/api/projectConfig';
+export default {
+    name:'AddProjectConfig',
+    data() {
+        return {
+            dialogVisible: false,
+            projectList:[],
+            formModel: {
+                id:'',
+                markKey: '', // 配置编码
+                project: 'DEFAULT' // 关联项目
+                // view_setting: '', // 前端服务设置
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                markKey: [
+                    { required: true, message: '请输入配置编码', trigger: 'blur' }
+                ]
+                // project: [
+                //     { required: true, message: '请选择关联项目', trigger: 'blur' },
+                //     { required: true, message: '请选择关联项目', trigger: 'change' }
+                // ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改前端配置' : '创建前端配置';
+        }
+    },
+    methods:{
+        doShow({projectMap, row}) {
+            this.dialogVisible = true;
+            this.projectList = Object.values(projectMap);
+            if (row) {
+                this.formModel.id = row.id;
+                this.formModel.markKey = row.markKey;
+                this.formModel.project = row.project;
+            } else {
+                this.$nextTick(() => {
+                    this.$refs.ruleForm.resetFields();
+                });
+            }
+        },
+        handleClose() {
+            this.formModel = {
+                id:'',
+                markKey: '', // 配置编码
+                project: '' // 关联项目
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = Object.assign({}, this.formModel);
+                    // 检查项目markKey
+                    checkFrontProjectExist({markKey:data.markKey}).then(res=>{
+                        if (!res.data) {
+                            if (data.id) {
+                                // 更新前端项目配置
+                                updateFrontProjectConfig(data).then(resp => {
+                                    this.$message.success('修改前端配置成功！');
+                                    this.handleClose();
+                                    this.$emit('reloadTable');
+                                }).catch(error => {
+                                    this.$message.error(error.message);
+                                    this.loading = false;
+                                });
+                            } else {
+                                delete data.id;
+                                // 保存前端项目配置
+                                saveFrontProjectConfig(data).then(resp => {
+                                    this.$message.success('创建前端配置成功！');
+                                    this.handleClose();
+                                    this.$emit('reloadTable');
+                                }).catch(error => {
+                                    this.$message.error(error.message);
+                                    this.loading = false;
+                                });
+                            }
+                        } else {
+                            this.loading = false;
+                            this.$message.error('此前端配置已存在,请修改配置编码');
+                        }
+                    });
+
+                }
+            });
+        }
+    }
+};
+</script>
diff --git a/src/views/system/frontProjectConfigManage/frontConfig.vue b/src/views/system/frontProjectConfigManage/frontConfig.vue
new file mode 100644
index 000000000..3ab581c7f
--- /dev/null
+++ b/src/views/system/frontProjectConfigManage/frontConfig.vue
@@ -0,0 +1,320 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="800px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="130px">
+      <el-form-item label="项目名称:" prop="loginProtitle" class="inlineBlock">
+        <el-input v-model="formModel.loginProtitle" style="width: 210px;" size="small" />
+      </el-form-item>
+      <el-form-item label="机构名称:" prop="loginOrgTitle" class="inlineBlock" style="margin-left:10px">
+        <el-input v-model="formModel.loginOrgTitle" style="width: 210px;" size="small" />
+      </el-form-item>
+      <el-form-item label="基于系统开发:" prop="baseDevelopment" class="inlineBlock">
+        <el-switch v-model="formModel.baseDevelopment" />
+      </el-form-item>
+      <el-form-item label="显示背景图片:" prop="showBackPic" class="inlineBlock">
+        <el-switch v-model="formModel.showBackPic" />
+      </el-form-item>
+      <el-form-item label="微信登录:" prop="wechatLogin" class="inlineBlock">
+        <el-switch v-model="formModel.wechatLogin" />
+      </el-form-item>
+      <el-form-item label="联系方式:" prop="loginContectInformation" class="inlineBlock">
+        <el-switch v-model="formModel.loginContectInformation" />
+      </el-form-item>
+      <el-form-item label="关于系统:" prop="aboutSystem">
+        <el-input v-model="formModel.aboutSystem" style="width: 400px;" size="small" />
+      </el-form-item>
+      <el-form-item label="项目Logo:" prop="loginProLogo">
+        <div class="eachButton uploadLogo">
+          <img v-if="formModel.loginProLogo" :src="computedLoginLogo" :alt="computedLoginLogo" class="loginLogo">
+          <i class="el-icon-plus avatar-uploader-icon el-icon-other" />
+          <input id="upload_file" ref="files" type="file" class="file_box" accept="image/jpeg,image/png" @change="uploadLogo">
+        </div>
+      </el-form-item>
+      <el-form-item label="登录页Logo宽度:" prop="loginProLogoWidth" class="inlineBlock" style="margin-left:10px">
+        <el-input-number v-model="formModel.loginProLogoWidth" size="small" style="width: 210px;" :min="0" :step="1" />
+      </el-form-item>
+      <el-form-item label="主页Logo宽度:" prop="homeProLogoWidth" class="inlineBlock" style="margin-left:10px">
+        <el-input-number v-model="formModel.homeProLogoWidth" size="small" style="width: 210px;" :min="0" :step="1" />
+      </el-form-item>
+      <el-form-item label="页签名称:" prop="browserTitle" class="inlineBlock">
+        <el-input v-model="formModel.browserTitle" style="width: 210px;" size="small" />
+      </el-form-item>
+      <el-form-item label="导航栏名称:" prop="homeTitle" class="inlineBlock" style="margin-left:10px">
+        <el-input v-model="formModel.homeTitle" style="width: 210px;" size="small" />
+      </el-form-item>
+      <!-- navLogoWidth  //导航栏Logo宽度 -->
+      <!-- navLogoHeight  //导航栏Logo高度 -->
+      <el-form-item label="案例展示:" prop="caseShow" class="inlineBlock">
+        <el-switch v-model="formModel.caseShow" />
+      </el-form-item>
+      <el-form-item label="帮助展示:" prop="helpShow" class="inlineBlock">
+        <el-switch v-model="formModel.helpShow" />
+      </el-form-item>
+      <el-form-item label="本地项目:" prop="localProject" class="inlineBlock">
+        <el-switch v-model="formModel.localProject" />
+      </el-form-item>
+      <br>
+      <el-form-item label="登陆后跳转路径:" prop="judgeRoute" class="inlineBlock">
+        <el-input v-model="formModel.judgeRoute" style="width: 210px;" size="small" />
+      </el-form-item>
+      <el-form-item label="接口地址:" prop="baseApiUrl" class="inlineBlock">
+        <el-input v-model="formModel.baseApiUrl" style="width: 210px;" size="small" />
+      </el-form-item>
+      <el-form-item label="当前域名:" prop="baseSite" class="inlineBlock">
+        <el-input v-model="formModel.baseSite" style="width: 210px;" size="small" />
+      </el-form-item>
+      <el-form-item label="文件地址:" prop="ossUrl" class="inlineBlock">
+        <el-input v-model="formModel.ossUrl" style="width: 210px;" size="small" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { updateFrontProjectConfig, getUploadUrl } from '@/api/projectConfig';
+export default {
+    name:'FrontProjectConfig',
+    data() {
+        return {
+            dialogVisible: false,
+            loginProLogoImg:'',
+            row:null,
+            loading: false,
+            formModel:{
+                loginProtitle:'', // 登录页项目名称
+                loginOrgTitle:'', // 登录页机构名称
+                baseDevelopment:false, // 是否显示基于系统开发
+                aboutSystem:'', // 登录页 右下角关于系统
+                showBackPic:true, // 登录页 是否显示背景图片
+                wechatLogin:true, // 登录页 是否可以微信登录
+                loginContectInformation:false, // 登录页 是否显示联系方式
+                loginProLogo:'', // 登录页 logo
+                loginProLogoWidth:0, // 登录页 logo 宽度
+                homeProLogoWidth:0, // 主页 logo 宽度
+
+                browserTitle:'', // 浏览器页签名称
+                homeTitle:'', // 导航栏名称
+                navLogoWidth:'', // 导航栏Logo宽度
+                navLogoHeight:'', // 导航栏Logo高度
+                caseShow:true, // 导航栏案例展示是否展示
+                helpShow:true, // 导航栏帮助展示是否展示
+                localProject:false, // 是否本地项目
+
+                judgeRoute:'', // 跳转路径
+                baseApiUrl:'', // api链接
+                baseSite:'', // 当前域名
+                ossUrl:'' // 文件oss地址
+
+            }
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                loginProtitle: [
+                    { required: true, message: '请输入项目名称', trigger: 'blur' }
+                ],
+                browserTitle: [
+                    { required: true, message: '请输入页签名称', trigger: 'blur' }
+                ],
+                homeTitle: [
+                    { required: true, message: '请输入导航栏名称', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        computedLoginLogo() {
+            return this.loginProLogoImg ? this.$store.state.user.ossUrl + '/logo/' + this.loginProLogoImg : '';
+        },
+        title() {
+            return '修改前端配置';
+        }
+    },
+    methods:{
+        doShow(row) {
+            this.dialogVisible = true;
+            if (row) {
+                this.row = row;
+                const viewSetting = JSON.parse(row.viewSetting);
+                // this.formModel = Object.assign({}, viewSetting);
+                this.formModel.loginProtitle = viewSetting.loginProtitle || '';
+                this.formModel.loginOrgTitle = viewSetting.loginOrgTitle || '';
+                this.formModel.baseDevelopment = viewSetting.baseDevelopment || false;
+                this.formModel.aboutSystem = viewSetting.aboutSystem || '';
+                this.formModel.showBackPic = viewSetting.showBackPic || false;
+                this.formModel.wechatLogin = viewSetting.wechatLogin || false;
+                this.formModel.loginContectInformation = viewSetting.loginContectInformation || false;
+
+                this.formModel.loginProLogo = viewSetting.loginProLogo || '';
+                this.loginProLogoImg = this.formModel.loginProLogo;
+                this.formModel.loginProLogoWidth = viewSetting.loginProLogoWidth || 0;
+                this.formModel.homeProLogoWidth = viewSetting.homeProLogoWidth || 0;
+
+                this.formModel.browserTitle = viewSetting.browserTitle || '';
+                this.formModel.homeTitle = viewSetting.homeTitle || '';
+                this.formModel.navLogoWidth = viewSetting.navLogoWidth || '';
+                this.formModel.navLogoHeight = viewSetting.navLogoHeight || '';
+                this.formModel.caseShow = viewSetting.caseShow || false;
+                this.formModel.helpShow = viewSetting.helpShow || false;
+                this.formModel.localProject = viewSetting.localProject || false;
+
+                this.formModel.judgeRoute = viewSetting.judgeRoute || '';
+                this.formModel.baseApiUrl = viewSetting.baseApiUrl || '';
+                this.formModel.baseSite = viewSetting.baseSite || '';
+                this.formModel.ossUrl = viewSetting.ossUrl || '';
+
+            }
+        },
+        handleClose() {
+            this.formModel = {
+                loginProtitle:'', // 登录页项目名称
+                loginOrgTitle:'', // 登录页机构名称
+                baseDevelopment:false, // 是否显示基于系统开发
+                aboutSystem:'', // 登录页 右下角关于系统
+                showBackPic:true, // 登录页 是否显示背景图片
+                wechatLogin:true, // 登录页 是否可以微信登录
+                loginContectInformation:false, // 登录页 是否显示联系方式
+                loginProLogo:'', // 登录页 logo
+                loginProLogoWidth:'', // 登录页 logo 宽度
+                homeProLogoWidth:'', // 主页 logo 宽度
+
+                browserTitle:'', // 浏览器页签名称
+                homeTitle:'', // 导航栏名称
+                navLogoWidth:'', // 导航栏Logo宽度
+                navLogoHeight:'', // 导航栏Logo高度
+                caseShow:true, // 导航栏案例展示是否展示
+                helpShow:true, // 导航栏帮助展示是否展示
+                localProject:false, // 是否本地项目
+
+                judgeRoute:'', // 跳转路径
+                baseApiUrl:'', // api链接
+                baseSite:'', // 当前域名
+                ossUrl:'' // 文件oss地址
+
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const row = JSON.parse(JSON.stringify(this.row));
+                    row.viewSetting = JSON.stringify(this.formModel);
+                    // 更新前端项目配置
+                    updateFrontProjectConfig(row).then(resp => {
+                        this.$message.success('修改前端配置成功！');
+                        this.handleClose();
+                        this.$emit('reloadTable');
+                    }).catch(error => {
+                        this.$message.error(error.message);
+                        this.loading = false;
+                    });
+                }
+            });
+        },
+        uploadLogo() {
+            const pic = document.getElementById('upload_file');
+            if (!pic.files || !pic.files[0]) {
+                return;
+            }
+            const file = pic.files[0];
+            const mineType = file.type;
+            const fileSize = file.size;
+            if (mineType != 'image/png' && mineType != 'image/jpeg') {
+                this.$message.error('仅支持png和jpeg格式的图片');
+                return;
+            }
+            if (fileSize / (1024 * 1024) > 1) {
+                this.$message.error('图片应该小于1M');
+                return;
+            }
+            const fileArray = file.name.split('.');
+            const fileType = fileArray[fileArray.length - 1] || '';
+            if (!fileType) {
+                return;
+            }
+            const params = {
+                directory:'logo',
+                fileName:'favicon_' + this.row.markKey + '.' + fileType,
+                method:'PUT'
+            };
+            const that = this;
+            getUploadUrl(params).then((response) => {
+                const url = response.data;
+                if (url) {
+                    // var formData = new FormData();
+                    // formData.append('body', file);
+                    const xhr = new XMLHttpRequest();
+                    xhr.open('PUT', url);
+                    xhr.setRequestHeader('Content-Type', 'multipart/form-data');
+                    xhr.send(file);
+                    xhr.onreadystatechange = function() {
+                        if (xhr.readyState === 4 && xhr.status == 200) {
+                            that.formModel.loginProLogo = params.fileName;
+                            that.loginProLogoImg = params.fileName + '?' + Math.random() * 1000;
+                        } else if (xhr.status != 200) {
+                            that.$message.error('上传失败，请稍后再试');
+                        }
+                    };
+                }
+            });
+
+            // 参数：directory：MINIO文件夹
+            // fileName：存储文件名
+            // method：生成链接的请求方式
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.inlineBlock{
+  display: inline-block;
+}
+.eachButton{
+    margin-left:10px;
+    width:100px;
+    height:100px;
+    border:1px #ccc dashed;
+    margin-bottom: 10px;
+}
+.el-icon-other{
+    width: 100%;
+    text-align: center;
+    height: 100%;
+    line-height: 98px;
+    font-size: 16px;
+    position: absolute;
+    color: #000;
+}
+// .file_box:hover + .el-icon-other{
+//     background: rgba(0, 0, 0, 0.5);
+//     position: absolute;
+//     color: #000;
+// }
+.uploadLogo {
+    position: relative;
+    overflow: hidden;
+    // float: right;
+    margin-right: 3px;
+    cursor: pointer;
+    input {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        opacity: 0;
+        cursor: pointer;
+    }
+}
+.loginLogo{
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+</style>
diff --git a/src/views/system/frontProjectConfigManage/index.vue b/src/views/system/frontProjectConfigManage/index.vue
new file mode 100644
index 000000000..f47c91c05
--- /dev/null
+++ b/src/views/system/frontProjectConfigManage/index.vue
@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <add-project-config ref="addProjectConfig" @reloadTable="reloadTable" />
+    <front-project-config ref="frontProjectConfig" @reloadTable="reloadTable" />
+  </div>
+</template>
+<script>
+import { getFrontProjectConfigByPage, deleteFrontProjectConfig, getBackProjectConfigList} from '@/api/projectConfig';
+import AddProjectConfig from './add';
+import FrontProjectConfig from './frontConfig';
+export default {
+    name:'FrontProjectConfigManage',
+    components: {
+        AddProjectConfig,
+        FrontProjectConfig
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    markKey: {
+                        type: 'text',
+                        label: '配置编码'
+                    },
+                    project:{
+                        type: 'select',
+                        label: '关联项目',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            projectMap:{},
+            queryList: {
+                query: this.getFrontProjectListByPage,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '配置编码',
+                        prop: 'markKey'
+                    },
+                    {
+                        title: '关联项目',
+                        prop: 'project',
+                        type: 'tag',
+                        columnValue: (row) => { return this.projectMap[row.project] ? this.projectMap[row.project].label : ''; },
+                        tagType: (row) => { return 'success'; }
+
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: '编辑',
+                                handleClick: this.handleEdit
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            },
+                            {
+                                name: '前端配置',
+                                handleClick: this.handleFrontVonfig
+                            }
+                        ]
+                    }
+                    // view_setting： 前端服务设置
+                    // status：0删除，1有效
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createProjectConfig}
+                ]
+            }
+        };
+    },
+    mounted() {
+        // 获取后端项目列表，关联时使用
+        getBackProjectConfigList().then(resp => {
+            if (resp.data && resp.data.length > 0) {
+                resp.data.forEach(each=>{
+                    if (each.label == '') {
+                        this.projectMap[each.value] = {label:'默认', value:'DEFAULT'};
+                    } else {
+                        this.projectMap[each.value] = each;
+                    }
+                });
+                this.queryForm.queryObject.project.config.data = Object.values(this.projectMap);
+            }
+        }).catch(error => {
+            console.log(error);
+        });
+    },
+    methods:{
+        // 前端项目配置分页
+        async getFrontProjectListByPage(params) {
+            let res = '';
+            res = await getFrontProjectConfigByPage(params);
+            res.data.list.filter(item => {
+                return item.status == 1;
+            });
+            return res;
+        },
+        handleEdit(index, row) {
+            this.$refs.addProjectConfig.doShow({projectMap:this.projectMap, row:row});
+        },
+        createProjectConfig() {
+            this.$refs.addProjectConfig.doShow({projectMap:this.projectMap});
+        },
+        // 删除前端项目配置
+        handleDelete(index, row) {
+            this.$confirm('此操作将删除该项目配置数据！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteFrontProjectConfig(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        handleFrontVonfig(index, row) {
+            this.$refs.frontProjectConfig.doShow(row);
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
diff --git a/src/views/system/frontResourceManage/create.vue b/src/views/system/frontResourceManage/create.vue
new file mode 100644
index 000000000..d3f965b5b
--- /dev/null
+++ b/src/views/system/frontResourceManage/create.vue
@@ -0,0 +1,200 @@
+<template>
+	<el-dialog :visible="show" center :close-on-click-modal="false" title="新增文件" :before-close="doClose" destroy-on-close>
+		<div class="wrapper">
+			<label v-show="showUpload" for="file">
+				<el-card shadow="hover" class="card">
+					<i class="el-icon-upload"></i>
+				</el-card>
+			</label>
+			<input ref="file" @change="onUploadChange" style="display: none;" type="file" id="file" />
+			<div v-show="!showUpload" class="preview" @mouseenter="showDelete = true" @mouseleave="showDelete = false">
+				<el-card shadow="hover" class="card">
+					<div class="file-type">{{ fileType }}</div>
+					<div class="file-name">{{ formData.fileName }}</div>
+					<div class="delete" v-show="showDelete" @click="handleDelete">
+						<i class="el-icon-delete-solid"></i>
+					</div>
+				</el-card>
+			</div>
+		</div>
+		<el-form ref="form" :model="formData" inline :rules="rules">
+			<el-form-item label="类型" required prop="directory">
+				<el-select v-model="formData.directory">
+					<el-option v-for="item in directories" :key="item.dir" :label="item.label" :value="item.dir"></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="标题" required prop="title">
+				<el-input v-model="formData.title"></el-input>
+			</el-form-item>
+			<el-form-item label="文件名" required prop="fileName">
+				<el-input v-model="formData.fileName"></el-input>
+			</el-form-item>
+		</el-form>
+		<div v-if="!showUpload" class="path-display">
+			<span>文件存储路径: </span>
+			<code>{{ `${urlPrefix}/${formData.directory}/${formData.fileName}` }}</code>
+		</div>
+		<footer>
+			<el-button type="primary" size="small" @click="handleUpload">上传</el-button>
+			<el-button size="small" @click="doClose">取消</el-button>
+		</footer>
+	</el-dialog>
+</template>
+
+<script>
+import { directories } from './dirs'
+import { getUploadUrl } from '@/api/projectConfig'
+import { checkIsExist, saveFileInfo } from '@/api/management/fileManage'
+export default {
+	name: 'CreateFile',
+	emits: ['close'],
+	computed: {
+		urlPrefix() {
+			return this.$store.state.user.ossUrl
+		},
+	},
+	data() {
+		return {
+			show: false,
+			showUpload: true,
+			showDelete: false,
+			directories,
+			fileType: '',
+			formData: {
+				directory: '',
+				title: '',
+				fileName: '',
+			},
+			rules: {
+				directory: [{ required: true, message: '请选择目录', trigger: 'blur' }],
+				title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
+				fileName: [{ required: true, message: '请输入文件名', trigger: 'blur' }],
+			},
+		}
+	},
+	methods: {
+		doShow() {
+			this.show = true
+		},
+		doClose() {
+			this.show = false
+			this.handleDelete()
+			this.$emit('close')
+		},
+		onUploadChange(e) {
+			const fileList = e.target.files
+			if (!fileList.length) return
+			this.showUpload = false
+			const fileName = fileList[0].name
+			this.formData.fileName = fileName
+			const devideIndex = fileName.lastIndexOf('.')
+			this.formData.title = fileName.slice(0, devideIndex)
+			this.fileType = fileList[0].type.split('/').pop()
+		},
+		handleUpload() {
+			const form = this.$refs.form
+			const file = this.$refs.file.files[0]
+			const params = {
+				directory: this.formData.directory,
+				fileName: this.formData.fileName,
+			}
+			const execUpload = () => {
+				getUploadUrl({ ...params, method: 'PUT' }).then(res => {
+					const url = res.data
+					const xhr = new XMLHttpRequest()
+					xhr.open('PUT', url)
+					xhr.upload.onload = () => {
+						saveFileInfo({ ...params, title: this.formData.title }).then(res => {
+							this.$message.success('上传成功')
+							this.doClose()
+						})
+					}
+					xhr.send(file)
+				})
+			}
+			form.validate().then(valid => {
+				if (valid && file.size > 0) {
+					checkIsExist(params).then(resp => {
+						console.log(resp)
+						if (!resp.data) {
+							execUpload()
+						} else {
+							this.$confirm('该目录下有同名文件, 是否覆盖?', this.$t('global.tips'), {
+								confirmButtonText: this.$t('global.confirm'),
+								cancelButtonText: this.$t('global.cancel'),
+								type: 'warning',
+							}).then(execUpload)
+						}
+					})
+				}
+			})
+		},
+		handleDelete() {
+			this.$refs.file.value = ''
+			this.showUpload = true
+			this.formData.title = ''
+			this.formData.fileName = ''
+			this.formData.directory = ''
+			this.fileType = ''
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+footer {
+	display: flex;
+	justify-content: space-evenly;
+	margin-top: 20px;
+}
+.block {
+	user-select: none;
+	padding: 5px;
+	color: #909399;
+}
+.wrapper {
+	display: flex;
+	justify-content: center;
+	margin-bottom: 20px;
+	.card {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: relative;
+		color: #909399;
+		cursor: pointer;
+		width: 150px;
+		height: 150px;
+		.el-icon-upload {
+			font-size: 4em;
+		}
+		.file-type {
+			text-align: center;
+			font-size: 4rem;
+			line-height: 6rem;
+		}
+		.file-name {
+			line-height: 1.2em;
+			text-align: center;
+		}
+		.delete {
+			position: absolute;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			top: 0;
+			left: 0%;
+			width: 100%;
+			height: 100%;
+			background-color: #000000;
+			opacity: 0.5;
+			transition-duration: 1s;
+			transition-property: all;
+			font-size: 3em;
+		}
+	}
+}
+.path-display {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/views/system/frontResourceManage/dirs.js b/src/views/system/frontResourceManage/dirs.js
new file mode 100644
index 000000000..4e1fa71b3
--- /dev/null
+++ b/src/views/system/frontResourceManage/dirs.js
@@ -0,0 +1,15 @@
+/**
+ * 前端管理的资源类型
+ */
+export const directories = [
+	{
+		// 项目logo
+		dir: 'logo',
+		label: 'Logo',
+	},
+	{
+		// 案例展示 (pdf)
+		dir: 'case',
+		label: '案例',
+	},
+]
diff --git a/src/views/system/frontResourceManage/edit.vue b/src/views/system/frontResourceManage/edit.vue
new file mode 100644
index 000000000..d369ab74a
--- /dev/null
+++ b/src/views/system/frontResourceManage/edit.vue
@@ -0,0 +1,62 @@
+<template>
+	<el-dialog :visible="show" center :close-on-click-modal="false" title="编辑文件" :before-close="doClose" destroy-on-close>
+		<el-form ref="form" :model="formData" inline :rules="rules">
+			<el-form-item label="标题" prop="title" required>
+				<el-input v-model="formData.title"></el-input>
+			</el-form-item>
+		</el-form>
+		<footer>
+			<el-button size="small" @click="confirmEdit" type="primary">确认</el-button>
+			<el-button size="small" @click="doClose">取消</el-button>
+		</footer>
+	</el-dialog>
+</template>
+
+<script>
+import { updateFileTitle } from '@/api/management/fileManage'
+export default {
+	name: 'EditFile',
+	emits: ['close'],
+	data() {
+		return {
+			show: false,
+			fileId: NaN,
+			formData: {
+				title: '',
+			},
+			rules: {
+				title: [{ required: true, trigger: 'blur', message: '请输入标题' }],
+			},
+		}
+	},
+	methods: {
+		doShow(row) {
+			this.show = true
+			console.log(row)
+			this.formData.title = row.title
+			this.fileId = row.id
+		},
+		doClose() {
+			this.show = false
+			this.formData.title = ''
+			this.fileId = NaN
+			this.$emit('close')
+		},
+		confirmEdit() {
+			this.$refs.form
+				.validate()
+				.then(valid => {
+					if (!valid) return Promise.reject()
+					return updateFileTitle({ id: this.fileId, title: this.formData.title })
+				})
+				.then(() => {
+					this.$message.success('修改成功')
+					this.doClose()
+				})
+				.catch(() => {})
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/system/frontResourceManage/index.vue b/src/views/system/frontResourceManage/index.vue
new file mode 100644
index 000000000..f4c82f680
--- /dev/null
+++ b/src/views/system/frontResourceManage/index.vue
@@ -0,0 +1,139 @@
+<template>
+	<div class="file-manage">
+		<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+		<CreateFile ref="createFile" @close="refreshList" />
+		<EditFile ref="editFile" @close="refreshList" />
+	</div>
+</template>
+
+<script>
+import { getFileList, deleteFile } from '@/api/management/fileManage'
+import { getUploadUrl } from '@/api/projectConfig'
+import CreateFile from './create'
+import EditFile from './edit'
+import { directories } from './dirs'
+export default {
+	name: 'fileManage',
+	components: { CreateFile, EditFile },
+	data() {
+		return {
+			pagerConfig: {
+				pageSize: 'pageSize',
+				pageIndex: 'pageNum',
+			},
+			queryForm: {
+				labelWidth: '100px',
+				queryObject: {
+					title: {
+						type: 'text',
+						label: '名称:',
+					},
+					directory: {
+						type: 'select',
+						label: '类型:',
+						config: {
+							data: directories.map(item => {
+								const { dir: value, label } = item
+								return { value, label }
+							}),
+						},
+					},
+				},
+			},
+			queryList: {
+				query: this.queryFileList,
+				columns: [
+					{
+						title: '标题',
+						prop: 'title',
+					},
+					{
+						title: '类型',
+						prop: 'directory',
+						formatter(row, col, val, idx) {
+							return directories.find(_ => _.dir === val).label
+						},
+					},
+					{
+						title: '创建时间',
+						prop: 'createTime',
+					},
+					{
+						title: '文件路径',
+						formatter(row) {
+							return `${row.directory}/${row.fileName}`
+						},
+					},
+					{
+						type: 'button',
+						title: this.$t('global.operate'),
+						width: '240',
+						buttons: [
+							{
+								name: '复制路径',
+								handleClick: this.copyPath,
+								type: 'primary',
+							},
+							{
+								name: '编辑',
+								handleClick: this.openEdit,
+								type: 'primary',
+							},
+							{
+								name: '删除',
+								handleClick: this.deleteFile,
+								type: 'danger',
+							},
+						],
+					},
+				],
+				actions: [{ text: this.$t('global.add'), handler: this.createFile }],
+			},
+		}
+	},
+	methods: {
+		queryFileList(params) {
+			return getFileList(params)
+		},
+		createFile() {
+			this.$refs.createFile.doShow()
+		},
+		refreshList() {
+			this.$refs.queryListPage.refresh(true)
+		},
+		deleteFile(idx, row) {
+			this.$confirm(`确认删除 "/${row.directory}/${row.title}" 吗?`, this.$t('global.tips')).then(() => {
+				getUploadUrl({
+					directory: row.directory,
+					fileName: row.fileName,
+					method: 'DELETE',
+				}).then(resp => {
+					const url = resp.data
+					const xhr = new XMLHttpRequest()
+					xhr.open('DELETE', url)
+					xhr.onload = () => {
+						deleteFile(row.id).then(this.refreshList)
+						this.$message.success('删除成功')
+					}
+					xhr.send()
+				})
+			})
+		},
+		openEdit(idx, row) {
+			this.$refs.editFile.doShow(row)
+		},
+		copyPath(idx, row) {
+			const path = `${this.$store.state.user.ossUrl}/${row.directory}/${row.fileName}`
+			navigator.clipboard.writeText(path).then(() => {
+				this.$message.success('文件路径已经复制到粘贴板')
+			})
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.file-manage {
+	padding: 20px;
+}
+</style>
diff --git a/src/views/system/iscsResourcesManage/add.vue b/src/views/system/iscsResourcesManage/add.vue
index 69d54a0d7..f1e015e26 100644
--- a/src/views/system/iscsResourcesManage/add.vue
+++ b/src/views/system/iscsResourcesManage/add.vue
@@ -173,7 +173,6 @@ export default {
             this.dialogVisible = false;
             this.loading = false;
         }
-
     }
 };
 </script>
diff --git a/src/views/system/projectManage/add.vue b/src/views/system/projectManage/add.vue
new file mode 100644
index 000000000..7abbce402
--- /dev/null
+++ b/src/views/system/projectManage/add.vue
@@ -0,0 +1,176 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="130px">
+      <el-form-item label="项目编码:" prop="code">
+        <el-input v-model="formModel.code" style="width: 200px;" />
+      </el-form-item>
+      <el-form-item label="项目名称:" prop="name">
+        <el-input v-model="formModel.name" style="width: 200px;" />
+      </el-form-item>
+      <el-form-item label="项目描述:" prop="description">
+        <el-input v-model="formModel.description" style="width: 260px;" />
+      </el-form-item>
+      <el-form-item label="实训室关联地图:" prop="mapId">
+        <el-select v-model="formModel.mapId" filterable placeholder="请选择" size="small" style="width: 260px;" @change="getRelatedFunctionList">
+          <el-option v-for="item in mapList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="实训室关联功能:" prop="functionId">
+        <el-select v-model="formModel.functionId" filterable placeholder="请选择" size="small" style="width: 260px;">
+          <el-option v-for="item in functionList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import {queryMapListByUser, getMapListByProjectCode} from '@/api/jmap/map';
+import { saveBackProjectConfig, updateBackProjectConfig, checkBackProjectExist} from '@/api/projectConfig';
+import { queryMapFunctionList } from '@/api/trainingPlatform';
+export default {
+    name: 'AddProject',
+    data() {
+        return {
+            dialogVisible: false,
+            mapList:[],
+            functionList:[],
+            formModel: {
+                id: '',
+                code: '', // 项目编码
+                name: '', // 项目名称
+                description: '', // 描述
+                mapId:'', // 实训室关联地图
+                functionId:'' // 实训室关联功能
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                code: [
+                    { required: true, message: '请输入项目编码', trigger: 'blur' }
+                ],
+                name: [
+                    { required: true, message: '请输入项目名称', trigger: 'blur' }
+                ],
+                description: [
+                    { required: true, message: '请输入项目描述', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改项目' : '创建项目';
+        }
+    },
+    created() {
+        queryMapListByUser().then(resp => {
+            this.mapList = resp.data;
+        }).catch(e => {
+            this.loading = false;
+            this.$message.error('获取地图列表失败！');
+        });
+    },
+    methods:{
+        doShow(row) {
+            this.dialogVisible = true;
+            this.functionList = [];
+            if (row) {
+                this.formModel.id = row.id;
+                this.formModel.code = row.code;
+                this.formModel.name = row.name;
+                this.formModel.description = row.description;
+                if (row.code) {
+                    getMapListByProjectCode(row.code).then(resp => {
+                        this.mapList = resp.data;
+                    }).catch(e => {
+                        this.loading = false;
+                        this.$message.error('获取地图列表失败！');
+                    });
+                }
+                const mapId = row.mapId;
+                this.formModel.mapId = mapId.toString();
+                if (this.formModel.mapId) { this.getRelatedFunctionList(mapId); }
+                this.formModel.functionId = row.functionId;
+            } else {
+                this.formModel = {
+                    id: '',
+                    code: '', // 项目编码
+                    name: '', // 项目名称
+                    description: '', // 描述
+                    mapId:'', // 实训室关联地图
+                    functionId:'' // 实训室关联功能
+                };
+                this.$nextTick(() => {
+                    this.$refs.ruleForm.resetFields();
+                });
+            }
+        },
+        getRelatedFunctionList(mapId) {
+            queryMapFunctionList({mapId: mapId}).then(resp => {
+                this.functionList = resp.data;
+                console.log(resp);
+            }).catch(() => {
+                this.$message.error('获取地图功能列表失败！');
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                code: '', // 项目编码
+                name: '', // 项目名称
+                description: '', // 描述
+                mapId:'', // 实训室关联地图
+                functionId:'' // 实训室关联功能
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+        },
+        doSave() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    const data = Object.assign({}, this.formModel);
+                    // 检查项目code
+                    checkBackProjectExist({code:data.code}).then(res=>{
+                        if (!res.data) {
+                            // if (data.id) {
+                            // } else {
+                            delete data.id;
+                            // 保存后端项目配置
+                            saveBackProjectConfig(data).then(resp => {
+                                this.$message.success('创建项目成功！');
+                                this.handleClose();
+                                this.$emit('reloadTable');
+                            }).catch(error => {
+                                this.$message.error(error.message);
+                                this.loading = false;
+                            });
+                            // }
+                        } else {
+                            // 更新后端项目配置
+                            updateBackProjectConfig(data).then(resp => {
+                                this.$message.success('修改项目成功！');
+                                this.handleClose();
+                                this.$emit('reloadTable');
+                            }).catch(error => {
+                                this.$message.error(error.message);
+                                this.loading = false;
+                            });
+                            // this.loading = false;
+                            // this.$message.error('此项目已存在,请修改项目编码');
+                        }
+                    });
+                }
+            });
+        }
+    }
+};
+</script>
+
diff --git a/src/views/system/projectManage/defaultOrgniation.vue b/src/views/system/projectManage/defaultOrgniation.vue
new file mode 100644
index 000000000..46bdba44d
--- /dev/null
+++ b/src/views/system/projectManage/defaultOrgniation.vue
@@ -0,0 +1,110 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="400px" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="100px">
+      <el-form-item v-if="createDefaultOrg" label="组织名称:" prop="name">
+        <el-input v-model="formModel.name" style="width: 200px;" />
+      </el-form-item>
+      <el-form-item v-else label="组织:" prop="defaultOrg">
+        <el-select v-model="formModel.defaultOrg" placeholder="请选择" style="width: 200px;">
+          <el-option
+            v-for="item in orgList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { setDefaultOrg, createDefaultOrg, getOrgList} from '@/api/projectConfig';
+export default {
+    name:'DefaultOrgniation',
+    data() {
+        return {
+            loading:false,
+            dialogVisible: false,
+            orgList:[],
+            createDefaultOrg:true,
+            formModel:{
+                id:'', // 项目ID
+                defaultOrg:'', // 组织ID
+                name:'' // 公司名称
+            }
+        };
+    },
+    computed:{
+        rules() {
+            const crules = {
+                defaultOrg: [
+                    { required: true, message: '请选择组织', trigger: 'blur' },
+                    { required: true, message: '请选择组织', trigger: 'change' }
+                ],
+                name: [
+                    { required: true, message: '请输入组织名称', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.createDefaultOrg ? '创建默认组织' : '设置默认组织';
+        }
+    },
+    methods:{
+        doShow(row) {
+            this.createDefaultOrg = row.createDefaultOrg;
+            if (!this.createDefaultOrg) {
+                // 登录项目组织列表
+                getOrgList(row.id).then(res=>{
+                    this.orgList = res.data || [];
+                    this.formModel.defaultOrg = row.defaultOrg.toString();
+                });
+            }
+            this.formModel.id = row.id;
+            this.dialogVisible = true;
+        },
+        handleClose() {
+            this.formModel = {
+                id:'', // 项目ID
+                defaultOrg:'', // 组织ID
+                name:'' // 公司名称
+            };
+            this.$refs.ruleForm.resetFields();
+            this.dialogVisible = false;
+            this.loading = false;
+            this.orgList = [];
+        },
+        doSave() {
+            if (this.createDefaultOrg) {
+                const data = {name:this.formModel.name};
+                // 创建默认组织
+                createDefaultOrg(this.formModel.id, data).then(resp => {
+                    this.$message.success('创建默认组织成功！');
+                    this.handleClose();
+                    this.$emit('reloadTable');
+                }).catch(error => {
+                    this.$message.error(error.message);
+                    this.loading = false;
+                });
+            } else {
+                const data = {id:this.formModel.id, defaultOrg:parseInt(this.formModel.defaultOrg)};
+                // 设置默认组织
+                setDefaultOrg(data).then(resp => {
+                    this.$message.success('设置默认组织成功！');
+                    this.handleClose();
+                    this.$emit('reloadTable');
+                }).catch(error => {
+                    this.$message.error(error.message);
+                    this.loading = false;
+                });
+            }
+
+        }
+    }
+};
+</script>
diff --git a/src/views/system/projectManage/index.vue b/src/views/system/projectManage/index.vue
new file mode 100644
index 000000000..8ad214a7c
--- /dev/null
+++ b/src/views/system/projectManage/index.vue
@@ -0,0 +1,134 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <add-project ref="addProject" @reloadTable="reloadTable" />
+    <default-orgniation ref="defaultOrgniation" @reloadTable="reloadTable" />
+  </div>
+</template>
+<script>
+import { getBackProjectConfigByPage, deleteBackProjectConfig} from '@/api/projectConfig';
+import AddProject from './add';
+import DefaultOrgniation from './defaultOrgniation';
+
+// getBackProjectConfigById
+export default {
+    name:'ProjectManage',
+    components: {
+        AddProject,
+        DefaultOrgniation
+    },
+    data() {
+        return {
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    code: {
+                        type: 'text',
+                        label: '项目编码'
+                    },
+                    name: {
+                        type: 'text',
+                        label: '项目名称'
+                    }
+                }
+            },
+            queryList: {
+                query: this.getProjectListByPage,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '项目编码',
+                        prop: 'code'
+                    },
+                    {
+                        title: '项目名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '描述',
+                        prop: 'description'
+                    },
+                    {
+                        title: '默认组织',
+                        prop: 'defaultOrgName'
+                    },
+                    {
+                        title: '关联组织',
+                        prop: 'orgList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return row.orgList; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '300',
+                        buttons: [
+                            {
+                                name: '编辑',
+                                handleClick: this.handleEdit
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            },
+                            {
+                                name: '默认组织',
+                                handleClick: this.setDefaultOrg,
+                                type: 'success'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createProject}
+                ]
+            }
+        };
+    },
+    methods:{
+        async getProjectListByPage(params) {
+            let res = '';
+            res = await getBackProjectConfigByPage(params);
+            res.data.list.filter(item => {
+                return item.status == 1;
+            });
+            return res;
+        },
+        handleEdit(index, row) {
+            this.$refs.addProject.doShow(row);
+        },
+        createProject() {
+            this.$refs.addProject.doShow();
+        },
+        setDefaultOrg(index, row) {
+            this.$refs.defaultOrgniation.doShow(row);
+        },
+        handleDelete(index, row) {
+            this.$confirm('此操作将删除该项目数据！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteBackProjectConfig(row.id).then(response => {
+                    this.$message.success(this.$t('system.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
diff --git a/src/views/system/userControl/companyRelation.vue b/src/views/system/userControl/companyRelation.vue
new file mode 100644
index 000000000..7665a02b2
--- /dev/null
+++ b/src/views/system/userControl/companyRelation.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-dialog v-dialogDrag title="组织关系列表" :visible.sync="dialogVisible" width="50%" :before-close="doClose" center :close-on-click-modal="false">
+    <QueryListPage ref="queryListPage1" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import { getUserRolesList } from '@/api/management/user';
+
+export default {
+    name:'CompanyRelation',
+    props: {
+        companyMap: {
+            type: Object,
+            default() {
+                return {};
+            }
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                show: false
+            },
+            queryList: {
+                query: this.getUserRolesList,
+                paginationHiden: true,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '用户名称',
+                        prop: 'name',
+                        width: 80
+                    },
+                    {
+                        title: '组织',
+                        prop: 'orgName',
+                        type: 'tag',
+                        columnValue: (row) => { return row.orgName || this.getCompanyName(row.orgId); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '根组织',
+                        prop: 'rootOrgId',
+                        type: 'tag',
+                        columnValue: (row) => { return this.getCompanyName(row.rootOrgId); },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: this.$t('system.roles'),
+                        prop: 'role',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$convertField(row.role, this.$ConstSelect.schoolRoleList, ['value', 'label']); },
+                        tagType: (row) => { return 'success'; }
+                    }
+                ]
+            },
+            userId: '',
+            userName: ''
+        };
+    },
+    methods:{
+        getCompanyName(companyId) {
+            return this.companyMap[companyId];
+        },
+        getUserRolesList() {
+            return new Promise((resolve, reject) => {
+                getUserRolesList(this.userId).then(res => {
+                    res.data && res.data.forEach(item => {
+                        item.name = this.userName;
+                    });
+                    resolve(res);
+                }).catch(err => {
+                    console.log(err);
+                    reject(err);
+                });
+            });
+        },
+        doShow(row) {
+            this.dialogVisible = true;
+            this.userId = row.id;
+            this.userName = row.name || '';
+            this.reloadTable();
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        doClose() {
+            this.dialogVisible = false;
+            this.userId = '';
+        }
+    }
+};
+</script>
diff --git a/src/views/system/userControl/index.vue b/src/views/system/userControl/index.vue
index 1faf04231..4ce1cabf2 100644
--- a/src/views/system/userControl/index.vue
+++ b/src/views/system/userControl/index.vue
@@ -5,6 +5,7 @@
     <create-user ref="createUser" />
     <create-single-user ref="createSingleUser" @reloadTable="reloadTable" />
     <bind-company ref="bindCompany" :company-list="companyList" @create="create" />
+    <CompanyRelation ref="companyRelation" :company-map="companyMap" />
   </div>
 </template>
 
@@ -15,6 +16,7 @@ import DictionaryEdit from './edit';
 import CreateUser from './createUser';
 import CreateSingleUser from './createSingleUser';
 import BindCompany from './bindCompany';
+import CompanyRelation from './companyRelation';
 import {adminResetUserPassword} from '@/api/management/user';
 
 export default {
@@ -23,7 +25,8 @@ export default {
         DictionaryEdit,
         CreateUser,
         CreateSingleUser,
-        BindCompany
+        BindCompany,
+        CompanyRelation
     },
     data() {
         return {
@@ -145,7 +148,7 @@ export default {
                         tagType: (row) => { return 'success'; }
                     },
                     {
-                        title: this.$t('system.roles'),
+                        title: '权限',
                         prop: 'roles',
                         type: 'tagMore',
                         columnValue: (row) => { return this.$convertField(row.roles, this.$ConstSelect.roleList, ['value', 'label'], true); },
@@ -160,9 +163,13 @@ export default {
                                 name: this.$t('global.edit'),
                                 handleClick: this.handleUserEdit
                             },
+                            // {
+                            //     name: '绑定组织管理员',
+                            //     handleClick: this.handleBind
+                            // },
                             {
-                                name: '绑定组织管理员',
-                                handleClick: this.handleBind
+                                name: '组织关系',
+                                handleClick: this.handleRelation
                             },
                             {
                                 name: '重置密码',
@@ -222,11 +229,14 @@ export default {
             this.$refs.createSingleUser.doShow();
         },
         companyManage() {
-            this.$router.push({ path: `/system/companyManage`});
+            this.$router.push({ path: `/systemManagement/systemDataManagement/companyManage`});
         },
         handleBind(index, row) {
             this.$refs.bindCompany.doShow(row);
         },
+        handleRelation(index, row) {
+            this.$refs.companyRelation.doShow(row);
+        },
         resetPassword(index, row) {
             this.$confirm('操作会将改用户密码重置为初始密码，是否继续', this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 828a2dd18..2f908ab17 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -157,9 +157,9 @@ export default {
                             this.$store.dispatch('app/transitionAnimations');
                         }
                         if (this.$route.query.noPreLogout) {
-                            this.$router.replace({ path: `${UrlConfig.displayNew}/teach`, query: query });
+                            this.$router.replace({ path: `${UrlConfig.display}/teach`, query: query });
                         } else {
-                            this.$router.push({ path: `${UrlConfig.displayNew}/teach`, query: query });
+                            this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
                         }
                         launchFullscreen();
                     }).catch(error => {
diff --git a/src/views/temporary/index.vue b/src/views/temporary/index.vue
new file mode 100644
index 000000000..8d79746d6
--- /dev/null
+++ b/src/views/temporary/index.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="temporary">
+    <span>功能实现中......</span>
+  </div>
+</template>
+<script>
+export default {
+    name: 'Temporary',
+    components: {},
+    data() {
+        return {};
+    }
+};
+</script>
+<style lang="scss" scoped>
+.temporary {
+	height: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+</style>
diff --git a/src/views/temporary/transitionIndex.vue b/src/views/temporary/transitionIndex.vue
new file mode 100644
index 000000000..d3cc9f052
--- /dev/null
+++ b/src/views/temporary/transitionIndex.vue
@@ -0,0 +1,12 @@
+<template>
+  <router-view />
+</template>
+<script>
+export default {
+    name: 'NullIndex',
+    components: {},
+    data() {
+        return {};
+    }
+};
+</script>
diff --git a/src/views/thirdPartyAccounts/add.vue b/src/views/thirdPartyAccounts/add.vue
new file mode 100644
index 000000000..deb5c3f62
--- /dev/null
+++ b/src/views/thirdPartyAccounts/add.vue
@@ -0,0 +1,104 @@
+<template>
+  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false">
+    <el-form ref="ruleForm" :model="formModel" :rules="rules" label-width="250px">
+      <el-form-item label="第三方账户：" prop="account">
+        <el-input v-model="formModel.account" />
+      </el-form-item>
+      <el-form-item label="用户仿真使用记录同步第三方url：" prop="userSimulationRecordSyncUrl">
+        <el-input v-model="formModel.userSimulationRecordSyncUrl" />
+      </el-form-item>
+      <el-form-item label="用户考试成绩记录同步第三方url：" prop="userExamRecordSyncUrl">
+        <el-input v-model="formModel.userExamRecordSyncUrl" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button v-loading="loading" type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { updateThirdAccountConfig } from '@/api/thirdAccountConfig';
+export default {
+    name: 'Add',
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                id: '',
+                account: '',
+                userSimulationRecordSyncUrl: '',
+                userExamRecordSyncUrl: ''
+            },
+            loading: false
+        };
+    },
+    computed: {
+        rules() {
+            const crules = {
+                account: [
+                    { required: true, message: '请填写第三方账户', trigger: 'blur' }
+                ],
+                userSimulationRecordSyncUrl: [
+                    { required: true, message: '请填写用户仿真使用记录同步第三方url', trigger: 'blur' }
+                ],
+                userExamRecordSyncUrl: [
+                    { required: true, message: '请填写用户考试成绩记录同步第三方url', trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.formModel.id ? '修改第三方配置' : '创建第三方配置';
+        }
+    },
+    mounted() {},
+    methods: {
+        show(data) {
+            if (data) {
+                this.formModel.id = data.id;
+                this.formModel.account = data.account;
+                this.formModel.userSimulationRecordSyncUrl = data.interfaceConfig.userSimulationRecordSyncUrl;
+                this.formModel.userExamRecordSyncUrl = data.interfaceConfig.userExamRecordSyncUrl;
+            }
+            this.dialogVisible = true;
+        },
+        doSave() {
+            this.$refs.ruleForm.validate(() => {
+                this.loading = true;
+                const data = {
+                    id: this.formModel.id,
+                    account: this.formModel.account,
+                    interfaceConfig: {
+                        userSimulationRecordSyncUrl: this.formModel.userSimulationRecordSyncUrl,
+                        userExamRecordSyncUrl: this.formModel.userExamRecordSyncUrl
+                    }
+                };
+                updateThirdAccountConfig(data).then(resp => {
+                    this.$message.success(this.formModel.id ? '更新第三方配置成功！' : '创建第三方配置成功！');
+                    this.handleClose();
+                    this.$emit('reloadTable');
+                }).catch(error => {
+                    this.$message.error(error.message);
+                    this.loading = false;
+                });
+            });
+        },
+        handleClose() {
+            this.formModel = {
+                id: '',
+                account: '',
+                userSimulationRecordSyncUrl: '',
+                userExamRecordSyncUrl: ''
+            };
+            this.dialogVisible = false;
+            this.loading = false;
+        }
+
+    }
+};
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/thirdPartyAccounts/index.vue b/src/views/thirdPartyAccounts/index.vue
new file mode 100644
index 000000000..bc24a9dd9
--- /dev/null
+++ b/src/views/thirdPartyAccounts/index.vue
@@ -0,0 +1,112 @@
+<template>
+  <div class="temporary">
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <add-third-account ref="addThirdAccount" @reloadTable="reloadTable" />
+  </div>
+</template>
+<script>
+import { deleteThirdAccountConfig, queryThirdAccountConfig } from '@/api/thirdAccountConfig';
+import AddThirdAccount from './add';
+export default {
+    name: 'Temporary',
+    components: {
+        AddThirdAccount
+    },
+    data() {
+        return {
+            queryForm: {
+                labelWidth: '120px',
+                reset: true,
+                leftSpan: 0,
+                textAlign: 'right'
+            },
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryList: {
+                query: queryThirdAccountConfig,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '第三方账户',
+                        prop: 'account',
+                        width: '200'
+                    },
+                    {
+                        title: '用户仿真使用记录同步第三方url',
+                        prop: 'interfaceConfig',
+                        type: 'tag',
+                        columnValue: (row) => { return row.interfaceConfig.userSimulationRecordSyncUrl; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '类型',
+                        prop: 'interfaceConfig',
+                        type: 'tag',
+                        columnValue: (row) => { return row.interfaceConfig.userExamRecordSyncUrl; },
+                        tagType: (row) => { return 'success'; }
+                    },
+                    {
+                        title: '创建时间',
+                        prop: 'createTime',
+                        width: '200'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '200',
+                        buttons: [
+                            {
+                                name: '编辑',
+                                handleClick: this.editConfig
+                            },
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                    { text: this.$t('global.add'), handler: this.createThirdAccount}
+                ]
+            }
+        };
+    },
+    methods: {
+        createThirdAccount() {
+            this.$refs.addThirdAccount.show();
+        },
+        editConfig(index, row) {
+            this.$refs.addThirdAccount.show(row);
+        },
+        handleDelete(index, row) {
+            this.$confirm('此操作将删除该第三方配置！', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteThirdAccountConfig(row.id).then(response => {
+                    this.$message.success('删除成功！');
+                    this.reloadTable();
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.deleteFailed'));
+                });
+            });
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.temporary {
+	height: 100%;
+	width: 100%;
+}
+</style>
diff --git a/src/views/trainingManage/demonMenu.vue b/src/views/trainingManage/demonMenu.vue
deleted file mode 100644
index 41ecb6ba7..000000000
--- a/src/views/trainingManage/demonMenu.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <div>
-    <div class="display_top_draft">
-      <div class="btn_hover" @click="menuClick">菜单</div>
-      <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:${btnWidth}px`">
-        <el-button size="small" @click="handlerMemberManage">成员管理</el-button>
-        <el-button size="small" @click="showList">实训列表</el-button>
-      </el-button-group>
-    </div>
-    <TrainingList ref="trainingList" @updateDetails="updateDetails" @gradeRules="gradeRules" @closeAllDialog="closeAllDialog" @draftTracK="draftTracK" />
-    <EditDetails ref="editDetails" :edit-data="editData" @openEditOperate="openEditOperate" @handleCondition="handleCondition" @publish="publish" @preview="preview" @gradeRules="gradeRules" />
-    <EditCondition ref="editCondition" v-dialogDrag :materials-list="materialsList" @editConditionFn="editConditionFn" @backStep="backStep" />
-    <edit-operate ref="editOperate" v-dialogDrag @backStepList="backStepList" />
-    <grade-rules ref="gradeRules" />
-    <members-manage ref="membersManage" :is-admin="isAdmin" @addSimulationMember="addSimulationMember" /> <!-- 成员管理 -->
-    <add-member ref="addMember" :station-list="stationList" />
-    <TrackList ref="trackList" />
-  </div>
-</template>
-<script>
-import TrainingList from './trainingList.vue';
-import TrackList from './trackList.vue';
-import EditDetails from './editDetails.vue';
-import EditCondition from './editCondition.vue';
-import EditOperate from './editOperate.vue';
-import GradeRules from './gradeRules.vue';
-import { getTrainingMaterials } from '@/api/trainingManage';
-import MembersManage from '@/views/newMap/jointTrainingNew/memberManage/membersManage';
-import AddMember from '@/views/newMap/jointTrainingNew/memberManage/addMember';
-import {mapGetters} from 'vuex';
-
-export default {
-    name:'DemonMenu',
-    components:{
-        TrainingList,
-        TrackList,
-        EditDetails,
-        EditCondition,
-        EditOperate,
-        GradeRules,
-        MembersManage,
-        AddMember
-    },
-    props:{
-    },
-    data() {
-        return {
-            hoverBtn: false,
-            btnWidth: -600,
-            materialsList: [],
-            refsList: ['editDetails', 'editCondition', 'trackList'],
-            editData: {},
-            isAdmin: true
-        };
-    },
-    computed:{
-        ...mapGetters('map', [
-            'stationList'
-        ]),
-        group() {
-            return this.$route.query.group;
-        },
-        mapId() {
-            return this.$route.query.mapId;
-        },
-        lineCode() {
-            return this.$route.query.lineCode;
-        }
-    },
-    mounted() {
-        this.getMaterials();
-    },
-    methods:{
-        publish(data) {
-            this.$refs.trainingList.publishScript(null, data);
-        },
-        preview(data) {
-            this.$refs.trainingList.previewScript(null, data);
-        },
-        editConditionFn(data, index, key) {
-            this.$refs.editDetails.editConditionFn(data, index, key);
-        },
-        backStep() {
-            this.$refs.editDetails.backStep();
-        },
-        handleCondition(index, row, key) {
-            this.$refs.editCondition.doShow(row, index, key);
-        },
-        getMaterials() {
-            getTrainingMaterials().then(res => {
-                // console.log(res, 'Materials');
-                this.materialsList = res.data;
-            }).catch(err => {
-                console.log(err, 'Materials----');
-                this.materialsList = [];
-            });
-        },
-        menuClick() {
-            this.hoverBtn = !this.hoverBtn;
-            if (this.hoverBtn) {
-                this.btnWidth = 0; // 默认宽度
-            } else {
-                this.btnWidth = -600;
-            }
-        },
-        draftTracK(row) {
-            this.$refs.trackList.doShow(row);
-        },
-        showList() {
-            this.$refs.trainingList.doShow();
-        },
-        showMembersManage() {
-
-        },
-        updateDetails(data) {
-            this.editData = data;
-            this.closeAllDialog('editDetails');
-            this.$refs.editDetails.doShow(data);
-        },
-        closeAllDialog(noCloseName) {
-            this.refsList.forEach(key => {
-                if (key != noCloseName && this.$refs[key]) {
-                    this.$refs[key].doClose();
-                }
-            });
-        },
-        openEditOperate(data) {
-            this.$refs.editOperate.doShow(data);
-        },
-        backStepList(data) {
-            this.$refs.editDetails.setOperations(data);
-            this.$refs.editDetails.minisize();
-        },
-        gradeRules(data) {
-            this.$refs.gradeRules.doShow(data);
-        },
-        addSimulationMember() {
-            this.$refs.addMember.doShow();
-        },
-        handlerMemberManage() {
-            this.$refs.membersManage.doShow();
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-/deep/ .el-dialog__wrapper{
-    overflow: hidden;
-}
-.display_top_draft{
-	position: absolute;
-	left: 5px;
-	top: 15px;
-	height: 32px;
-	overflow: hidden;
-	padding-left: 44px;
-	z-index: 35;
-	.btn_hover{
-		position: absolute;
-		left: 0;
-		top: 0;
-		z-index: 2;
-		color: #4e4d4d;
-		font-size: 14px;
-		background: #fff;
-		padding: 8px;
-		border-radius: 5px;
-		display: block;
-		cursor: pointer;
-		float: left;
-		height: 32px;
-	}
-	.button_group_box{
-		float: left;
-		transition: all 0.5s;
-		overflow: hidden;
-	}
-}
-</style>
diff --git a/src/views/trainingManage/editCondition.vue b/src/views/trainingManage/editCondition.vue
deleted file mode 100644
index db9128d6f..000000000
--- a/src/views/trainingManage/editCondition.vue
+++ /dev/null
@@ -1,325 +0,0 @@
-<template>
-  <div>
-    <!-- <div class="conditionTab">
-      <div v-if="tabVisible" class="conditionTabLable" @click="minisize">
-        <span class="titleStyle">{{ title }}</span>
-      </div>
-    </div> -->
-    <el-dialog :title="title" :visible.sync="dialogVisible" :width="dialogWidth" :modal="false" :close-on-click-modal="false" :before-close="doClose" center :style="{'margin-left': dialogMarginLeft + 'px'}">
-      <div @click="editValue(null, '')">
-        <div>
-          <Expression ref="expression" :materials-list="materialsList" :get-device-list="getDeviceList" @editExpression="editExpression" @addExp="addExp" />
-        </div>
-        <el-table
-          :data="tableData"
-          max-height="150"
-          border
-        >
-          <el-table-column label="条件关系">
-            <template slot-scope="scope">
-              <ExpressionValue ref="ExpressionValue" :materials-list="materialsList" :get-device-list="getDeviceList" :value-obj="scope.row" :index-path="scope.$index + ''" :active-index-path="activeIndexPath" @editValue="editValue" />
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="conditionBtn">
-          <!-- <el-button size="small" @click="addExp()">新增条件关系</el-button> -->
-          <el-button size="small" :disabled="deleteDisabled" @click="deleteExp">删除条件关系</el-button>
-          <el-button size="small" :disabled="clearDisabled" @click="clearExp">清空条件关系</el-button>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="doSave">保存</el-button>
-        <el-button size="small" @click="doClose">取消</el-button>
-        <el-button size="small" @click="doBackStep">返回步骤列表</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Expression from './expression.vue';
-import ExpressionValue from './expressionValue.vue';
-import ConstConfig from '@/scripts/ConstConfig';
-
-export default {
-    name: 'EditCondition',
-    components:{
-        ExpressionValue,
-        Expression
-    },
-    props: {
-        materialsList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            dialogWidth: '1000px',
-            tabVisible: false,
-            dialogVisible: false,
-            tableData: [],
-            roleDeviceCode: '', // 角色对应站点code
-            activeIndexPath: '',
-            rowIndex: 0,
-            conditionKey: ''
-        };
-    },
-    computed: {
-        title() {
-            const keyObj = {
-                triggerCondition: '编辑触发条件',
-                operateCondition : '编辑操作条件',
-                completionCondition: '编辑完成条件'
-            };
-            const t = keyObj[this.conditionKey] || this.$t('trainingManage.editCompletionCondition');
-            return t;
-        },
-        dialogMarginLeft() {
-            const w = this.$store.state.app.width;
-            const ml = (w - parseInt(this.dialogWidth)) / 2;
-            return ml;
-        },
-        ConstSelect() {
-            return ConstConfig.ConstSelect;
-        },
-        mapDevice() {
-            return this.$store.state.map.mapDevice;
-        },
-        mapStationDirectionData() {
-            return this.$store.state.map.mapStationDirectionData;
-        },
-        getDeviceList() {
-            const typeObj = {};
-            this.ConstSelect.operationDeviceList.forEach(ii => {
-                typeObj[ii.value] = ii.label;
-            });
-            const list = [];
-            Object.values(this.mapDevice).forEach(item => {
-                if (typeObj[item._type]) {
-                    list.push({
-                        code: item.code,
-                        name: `${item.groupNumber || item.name}(${typeObj[item._type]})`,
-                        _type: item._type
-                    });
-                }
-            });
-            Object.values(this.mapStationDirectionData).forEach(item => {
-                if (!this.roleDeviceCode || this.roleDeviceCode == item.relativeStationCode) {
-                    let isAuto = true;
-                    if (item.runModel == 'S') {
-                        isAuto = false;
-                    }
-                    list.push({
-                        code: item.code,
-                        name: `${item.name}_${item.labelEnum}(${isAuto ? '自动闭塞' : '半自动闭塞'})`,
-                        _type:  `${isAuto ? 'StationDirectionAuto' : 'StationDirectionSemi'}`
-                    });
-                }
-            });
-            this.getRouteList.forEach(item => {
-                list.push({
-                    code: item.code,
-                    name: `${item.name}(进路)`,
-                    startSignalCode: item.startSignalCode,
-                    _type: 'Route'
-                });
-            });
-            return list;
-        },
-        routeData() {
-            return this.$store.state.map.routeData;
-        },
-        getRouteList() {
-            return Object.values(this.routeData);
-        },
-        deleteDisabled() {
-            let s = false;
-            if (!this.tableData[0] || !this.tableData[0].valuables || !this.activeIndexPath) {
-                s = true;
-            }
-            return s;
-        },
-        clearDisabled() {
-            let s = false;
-            if (!this.tableData[0] || !this.tableData[0].valuables) {
-                s = true;
-            }
-            return s;
-        }
-    },
-    watch: {},
-    methods: {
-        addExp(obj) {
-            let addData = { t: 'E', operator: 'EQ', valuables: [] };
-            if (obj) {
-                addData = obj;
-            }
-            let data = {
-                t: 'E',
-                operator: 'AND',
-                valuables: [this.tableData[0], addData]
-            };
-            if (this.clearDisabled) {
-                data = addData;
-            }
-            this.tableData.splice(0, 1, data);
-        },
-        deleteExp() {
-            const arrPath = this.activeIndexPath.split('-');
-            if (arrPath.length < 2) {
-                this.clearExp();
-            } else {
-                const lastIndex = arrPath[arrPath.length - 1] == 0 ? 1 : 0;
-                arrPath.pop();
-                let tData = this.tableData;
-                let lData = this.tableData;
-                arrPath.forEach((item, index) => {
-                    if (index != arrPath.length - 1) {
-                        lData = lData[item].valuables;
-                    }
-                    if (tData[item]) {
-                        tData = tData[item].valuables;
-                    }
-                });
-                const data = tData[lastIndex];
-                lData.splice(0, 1, data);
-            }
-        },
-        clearExp() {
-            this.tableData = [];
-        },
-        editValue(data, indexPath) {
-            this.activeIndexPath = indexPath;
-            this.$refs.expression.setFormData(data, indexPath);
-        },
-        editExpression(data, indexPath) {
-            if (!indexPath) { return; }
-            const arrPath = indexPath.split('-');
-            const lastIndex = arrPath[arrPath.length - 1];
-            arrPath.pop();
-            let tData = this.tableData;
-            arrPath.forEach(index => {
-                if (tData[index]) {
-                    tData = tData[index].valuables;
-                }
-            });
-            tData.splice(lastIndex, 1, data);
-        },
-        doSave() {
-            let data = this.tableData[0];
-            if (this.clearDisabled) {
-                data = null;
-            }
-            if (this.checkData(data)) {
-                this.$emit('editConditionFn', data, this.rowIndex, this.conditionKey);
-                this.doClose();
-            } else {
-                this.$message.info('请编辑完整的条件关系！');
-            }
-        },
-        checkData(data) {
-            const that = this;
-            function notCompleteData(obj) {
-                let s = false;
-                if ( !s && obj.t == 'E' && (!obj.valuables || !obj.valuables[0])) {
-                    s = true;
-                }
-                if (!s && obj.t == 'E' && !that.hasNotIs(obj.operator) && (!obj.valuables || !obj.valuables[1])) {
-                    s = true;
-                }
-                if (!s && obj.valuables && obj.valuables[0]) {
-                    s = notCompleteData(obj.valuables[0]);
-                }
-                if (!s && obj.valuables && obj.valuables[1]) {
-                    s = notCompleteData(obj.valuables[1]);
-                }
-                return s;
-            }
-            let s = true;
-            if (data && notCompleteData(data)) {
-                s = false;
-            }
-            return s;
-        },
-        hasNotIs(operator) {
-            let s = false;
-            const arr = ['NOT', 'IS'];
-            if (arr.includes(operator)) {
-                s = true;
-            }
-            return s;
-        },
-        minisize() {
-            this.dialogVisible = true;
-        },
-        doBackStep() {
-            this.$emit('backStep');
-            this.doClose();
-        },
-        doShow(row, rowIndex, conditionKey) {
-            const data = row[conditionKey];
-            const member = this.$store.state.training.memberData[row.memberId];
-            this.roleDeviceCode = member.deviceCode || '';
-            this.dialogVisible = true;
-            this.tabVisible = true;
-            this.activeIndexPath = '';
-            if (data) {
-                this.tableData = [data];
-            } else {
-                this.tableData = [];
-            }
-            this.rowIndex = rowIndex;
-            this.conditionKey = conditionKey;
-            this.$nextTick(() => {
-                this.$refs.expression.clearFromData();
-            });
-        },
-        doClose() {
-            this.dialogVisible = false;
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-/deep/ .el-dialog__wrapper {
-	width: 1px;
-	height: 1px;
-	top: auto;
-	right: auto;
-	bottom: auto;
-	left: auto;
-	overflow: visible !important;
-}
-// .conditionTab{
-//     position: absolute;
-//     z-index: 10;
-// 	right: 12px;
-// 	top: calc(45% + 200px);
-// }
-// .conditionTabLable{
-//     position: absolute;
-//     background: #fff;
-//     border-radius: 5px 0px 0px 5px ;
-//     padding: 5px 0px;
-//     width: 23px;
-//     text-align: center;
-//     left: 50%;
-//     transform: translateX(-50%);
-//     cursor: pointer;
-//     top:-28px;
-// }
-// .nullDiv {
-// 	width: 100%;
-// 	height: 28px;
-// 	line-height: 28px;
-// 	cursor: pointer;
-// 	color: #ccc;
-// }
-.conditionBtn {
-	height: 50px;
-	line-height: 50px;
-}
-</style>
diff --git a/src/views/trainingManage/editDetails.vue b/src/views/trainingManage/editDetails.vue
deleted file mode 100644
index e038e2f8d..000000000
--- a/src/views/trainingManage/editDetails.vue
+++ /dev/null
@@ -1,457 +0,0 @@
-<template>
-  <div class="editContent" :class="{'active': dialogVisible && record}">
-    <div class="editContentTab">
-      <div v-if="tabVisible && record" class="editContentTabLable" @click="minisize">
-        <span class="titleStyle">{{ $t('trainingManage.editTagTitle') }}</span>
-      </div>
-    </div>
-    <div class="editContentTitle">
-      <div>
-        <span>实训名称：{{ editData.name || '' }}</span>
-      </div>
-      <div>
-        <el-button size="small" type="success" @click="gradeRules">评分</el-button>
-        <el-button size="small" type="primary" @click="previewTraining">预览</el-button>
-        <el-button size="small" type="primary" @click="publishTraining">发布</el-button>
-        <el-button size="small" type="danger" @click="clearStep">清空步骤</el-button>
-      </div>
-    </div>
-    <el-tabs v-model="activeName" type="card">
-      <el-tab-pane label="步骤列表" name="stepList">
-        <div class="tabPaneBox">
-          <div class="tabPaneHead">
-            <el-button size="small" type="primary" @click="addStep">新增步骤</el-button>
-          </div>
-          <el-table
-            :data="tableData"
-            :max-height="tableHeight"
-            border
-          >
-            <el-table-column type="index" label="序号" width="50" />
-            <el-table-column :label="$t('trainingManage.roleSelect')" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.memberId" placeholder="请选择" size="mini">
-                  <el-option
-                    v-for="item in roleList"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.id"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('trainingManage.stepDescription')">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.description" placeholder="请输入步骤描述" size="mini" />
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('trainingManage.triggerCondition')">
-              <template slot-scope="scope">
-                <span>{{ getConditionName(scope.row, 'triggerCondition') }}</span>
-                <el-button style="margin-left: 10px" size="mini" @click="handleCondition(scope.$index, scope.row, 'triggerCondition')">{{ $t('global.edit') }}</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('trainingManage.completionCondition')">
-              <template slot-scope="scope">
-                <span>{{ getConditionName(scope.row, 'completionCondition') }}</span>
-                <el-button style="margin-left: 10px" size="mini" @click="handleCondition(scope.$index, scope.row, 'completionCondition')">{{ $t('global.edit') }}</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('trainingManage.operateCondition')">
-              <template slot-scope="scope">
-                <span>{{ getConditionName(scope.row, 'operateCondition') }}</span>
-                <el-button style="margin-left: 10px" size="mini" @click="handleEditOperate(scope.$index, scope.row)">{{ $t('global.edit') }}</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('global.operate')" width="90">
-              <template slot-scope="scope">
-                <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">{{ $t('global.delete') }}</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="tabPaneFooter">
-            <el-button size="small" type="success" @click="saveStepData">{{ $t('trainingManage.saveStepData') }}</el-button>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="地图定位" name="mapLocation">
-        <div class="tabPaneBox">
-          <div>
-            <el-form ref="form" :model="mapLocationObj" label-width="80px">
-              <el-form-item label="X坐标">
-                <span>{{ mapLocationObj.x || '' }}</span>
-              </el-form-item>
-              <el-form-item label="Y坐标">
-                <span>{{ mapLocationObj.y || '' }}</span>
-              </el-form-item>
-              <el-form-item label="缩放">
-                <span>{{ mapLocationObj.scale || '' }}</span>
-              </el-form-item>
-            </el-form>
-          </div>
-          <div class="tabPaneFooter">
-            <el-button size="small" type="primary" @click="updateMapLocation">{{ $t('trainingManage.mapLocation') }}</el-button>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="背景" name="Background">
-        <div class="tabPaneBox">
-          <div>
-            <el-form ref="form" :model="bgSceneObj" label-width="80px">
-              <el-form-item label="更新时间">
-                <span>{{ bgSceneObj.systemTime || '' }}</span>
-              </el-form-item>
-            </el-form>
-          </div>
-          <div class="tabPaneFooter">
-            <el-button size="small" type="primary" @click="saveScenesStage">{{ $t('trainingManage.saveBackground') }}</el-button>
-          </div>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import { updateTrainingStep, getTrainingAll, updateTrainingBackgroud, getTrainingStepList, updateTrainingMaplocation, clearTrainingStep } from '@/api/trainingManage';
-import { assignUsersPlayRoles } from '@/api/jointSimulation';
-import Vue from 'vue';
-import {covertMemberData} from '@/views/newMap/displayNew/utils';
-
-export default {
-    name: 'EditDetails',
-    components:{},
-    props: {
-        editData: {
-            type: Object,
-            default() {
-                return {};
-            }
-        }
-    },
-    data() {
-        return {
-            dialogWidth: '1100px',
-            tabVisible: false,
-            dialogVisible: false,
-            roleList: [],
-            tableData: [],
-            activeName: 'stepList',
-            mapLocationObj: {},
-            bgSceneObj: {}
-        };
-    },
-    computed: {
-        record() { // 编制
-            return this.$route.query.record;
-        },
-        tableHeight() {
-            const s = 210;
-            const h = this.$store.state.app.height;
-            return h - s;
-        },
-        group() {
-            return this.$route.query.group;
-        }
-    },
-    watch: {
-        '$store.state.training.memberList': function (val) {
-            if (val && val.length) {
-                const memberData = this.$store.state.training.memberData;
-                let activeTrainList = [];
-                if (this.$store.state.training.started) {
-                    activeTrainList = this.$store.state.map.activeTrainList;
-                }
-                // 获取仿真成员列表
-                const result = covertMemberData(activeTrainList, Object.values(memberData));
-                let list = [];
-                result.deviceListData.forEach(item => {
-                    list = list.concat(item);
-                });
-                this.roleList = list;
-            }
-        },
-        editData() {
-            this.mapLocationObj = {};
-            if (this.editData['mapLocationJson']) {
-                this.mapLocationObj = JSON.parse(this.editData['mapLocationJson']);
-            }
-            this.bgSceneObj = {};
-            if (this.editData['bgSceneJson']) {
-                this.bgSceneObj = JSON.parse(this.editData['bgSceneJson']);
-            }
-        },
-        '$store.state.map.activeTrainListChange': function () {
-            const activeTrainList = this.$store.state.map.activeTrainList;
-            const memberData = this.$store.state.training.memberData;
-            // 获取仿真成员列表
-            const result = covertMemberData(activeTrainList, Object.values(memberData));
-            let list = [];
-            result.deviceListData.forEach(item => {
-                list = list.concat(item);
-            });
-            this.roleList = list;
-        }
-    },
-    methods: {
-        publishTraining() {
-            console.log('发布实训');
-            this.$emit('publish', this.editData);
-        },
-        previewTraining() {
-            console.log('预览实训');
-            this.$emit('preview', this.editData);
-        },
-        clearStep() {
-            this.$confirm('确定清空实训步骤?', '警告', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                clearTrainingStep(this.editData.id).then(res => {
-                    console.log(res, '清空步骤');
-                    this.getStepList(this.editData);
-                }).cathc(err => {
-                    console.log(err, '清空步骤失败');
-                });
-            }).catch(e => {});
-        },
-        editConditionFn(data, index, key) {
-            this.tableData[index][key] = data;
-            this.dialogVisible = true;
-        },
-        getRoleSelect(v) {
-            let name = '';
-            const colObj = this.roleList.find(item => {
-                return item.value == v;
-            });
-            if (colObj) {
-                name = colObj.label;
-            }
-            return name;
-        },
-        getConditionName(row, key) {
-            const obj = row[key] || {};
-            let n = '';
-            switch (obj.t) {
-            case 'V':
-                n = `值为${obj.v}`;
-                break;
-            case 'S':
-                n = `${obj.elementCode}设备的${obj.filedName}属性`;
-                break;
-            case 'E':
-                n = '';
-                break;
-            }
-            return n;
-        },
-        addStep() {
-            const lastIndex = this.tableData.length - 1;
-            let mId = '';
-            if (this.tableData[lastIndex]) {
-                mId = this.tableData[lastIndex].memberId || '';
-            }
-            const obj = {
-                memberId: mId,
-                description: ''
-            };
-            this.tableData.push(obj);
-        },
-        setOperations(data) {
-            if (data) {
-                this.tableData[data.index].operations = data.stepDetail.operations;
-                this.tableData[data.index].tipPosition = data.tipPosition;
-            }
-        },
-        gradeRules() {
-            this.$emit('gradeRules', this.editData);
-        },
-        handleDelete(index, row) {
-            console.log('删除', index, row);
-            this.$confirm('确定删除该条步骤数据?', '警告', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                this.tableData.splice(index, 1);
-            }).catch(e => {});
-        },
-        handleCondition(index, row, key) {
-            console.log(key, '条件', index, row);
-            const member = this.$store.state.training.memberData[row.memberId];
-            if (!member.userId) {
-                assignUsersPlayRoles([{ userId: this.$store.state.user.id, memberId: member.id}], this.$route.query.group).then(resp => {
-                }).catch(() => { this.$message.error('调整角色失败！'); });
-            }
-            this.$emit('handleCondition', index, row, key);
-            this.doClose();
-        },
-        handleEditOperate(index, row) {
-            if (!row.memberId) {
-                this.$message.info('请先选择角色！');
-                return;
-            }
-            const member = this.$store.state.training.memberData[row.memberId];
-            if (!member.userId) {
-                assignUsersPlayRoles([{ userId: this.$store.state.user.id, memberId: member.id}], this.$route.query.group).then(resp => {
-                }).catch(() => { this.$message.error('调整角色失败！'); });
-            }
-            this.$emit('openEditOperate', { index: index, data: row, type: this.editData.type });
-            this.doClose();
-        },
-        minisize() {
-            this.dialogVisible = !this.dialogVisible;
-        },
-        backStep() {
-            this.dialogVisible = true;
-            this.activeName = 'stepList';
-        },
-        doShow(data) {
-            this.getStepList(data);
-            this.dialogVisible = true;
-            this.tabVisible = true;
-        },
-        saveStepData() {
-            const list = [];
-            this.tableData.forEach((item, index) => {
-                const obj = {
-                    ...item
-                    // id: index + 1 + ''
-                };
-                delete obj.isEdit;
-                list.push(obj);
-            });
-            updateTrainingStep(this.group, this.editData.id, list).then(res => {
-                console.log('保存步骤成功！', res);
-                this.$message.success('保存步骤成功！');
-                // this.doClose();
-                this.getStepList(this.editData);
-            }).catch(err => {
-                console.log('保存步骤失败', err);
-                this.$message.error('保存步骤失败');
-            });
-        },
-        doClose() {
-            this.dialogVisible = false;
-        },
-        getStepList(data) { // 获取步骤
-            getTrainingStepList(data.id).then(res => {
-                console.log(res, '获取步骤成功');
-                this.tableData = res.data;
-            }).catch(err => {
-                console.log(err, '获取步骤失败');
-                this.tableData = [];
-            });
-        },
-        getTrainingAllInfo(id) {
-            return new Promise((resolve, reject) => {
-                getTrainingAll(id).then(res => {
-                    console.log(res, '获取详细信息成功');
-                    const data = {
-                        ...res.data
-                    };
-                    const objArr = ['bgSceneJson', 'mapLocationJson'];
-                    objArr.forEach(key => {
-                        data[key] = res.data[key] ? JSON.parse(res.data[key]) : {};
-                    });
-                    const arr = ['labelJson', 'memberJson', 'playerIdJson', 'stepJson'];
-                    arr.forEach(key => {
-                        data[key] = res.data[key] ? JSON.parse(res.data[key]) : [];
-                    });
-                    resolve(data);
-                }).catch(err => {
-                    console.log(err, '获取详细信息失败');
-                    reject(err);
-                });
-            });
-        },
-        updateMapLocation() {
-            const data = Vue.prototype.$jlmap.$options;
-            const params = {scale: data.scaleRate, x: data.offsetX, y: data.offsetY};
-            updateTrainingMaplocation({id: this.editData.id, mapLocationJson: JSON.stringify(params)}).then(res => {
-                console.log('保存地图定位成功！', res);
-                this.$message.success('保存地图定位成功！');
-                this.mapLocationObj = params;
-            }).catch(err => {
-                console.log('保存地图定位失败', err);
-                this.$message.error('保存地图定位失败');
-            });
-        },
-        saveScenesStage() {
-            updateTrainingBackgroud({id: this.editData.id, groupId: this.group}).then(res => {
-                console.log('保存背景', res);
-                this.$message.success('保存背景成功！');
-                this.getTrainingAllInfo(this.editData.id).then(suc => {
-                    this.bgSceneObj = suc.bgSceneJson;
-                }).catch(() => {
-                    this.bgSceneObj = {};
-                });
-            }).catch(err => {
-                console.log('保存背景失败', err);
-                this.$message.error('保存背景失败');
-            });
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.editContent {
-	position: absolute;
-    right: 0;
-	top: 0;
-    height: 100%;
-	width: 800px;
-	transform: translateX(800px);
-	transition: all 0.4s;
-	z-index: 35;
-	background: #fff;
-	&.active{
-		transform: translateX(0px);
-	}
-}
-/deep/ .el-dialog__wrapper {
-	width: 1px;
-	height: 1px;
-	top: auto;
-	right: auto;
-	bottom: auto;
-	left: auto;
-	overflow: visible !important;
-}
-.editContentTab{
-    position: absolute;
-    z-index: 10;
-	left: -12px;
-	top: calc(45% + 100px);
-}
-.editContentTabLable{
-    position: absolute;
-    background: #fff;
-    border-radius: 5px 0px 0px 5px ;
-    padding: 5px 0px;
-    width: 24px;
-    text-align: center;
-    left: 50%;
-    transform: translateX(-50%);
-    cursor: pointer;
-    top:-28px;
-}
-.tabPaneBox {
-	padding: 0 20px;
-	.tabPaneHead, .tabPaneFooter {
-		padding: 10px 0;
-	}
-	.tabPaneFooter {
-		display: flex;
-		justify-content: center;
-	}
-}
-.editContentTitle {
-	height: 50px;
-	padding: 0 20px;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-</style>
diff --git a/src/views/trainingManage/editOperate.vue b/src/views/trainingManage/editOperate.vue
deleted file mode 100644
index 6036b6e61..000000000
--- a/src/views/trainingManage/editOperate.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-<template>
-  <div>
-    <div class="editContentTab">
-      <div v-if="dialogVisible" class="editContentTabLable" @click="minisize">
-        <span class="titleStyle">{{ $t('trainingManage.editTagTitle') }}</span>
-      </div>
-    </div>
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="500" :modal="false" :close-on-click-modal="false" :show-close="false" center style="margin-left: 200px">
-      <el-row style="font-size: 16px;padding: 5px;">
-        <el-col :span="4">步骤描述：</el-col>
-        <el-col :span="20">{{ stepDetail.description }}</el-col>
-      </el-row>
-      <el-row style="font-size: 16px;padding: 5px;overflow: hidden;word-wrap: break-word;">
-        <el-col :span="4">操作详情：</el-col>
-        <el-col :span="20">
-          <!--<div v-for="item in stepDetail.operations" :key="item">
-            <div>{{ item }}</div>
-          </div>-->
-          <template>
-            <div v-for="(item, index) in stepDetail.operations" :key="index">
-              <el-tag :type="tagIndex === index? 'success':''" closable @close="deleteOperation(index)" @click="changeTagIndex(index)">
-                {{ covertString(item) }}
-              </el-tag>
-            </div>
-          </template>
-        </el-col>
-      </el-row>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" type="success" @click="backStepList">返回步骤列表</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
-export default {
-    name: 'EditOperate',
-    data() {
-        return {
-            title: '编辑操作',
-            dialogVisible: false,
-            dialogWidth: 500,
-            dataIndex: 0,
-            tagIndex: 0,
-            trainingType: '',
-            stepDetail: {
-                id: '',
-                description: '',
-                operations: []
-            },
-            cmdMap: {}
-        };
-    },
-    watch: {
-        '$store.state.trainingNew.trainingOperate': function (val) {
-            if (val && this.dialogVisible && this.trainingType === 'SINGLE') {
-                const data = {
-                    deviceCode: val.code || '',
-                    userOperationType: val.userOperationType || '',
-                    domId: val.operation || '',
-                    operationType: val.cmdType ? val.cmdType.value : '',
-                    params: val.param || {},
-                    t: 'C'
-                };
-                this.stepDetail.operations.push(data);
-            }
-        },
-        '$store.state.trainingNew.sceneOperate': function (val) {
-            if (val && this.dialogVisible && this.trainingType === 'SCENE') {
-                const data = {
-                    operationType: val.id,
-                    params: val.command,
-                    t: 'S'
-                };
-                this.stepDetail.operations.push(data);
-            }
-        }
-    },
-    mounted() {
-        for (const key in CMD) {
-            for (const mapKey in CMD[key]) {
-                this.cmdMap[CMD[key][mapKey].value] = CMD[key][mapKey].label;
-            }
-        }
-    },
-    methods: {
-        doShow(data) {
-            if (data) {
-                this.stepDetail.id = data.data.id;
-                this.stepDetail.description = data.data.description;
-                this.stepDetail.operations = data.data.operations || [];
-                this.dataIndex = data.index;
-                this.trainingType = data.type;
-                this.dialogVisible = true;
-            }
-        },
-        minisize() {
-            this.dialogVisible = true;
-        },
-        deleteOperation(index) {
-            if (this.tagIndex === index) {
-                this.tagIndex = 0;
-            }
-            this.stepDetail.operations.splice(index, 1);
-        },
-        changeTagIndex(index) {
-            this.tagIndex = index;
-        },
-        backStepList() {
-            const tipPosition = {};
-            if (this.stepDetail.operations[this.tagIndex] && this.trainingType === 'SINGLE') {
-                tipPosition.domId = this.stepDetail.operations[this.tagIndex].domId;
-                tipPosition.deviceCode = this.stepDetail.operations[this.tagIndex].deviceCode;
-                tipPosition.operateIndex = this.tagIndex;
-            }
-            this.$emit('backStepList', { index: this.dataIndex, stepDetail: this.stepDetail, tipPosition: tipPosition });
-            this.dialogVisible = false;
-            this.stepDetail = {
-                id: '',
-                description: '',
-                operations: []
-            };
-            this.trainingType = '';
-            this.dataIndex = 0;
-            this.tagIndex = 0;
-        },
-        covertString(data) {
-            const userOperationTypeMap = {
-                rightClick: '右键点击',
-                leftClick: '左键点击',
-                chooseValue: '选择',
-                fillValue: '填写'
-            };
-            if (userOperationTypeMap[data.userOperationType]) {
-                return userOperationTypeMap[data.userOperationType] + data.domId;
-            } else if (data.domId) {
-                return data.domId;
-            } else if (data.operationType && this.cmdMap[data.operationType]) {
-                return this.cmdMap[data.operationType];
-            } else {
-                console.log(this.cmdMap, '------------');
-                return '';
-            }
-        }
-    }
-};
-</script>
-
-<style scoped>
-/deep/ .el-dialog__wrapper {
-	width: 1px;
-	height: 1px;
-	top: auto;
-	right: auto;
-	bottom: auto;
-	left: auto;
-	overflow: visible !important;
-}
-/deep/ .el-dialog--center{
-	width: 600px;
-}
-.editContentTab{
-	position: absolute;
-	z-index: 10;
-	right: 12px;
-	top: calc(45% + 100px);
-}
-.editContentTabLable{
-	position: absolute;
-	background: #fff;
-	border-radius: 5px 0 0 5px ;
-	padding: 5px 0;
-	width: 23px;
-	text-align: center;
-	left: 50%;
-	transform: translateX(-50%);
-	cursor: pointer;
-	top:-28px;
-}
-</style>
diff --git a/src/views/trainingManage/expression.vue b/src/views/trainingManage/expression.vue
deleted file mode 100644
index a43d97c62..000000000
--- a/src/views/trainingManage/expression.vue
+++ /dev/null
@@ -1,453 +0,0 @@
-<template>
-  <div @click.stop>
-    <el-form ref="formModel" :model="formModel" :rules="rules" label-width="110px">
-      <el-form-item label="运算符" prop="operator">
-        <el-select v-model="formModel.operator" placeholder="请选择运算符" size="mini">
-          <el-option
-            v-for="option in ConstSelect.operationList"
-            :key="option.value"
-            :label="option.label"
-            :value="option.value"
-          />
-        </el-select>
-      </el-form-item>
-      <div class="rowConditionList">
-        <!-- <el-form-item label="值1类型" prop="t1">
-          <el-select v-model="formModel.t1" placeholder="请选择条件类型" size="mini">
-            <el-option
-              v-for="option in conditionList1"
-              :key="option.value"
-              :label="option.label"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item> -->
-        <el-form-item v-if="showDevice" label="设备类型">
-          <el-select v-model="deviceType" clearable placeholder="请选择设备类型" size="mini" @change="changeDeviceType">
-            <el-option
-              v-for="option in ConstSelect.operationDeviceList"
-              :key="option.value"
-              :label="option.label"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="deviceType == 'Route'" label="初始信号机">
-          <el-select v-model="startSignal" placeholder="请选择值" size="mini">
-            <el-option
-              v-for="option in getSignalList"
-              :key="option.code"
-              :label="option.name"
-              :value="option.code"
-            />
-          </el-select>
-          <el-button :type="field == 'startSignal' ? 'danger' : 'primary'" size="mini" @click="hover('startSignal')">激活</el-button>
-        </el-form-item>
-        <el-form-item v-if="showDevice" label="设备" prop="elementCode">
-          <el-select v-model="formModel.elementCode" clearable placeholder="请选择设备" size="mini">
-            <el-option
-              v-for="option in filterDeviceList"
-              :key="option.code"
-              :label="option.name"
-              :value="option.code"
-            />
-          </el-select>
-          <el-button v-if="showElementCodeActive" :type="field == 'elementCode' ? 'danger' : 'primary'" size="mini" @click="hover('elementCode')">激活</el-button>
-        </el-form-item>
-        <el-form-item v-if="showDevice" label="属性" prop="filedName">
-          <el-select v-model="formModel.filedName" clearable placeholder="请选择设备属性" size="mini" @change="changeFiledName">
-            <el-option
-              v-for="option in getAttributeList"
-              :key="option.name"
-              :label="option.desc"
-              :value="option.name"
-            />
-          </el-select>
-        </el-form-item>
-      </div>
-      <div class="rowConditionList">
-        <!-- <el-form-item v-if="showConditionList2" label="值2类型" prop="t2">
-          <el-select v-model="formModel.t2" placeholder="请选择条件类型" size="mini">
-            <el-option
-              v-for="option in conditionList2"
-              :key="option.value"
-              :label="option.label"
-              :value="option.value"
-            />
-          </el-select>
-        </el-form-item> -->
-        <el-form-item v-if="showValue2" label="值" prop="v">
-          <el-select v-if="optionObj[valueType]" v-model="formModel.v" placeholder="请选择值" size="mini">
-            <el-option
-              v-for="option in optionValueType"
-              :key="option.value"
-              :label="option.label"
-              :value="option.value"
-            />
-          </el-select>
-          <div v-else-if="valueType == 'Section'">
-            <el-select v-model="formModel.v" placeholder="请选择值" size="mini">
-              <el-option
-                v-for="option in getSectionList"
-                :key="option.code"
-                :label="option.name"
-                :value="option.code"
-              />
-            </el-select>
-            <el-button :type="field == 'v' ? 'danger' : 'primary'" size="mini" @click="hover('v')">激活</el-button>
-          </div>
-          <el-input-number v-else-if="valueType=='float' || valueType=='int'" v-model="formModel.v" :precision="valueType=='int' ? 0 : 2" size="mini" style="width: 180px" />
-          <el-input v-else v-model="formModel.v" size="mini" style="width: 180px" />
-        </el-form-item>
-      </div>
-      <el-form-item class="dialog-footer">
-        <el-button v-if="indexPath" size="mini" type="primary" @click="doSave">修改</el-button>
-        <el-button v-else size="mini" type="primary" @click="doAdd">新增</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import ConstConfig from '@/scripts/ConstConfig';
-export default {
-    name: 'Expression',
-    components:{},
-    props: {
-        getDeviceList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        materialsList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            indexPath: '',
-            field: '',
-            deviceType: '',
-            startSignal: '',
-            formModel: {
-                t: 'E',
-                t1: 'S',
-                t2: 'V',
-                valuables1: '',
-                valuables2: '',
-                operator: 'EQ',
-                elementCode: '',
-                filedName: '',
-                v: ''
-            }
-        };
-    },
-    computed: {
-        ConstSelect() {
-            return ConstConfig.ConstSelect;
-        },
-        conditionList1() {
-            return this.ConstSelect.conditionList.filter(item => {
-                return item.value == 'S';
-            });
-        },
-        conditionList2() {
-            return this.ConstSelect.conditionList.filter(item => {
-                return item.value == 'V';
-            });
-        },
-        filterDeviceList() {
-            let list = [];
-            list = this.getDeviceList.filter(item => {
-                return item._type == this.deviceType;
-            });
-            if (this.deviceType == 'Route') {
-                list = list.filter(item => {
-                    return item.startSignalCode == this.startSignal;
-                });
-            }
-            return list;
-        },
-        getSignalList() { // 信号机列表
-            let list = [];
-            list = this.getDeviceList.filter(item => {
-                return item._type == 'Signal';
-            });
-            return list;
-        },
-        getSectionList() { // 区段列表
-            let list = [];
-            list = this.getDeviceList.filter(item => {
-                return item._type == 'Section';
-            });
-            return list;
-        },
-        valueType() {
-            let type = '';
-            const findObj = this.getAttributeList.find(item => {
-                return item.name == this.formModel.filedName;
-            });
-            if (findObj) {
-                type = findObj.type || '';
-            }
-            return type;
-        },
-        optionValueType() {
-            return this.optionObj[this.valueType] || [];
-        },
-        getAttributeList() {
-            let attr = [];
-            if (this.deviceType) {
-                const obj = this.materialsList.find(item => {
-                    return item.srcName == this.deviceType;
-                });
-                if (obj) {
-                    attr = obj.materials;
-                }
-            }
-            return attr;
-        },
-        optionObj() {
-            const obj = {
-                boolean: [
-                    { label: '是', value: true },
-                    { label: '否', value: false }
-                ]
-            };
-            this.materialsList.forEach(item => {
-                item.materials.forEach(every => {
-                    if (every.valueList) {
-                        obj[every.type] = every.valueList;
-                    }
-                });
-            });
-            return obj;
-        },
-        rules() {
-            const crules = {
-                t: [
-                    { required: true, message: '请选择条件类型', trigger: 'blur' }
-                ],
-                t1: [
-                    { required: true, message: '请选择条件类型', trigger: 'blur' }
-                ],
-                t2: [
-                    { required: true, message: '请选择条件类型', trigger: 'blur' }
-                ],
-                operator: [
-                    { required: true, message: '请选择运算符', trigger: 'blur' }
-                ],
-                elementCode: [
-                    { required: true, message: '请选择设备', trigger: 'blur' }
-                ],
-                filedName: [
-                    { required: true, message: '请选择设备属性', trigger: 'blur' }
-                ],
-                v: [
-                    { required: true, message: '请输入值', trigger: 'blur' }
-                ]
-            };
-            return crules;
-        },
-        showElementCodeActive() {
-            let s = true;
-            const arr = ['Route', 'StationDirectionAuto', 'StationDirectionSemi'];
-            if (arr.includes(this.deviceType)) {
-                s = false;
-            }
-            return s;
-        },
-        showDevice() {
-            let s = false;
-            if (this.formModel.t1 == 'S') {
-                s = true;
-            }
-            return s;
-        },
-        showConditionList2() {
-            let s = true;
-            const arr = ['NOT', 'IS'];
-            if (arr.includes(this.formModel.operator)) {
-                s = false;
-            }
-            return s;
-        },
-        showValue2() {
-            let s = true;
-            if (!this.showConditionList2 || this.formModel.t2 != 'V') {
-                s = false;
-            }
-            return s;
-        }
-    },
-    watch: {
-        '$store.state.menuOperation.selectedCount': function(val) {
-            if (this.field && this.showDevice) {
-                const model = this.$store.state.menuOperation.selected;
-                let code = model.code;
-                if (model._type == 'SignalButton' && model.signalCode) {
-                    code = model.signalCode;
-                }
-                let list = this.getDeviceList;
-                if (this.field == 'v') {
-                    list = this.getSectionList;
-                } else if (this.field == 'startSignal') {
-                    list = this.getSignalList;
-                }
-                const findObj = list.find(item => {
-                    return item.code == code;
-                });
-                if (findObj) {
-                    if (this.field == 'startSignal') {
-                        this[this.field] = findObj.code;
-                        this.formModel.elementCode = '';
-                    } else {
-                        this.formModel[this.field] = findObj.code;
-                    }
-                }
-                if (this.field != 'startSignal' && this.deviceType != this.getDeviceType()) {
-                    this.deviceType = this.getDeviceType();
-                    this.formModel.filedName = '';
-                    this.formModel.v = '';
-                }
-                this.field = '';
-            }
-        }
-    },
-    created() {},
-    methods: {
-        changeDeviceType() {
-            this.formModel.elementCode = '';
-            this.formModel.filedName = '';
-            this.formModel.v = '';
-        },
-        changeFiledName() {
-            this.formModel.v = '';
-        },
-        hover(field) {
-            this.field = field == this.field ? '' : field;
-            this.$emit('hover', field);
-        },
-        validate() {
-            return new Promise((resolve, reject) => {
-                this.$refs.formModel.validate(valid => {
-                    if (valid) {
-                        const cpData = {};
-                        cpData.t = this.formModel.t;
-                        cpData.operator = this.formModel.operator;
-                        let objV1 = {
-                            valuables: this.formModel.valuables1.valuables || [],
-                            operator: this.formModel.valuables1.operator || 'EQ',
-                            t: this.formModel.valuables1.t || 'E'
-                        };
-                        let objV2 = {
-                            valuables: this.formModel.valuables2.valuables || [],
-                            operator: this.formModel.valuables2.operator || 'EQ',
-                            t: this.formModel.valuables2.t || 'E'
-                        };
-                        if (this.formModel.t1 == 'S') {
-                            objV1 = {
-                                elementCode: this.formModel.elementCode,
-                                filedName: this.formModel.filedName,
-                                t: 'S'
-                            };
-                        }
-                        if (this.formModel.t2 == 'V') {
-                            objV2 = {
-                                v: this.formModel.v,
-                                t: 'V'
-                            };
-                        }
-                        cpData.valuables = [objV1];
-                        if (this.showConditionList2) {
-                            cpData.valuables[1] = objV2;
-                        }
-                        resolve(cpData);
-                    } else {
-                        reject();
-                    }
-                });
-            });
-        },
-        doAdd() {
-            this.validate().then(res => {
-                this.$emit('addExp', res);
-            });
-        },
-        doSave() {
-            this.validate().then(res => {
-                this.$emit('editExpression', res, this.indexPath);
-            });
-        },
-        setFormData(data, indexPath) {
-            this.indexPath = indexPath;
-            this.clearFromData();
-            if (data) {
-                const valuables = data.valuables || [];
-                this.formModel.t = data.t || '';
-                this.formModel.operator = data.operator || '';
-                this.formModel.valuables1 = valuables[0] || '';
-                this.formModel.valuables2 = valuables[1] || '';
-                if (valuables[0]) {
-                    this.formModel.elementCode = valuables[0].elementCode || '';
-                    this.formModel.filedName = valuables[0].filedName || '';
-                    this.formModel.t1 = valuables[0].t || 'E';
-                } else {
-                    this.formModel.elementCode = '';
-                    this.formModel.filedName = '';
-                    this.formModel.t1 = 'S';
-                }
-                const arr = ['NOT', 'IS'];
-                if (!arr.includes(data.operator) && valuables[1]) {
-                    this.formModel.v = valuables[1].v;
-                    this.formModel.t2 = valuables[1].t;
-                } else {
-                    this.formModel.v = '';
-                    this.formModel.t2 = 'V';
-                }
-            }
-            this.deviceType = this.getDeviceType();
-            this.startSignal = this.getStartSignal();
-        },
-        getDeviceType() {
-            let type = '';
-            const findObj = this.getDeviceList.find(item => {
-                return item.code == this.formModel.elementCode;
-            });
-            if (findObj) {
-                type = findObj._type || '';
-            }
-            return type;
-        },
-        getStartSignal() {
-            let signal = '';
-            const findObj = this.getDeviceList.find(item => {
-                return item.code == this.formModel.elementCode;
-            });
-            if (findObj) {
-                signal = findObj.startSignalCode || '';
-            }
-            return signal;
-        },
-        clearFromData() {
-            this.$refs.formModel.resetFields();
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-	.rowConditionList {
-		display: flex;
-		flex-wrap: wrap;
-	}
-	/deep/ .el-form-item__label {
-		line-height: 28px;
-	}
-	/deep/ .el-form-item__content {
-		line-height: 28px;
-	}
-</style>
diff --git a/src/views/trainingManage/expressionValue.vue b/src/views/trainingManage/expressionValue.vue
deleted file mode 100644
index beafc3d5b..000000000
--- a/src/views/trainingManage/expressionValue.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<template>
-  <div class="mainDiv" @click.stop>
-    <span v-if="valueObj.t == 'V'">
-      <span>{{ valueObj.v }}</span>
-    </span>
-    <span v-if="valueObj.t == 'S'">
-      <span>{{ getElementCodeName(valueObj.elementCode) }}</span>
-      <span>的</span>
-      <span>{{ getFiledName(valueObj) }}</span>
-    </span>
-    <div v-if="valueObj.t == 'E'" :style="{background: activeIndexPath==indexPath ? '#32f807' : ''}">
-      <span>&nbsp;</span>
-      <span v-if="hasSunExp(valueObj) && indexPath != '0'">&nbsp;(&nbsp;</span>
-      <span v-if="!valueObj.valuables[0]">??</span>
-      <span v-if="valueObj.valuables[0] && valueObj.valuables[0].t == 'S'">
-        <span>{{ getElementCodeName(valueObj.valuables[0].elementCode) }}</span>
-        <span>的</span>
-        <span>{{ getFiledName(valueObj.valuables[0]) }}</span>
-      </span>
-      <ExpressionValue v-if="valueObj.valuables[0] && valueObj.valuables[0].t == 'E'" :materials-list="materialsList" :get-device-list="getDeviceList" :value-obj="valueObj.valuables[0]" :index-path="indexPath+'-0'" :active-index-path="activeIndexPath" @editValue="clickExpression" />
-      <span v-if="isBigExp(valueObj)" class="bigExpressionDiv">
-        <el-select v-model="valueObj.operator" placeholder="请选择" size="mini" style="width: 60px">
-          <el-option
-            v-for="option in operationList1"
-            :key="option.value"
-            :label="option.label"
-            :value="option.value"
-          />
-        </el-select>
-      </span>
-      <span v-else class="expressionDiv" @click.stop="clickExpression(valueObj, indexPath)">&nbsp;{{ getOperatorName(valueObj.operator) }}&nbsp;</span>
-      <ExpressionValue v-if="!hasNotIs(valueObj.operator) && valueObj.valuables[1] && valueObj.valuables[1].t == 'E'" :materials-list="materialsList" :get-device-list="getDeviceList" :value-obj="valueObj.valuables[1]" :index-path="indexPath+'-1'" :active-index-path="activeIndexPath" @editValue="clickExpression" />
-      <span v-if="valueObj.valuables[1] && valueObj.valuables[1].t == 'V'">
-        <span>{{ getValueName(valueObj) }}</span>
-      </span>
-      <span v-if="!hasNotIs(valueObj.operator) && !valueObj.valuables[1]">??</span>
-      <span v-if="hasSunExp(valueObj) && indexPath != '0'">&nbsp;)&nbsp;</span>
-      <span>&nbsp;</span>
-    </div>
-  </div>
-</template>
-
-<script>
-import ConstConfig from '@/scripts/ConstConfig';
-export default {
-    name: 'ExpressionValue',
-    components:{},
-    props: {
-        valueObj: {
-            type: Object,
-            default() {
-                return {};
-            }
-        },
-        indexPath: {
-            type: String,
-            default() {
-                return '0';
-            }
-        },
-        activeIndexPath: {
-            type: String,
-            default() {
-                return '';
-            }
-        },
-        getDeviceList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        materialsList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {};
-    },
-    computed: {
-        ConstSelect() {
-            return ConstConfig.ConstSelect;
-        },
-        operationList1() {
-            const arr = ['AND', 'OR'];
-            return this.ConstSelect.operationList.filter(item => {
-                return arr.includes(item.value);
-            });
-        },
-        optionObj() {
-            const obj = {
-                boolean: [
-                    { label: '是', value: true },
-                    { label: '否', value: false }
-                ]
-            };
-            this.materialsList.forEach(item => {
-                item.materials.forEach(every => {
-                    if (every.valueList) {
-                        obj[every.type] = every.valueList;
-                    }
-                });
-            });
-            return obj;
-        },
-        valueTypeList() {
-            let list = [];
-            Object.values(this.optionObj).forEach(item => {
-                list = list.concat(item);
-            });
-            return list;
-        }
-    },
-    watch: {},
-    created() {},
-    methods: {
-        getValueName(obj) {
-            let value = obj.valuables[1].v;
-            const type = this.getValueType(obj.valuables[0]);
-            if (type) {
-                if (type != 'Section') {
-                    const list = this.optionObj[type] || [];
-                    const findObj = list.find(item => {
-                        return item.value == value;
-                    });
-                    if (findObj) {
-                        value = findObj.label;
-                    }
-                } else {
-                    const findObj = this.getDeviceList.find(item => {
-                        return item.code == value;
-                    });
-                    if (findObj) {
-                        value = findObj.name;
-                    }
-                }
-            }
-            return value;
-        },
-        getElementCodeName(code) {
-            let name = code;
-            const findObj = this.getDeviceList.find(item => {
-                return item.code == code;
-            });
-            if (findObj) {
-                name = findObj.name;
-            }
-            return name;
-        },
-        getValueType(obj) {
-            let name = '';
-            const findObj = this.getDeviceAttr(obj);
-            if (findObj) {
-                name = findObj.type;
-            }
-            return name;
-        },
-        getFiledName(obj) {
-            let name = obj.filedName;
-            const findObj = this.getDeviceAttr(obj);
-            if (findObj) {
-                name = findObj.desc;
-            }
-            return name;
-        },
-        getDeviceAttr(obj) {
-            const type = this.deviceType(obj.elementCode);
-            const attrList = this.getAttributeList(type);
-            const findObj = attrList.find(item => {
-                return item.name == obj.filedName;
-            });
-            return findObj;
-        },
-        deviceType(code) {
-            let type = '';
-            const findObj = this.getDeviceList.find(item => {
-                return item.code == code;
-            });
-            if (findObj) {
-                type = findObj._type || '';
-            }
-            return type;
-        },
-        getAttributeList(type) {
-            let attr = [];
-            const obj = this.materialsList.find(item => {
-                return item.srcName == type;
-            });
-            if (obj) {
-                attr = obj.materials;
-            }
-            return attr;
-        },
-        hasSunExp(obj) {
-            let s = false;
-            if (obj.valuables[0] && obj.valuables[0].t == 'E') {
-                if (this.hasNotIs(obj.operator) || (obj.valuables[1] && obj.valuables[1].t == 'E')) {
-                    s = true;
-                }
-            }
-            return s;
-        },
-        isBigExp(obj) {
-            let s = false;
-            if (obj.valuables[0] && obj.valuables[0].t == 'E') {
-                s = true;
-            }
-            return s;
-        },
-        clickExpression(obj, path) {
-            const cpData = JSON.parse(JSON.stringify(obj));
-            this.$emit('editValue', cpData, path);
-        },
-        hasNotIs(operator) {
-            let s = false;
-            const arr = ['NOT', 'IS'];
-            if (arr.includes(operator)) {
-                s = true;
-            }
-            return s;
-        },
-        getOperatorName(o) {
-            let n = '等于';
-            const findObj = ConstConfig.ConstSelect.operationList.find(item => {
-                return item.value == o;
-            });
-            if (findObj) {
-                n = findObj.label;
-            }
-            return n;
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-	.mainDiv {
-		display: inline-block;
-	}
-	.expressionDiv {
-		color: #ff8000;
-		cursor: pointer;
-		&:hover {
-			background: #32f807;
-		}
-	}
-</style>
diff --git a/src/views/trainingManage/gradeRules.vue b/src/views/trainingManage/gradeRules.vue
deleted file mode 100644
index 422f3e064..000000000
--- a/src/views/trainingManage/gradeRules.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="800px" :modal="false" :before-close="doClose" center>
-    <!--  -->
-    <!-- <span>角色：</span> -->
-    <el-form ref="form" :model="addModel" label-width="70px" :rules="rules">
-      <el-form-item label="角色:" prop="memberId" style="display:inline-block">
-        <el-select v-model="addModel.memberId" placeholder="" style="width:145px" size="mini" @change="changeMember">
-          <el-option
-            v-for="item in memberList"
-            :key="item.id"
-            :label="item.normalName"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="总分:" prop="fullMarks" style="display:inline-block">
-        <el-input-number v-model="addModel.fullMarks" style="width:145px" :min="0" size="mini" :step="1" />
-      </el-form-item>
-    </el-form>
-    <!-- <span style="margin-left:10px">总分：</span> -->
-    <!-- </el-form-item> -->
-    <el-table
-      id="gradeRules"
-      ref="gradeRules"
-      :data="allstepList"
-      border
-      :height="350"
-      style="border:1px #ccc solid;"
-    >
-      <el-table-column
-        type="index"
-        label="序号"
-        width="80"
-      />
-      <el-table-column
-        prop="description"
-        label="步骤描述"
-        width="468"
-      />
-      <el-table-column
-        prop="score"
-        label="分值"
-        width="200"
-      >
-        <template v-if="addModel.memberId==scope.row.memberId" slot-scope="scope">
-          <el-input-number v-model="currentStepMap[scope.row.id]" style="width:145px" :min="0" size="mini" :step="1" />
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-row justify="center" style="margin-top:20px">
-      <el-col :span="6" :offset="7">
-        <el-button @click="cancel">取消</el-button>
-      </el-col>
-      <el-col :span="8" :offset="0">
-        <el-button type="primary" :loading="loading" @click="commit">确定 </el-button>
-      </el-col>
-    </el-row>
-  </el-dialog>
-</template>
-<script>
-import {covertMemberData} from '@/views/newMap/displayNew/utils';
-import { getTrainingStepList, getTrainingPlayers, updateTrainingGradeRules, getTrainingGradeRules } from '@/api/trainingManage';
-export default {
-    name: 'GradeRules',
-    props: {},
-    data() {
-        return {
-            dialogVisible: false,
-            trainingId:'',
-            loading:false,
-            title:'评分',
-            allstepList:[],
-            memberList:[],
-            currentStepMap:{},
-            gradeRulesMap:{},
-            addModel:{
-                memberId:'',
-                fullMarks:'',
-                details:[
-                ]
-            },
-            rules:{
-                memberId: [
-                    { required: true, message: '请选择角色', trigger: 'blur' },
-                    { required: true, message: '请选择角色', trigger: 'change' }
-                ],
-                fullMarks: [
-                    { required: true, message: '请输入总分', trigger: 'blur' },
-                    { required: true, message: '请输入总分', trigger: 'change' }
-                ]
-            }
-        };
-    },
-    methods:{
-        doShow(row) {
-            this.dialogVisible = true;
-            this.trainingId = row.id;
-            // 获取步骤
-            getTrainingStepList(row.id).then(resp => {
-                if (resp.data) {
-                    this.allstepList = resp.data;
-                    // 获取规则
-                    getTrainingGradeRules(row.id).then(response=>{
-                        this.gradeRulesMap = {};
-                        response.data.forEach(gradeRule=>{
-                            this.gradeRulesMap[gradeRule.memberId] = gradeRule;
-                        });
-                        // 获取角色信息
-                        getTrainingPlayers(row.id).then(res=>{
-                            let activeTrainList = [];
-                            if (this.$store.state.training.started) {
-                                activeTrainList = this.$store.state.map.activeTrainList;
-                            }
-                            // 获取仿真成员列表
-                            const result = covertMemberData(activeTrainList, res.data);
-                            let list = [];
-                            result.deviceListData.forEach(item => {
-                                list = list.concat(item);
-                            });
-                            this.memberList = list;
-                            if (this.memberList.length > 0) {
-                                this.changeMember(this.memberList[0].id);
-                            }
-                        //
-                        }).catch((e) => {
-                            console.error(e);
-                        });
-                    });
-                }
-            }).catch((e) => {
-                console.error(e);
-                this.$message.error('获取实训步骤信息失败！');
-            });
-        },
-        changeMember(memberId) {
-            const currentStepMap = {};
-            this.allstepList.forEach(each=>{
-                if (each.memberId == memberId) {
-                    currentStepMap[each.id] = 0;
-                }
-            });
-            if (this.gradeRulesMap[memberId]) {
-                this.addModel.fullMarks = this.gradeRulesMap[memberId].fullMarks;
-                this.gradeRulesMap[memberId].details.forEach(each=>{
-                    currentStepMap[each.elementId] = each.score;
-                });
-            } else {
-                this.addModel.fullMarks = '';
-                this.addModel.details = [];
-            }
-            this.currentStepMap = Object.assign({}, currentStepMap);
-            this.addModel.memberId = memberId;
-        },
-        doClose() {
-            this.dialogVisible = false;
-        },
-        cancel() {
-            this.doClose();
-        },
-        commit() {
-            const that = this;
-            that.$refs.form.validate((valid) => {
-                if (valid) {
-                    const keyList = Object.keys(that.currentStepMap);
-                    const details = [];
-                    keyList.forEach(key=>{
-                        details.push({elementId:key, score:that.currentStepMap[key]});
-                    });
-                    that.addModel.details = details;
-                    const gradeRulesList = Object.values(that.gradeRulesMap);
-                    gradeRulesList.map(gradeRule=>{
-                        if (gradeRule.memberId == that.addModel.memberId) {
-                            gradeRule.details = [...that.addModel.details];
-                            gradeRule.fullMarks = that.addModel.fullMarks;
-                        }
-                    });
-                    if (!that.gradeRulesMap[that.addModel.memberId] && that.addModel.details.length > 0) {
-                        gradeRulesList.push(that.addModel);
-                    }
-                    if (that.addModel.details.length > 0) {
-                        let result = false;
-                        gradeRulesList.forEach(gradeRules=>{
-                            let total = 0;
-                            gradeRules.details.forEach(detail=>{
-                                total += detail.score || 0;
-                            });
-                            if (total !== gradeRules.fullMarks) {
-                                result = result || true;
-                            }
-                        });
-                        if (result) {
-                            that.$message.error('步骤分总和不等于总分');
-                            return;
-                        }
-                        that.loading = true;
-                        updateTrainingGradeRules(that.trainingId, gradeRulesList).then(resp => {
-                            that.loading = false;
-                            that.gradeRulesMap[that.addModel.memberId] = JSON.parse(JSON.stringify(that.addModel));
-                            that.$message.success('更新实训评分规则成功！');
-                        }).catch((e) => {
-                            that.loading = false;
-                            console.error(e);
-                            that.$message.error('更新实训评分规则失败！');
-                        });
-                    } else {
-                        that.$message.error('该角色不存在');
-                    }
-                }
-            });
-        }
-    }
-};
-</script>
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index c7e2bb97d..ee421f9c1 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -1,256 +1,85 @@
 <template>
   <div v-loading="loading" class="map-list-main">
-    <div class="mapListName">
-      <span>{{ $t('global.mapList') }}</span>
-    </div>
-    <template v-if="!IsProject">
-      <filter-city ref="filerCity" filter-empty local-param-name="training_cityCode" @filterSelectChange="refresh" />
-      <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
-    </template>
     <div id="trainingMapTree" class="left-map-list">
-      <el-tree
-        ref="tree"
-        :data="treeList"
-        node-key="key"
-        :props="{children:'children',label:'name'}"
-        highlight-current
-        :span="22"
-        :filter-node-method="filterNode"
-        :default-expanded-keys="expandList"
-        @node-click="clickEvent"
-        @node-expand="nodeExpand"
-        @node-collapse="nodeCollapse"
+      <div class="mapListName">
+        <div style="width: 100px;">线路列表</div>
+        <div style="width: calc(100% - 117px);">
+          <el-input v-model="filterText" placeholder="请输入内容" style="width: 100%">
+            <i slot="prefix" class="el-input__icon el-icon-search" />
+          </el-input>
+        </div>
+      </div>
+      <el-menu
+        :default-active="defaultIndex"
+        class="el-menu-vertical-demo"
+        background-color="#545c64"
+        text-color="#fff"
+        active-text-color="#ffd04b"
       >
-        <span slot-scope="{ node }">
-          <span
-            class="el-icon-tickets"
-          />
-          <span v-if="node.data.id ==='Simulation'" :id="node.data.key">&nbsp;{{ node.data.name+ $t('global.simulationSystem') }}</span>
-          <span v-else-if="node.data.id ==='Lesson'" :id="node.data.key">&nbsp;{{ node.data.name+ $t('global.lessonSystem') }}</span>
-          <span v-else-if="node.data.id ==='Exam'" :id="node.data.key">&nbsp;{{ node.data.name+ $t('global.examSystem') }}</span>
-          <span v-else-if="node.data.id ==='Plan'" :id="node.data.key">&nbsp;{{ node.data.name+ $t('global.runPlanSystem') }}</span>
-          <span v-else :id="node.data.key">&nbsp;{{ node.data.name }}</span>
-        </span>
-      </el-tree>
+        <template v-for="(map, mapIndex) in mapList">
+          <el-menu-item v-show="map.name.includes(filterText)" :key="mapIndex" :index="map.id" @click="gotoPath(map)">
+            {{ map.name }}
+          </el-menu-item>
+        </template>
+      </el-menu>
     </div>
   </div>
 </template>
 <script>
-import { getTrainingSystemList, getSubSystemInfo, getSubSystemByProjectCode } from '@/api/trainingPlatform';
-import { getPublishMapInfo } from '@/api/jmap/map';
-import { UrlConfig } from '@/scripts/ConstDic';
-import FilterCity from '@/views/components/filterCity';
-import localStore from 'storejs';
-import { getSessionStorage } from '@/utils/auth';
-import { GetMapListByProjectList } from '@/scripts/ProjectConfig';
-
+import {queryMapListByUser} from '../../api/jmap/map';
+// import { EventBus } from '@/scripts/event-bus';
 export default {
     name: 'DemonList',
     components: {
-        FilterCity
     },
     data() {
         return {
             loading: true,
             filterText: '',
-            treeList: [],
-            mapId: '',
-            expandList: [],
-            filterSelect: ''
+            mapList: [],
+            defaultIndex: ''
         };
     },
-    computed: {
-        userId() {
-            return this.$store.state.user.id;
-        },
-        project() {
-            return getSessionStorage('project');
-        },
-        IsProject() {
-            // 实训平台 是否为通过项目code获取地图列表的项目
-            return GetMapListByProjectList.includes(this.project);
-        }
-    },
     watch: {
-        filterText(val) {
-            this.$refs.tree.filter(val);
+        '$route': function(val) {
+            if (this.mapList && this.mapList.length && this.$route.path.includes('simulation/simulationIndex')) { // 重定向
+                const map = this.mapList[0];
+                this.gotoPath(map, true);
+            }
+            this.defaultIndex = this.$route.params.mapId;
         }
     },
     mounted() {
-        if (this.IsProject) {
-            this.refresh();
-        }
+        this.mapList = [];
+        this.loading = true;
+        queryMapListByUser().then(resp => {
+            this.mapList = resp.data;
+            // EventBus.$emit('setMapList', this.mapList);
+            this.$store.dispatch('lineList/setLineList', this.mapList);
+            if (this.mapList && this.mapList.length && this.$route.path.includes('simulation/simulationIndex')) {
+                const map = this.mapList[0];
+                // const path = `/trainingPlatform/simulation/${map.id}?lineCode=${map.lineCode}`;
+                // this.defaultIndex = path;
+                // this.$router.push(path);
+                this.gotoPath(map);
+            } else if (this.$route.params.mapId) {
+                // this.defaultIndex = this.$route.fullPath;
+                this.defaultIndex = this.$route.params.mapId;
+            }
+            this.loading = false;
+        }).catch(e => {
+            this.loading = false;
+            this.$message.error('获取地图列表失败！');
+        });
     },
     methods: {
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.name.includes(value);
-        },
-        clickEvent(obj, data, ele, isReplace = false) {
-            if (ele) {
-                if ( ele.expanded) {
-                    ele.expanded = false;
-                } else {
-                    ele.expanded = true;
-                }
-            }
-
-            localStore.set('trainingPlatformCheckId' + this.filterSelect + this.userId + this.project, obj.key);
-            this.mapId = obj.key.split('-')[0];
-            if ( obj.type === 'Map') {
-                this.mapId = obj.id;
-                const router = { path: `${UrlConfig.trainingPlatform.permission}/${this.mapId}`};
-                this.toNextPage(isReplace, router);
-            } else if ( obj.type === 'System' ) {
-                const router = { path: `${UrlConfig.trainingPlatform.secondaryHome}`, query: { type: obj.id } };
-                this.toNextPage(isReplace, router);
-            } else if ( obj.type === 'MapSystem') {
-                getSubSystemInfo(obj.id).then(resp => { // 查询子系统信息
-                    let router = '';
-                    switch (resp.data.type) {
-                    case 'Exam':
-                        // this.setLocalRoute(`${UrlConfig.trainingPlatform.examHome}/${obj.id}`);
-                        // router = localStore.get('examDetail' + obj.id);
-                        // if (!router) { router = { path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`}; }
-                        // this.toNextPage(isReplace, router);
-                        router = { path: `${UrlConfig.trainingPlatform.examHome}/${obj.id}`};
-                        this.toNextPage(isReplace, router);
-                        break;
-                    case 'Lesson':
-                        this.setLocalRoute(`${UrlConfig.trainingPlatform.teachHome}/${obj.id}`);
-                        router = { path: `${UrlConfig.trainingPlatform.teachHome}/${obj.id}`};
-                        this.toNextPage(isReplace, router);
-                        break;
-                    case 'Simulation':
-                        if (resp.data.prdType == '08') {
-                            // 运行图编辑工作站
-                            getPublishMapInfo(this.mapId).then(rest => {
-                                this.setLocalRoute(`${UrlConfig.trainingPlatform.runPlan}/${this.mapId}?lineCode=${rest.data.lineCode}`);
-                                router = { path: `${UrlConfig.trainingPlatform.runPlan}/${this.mapId}`, query: { lineCode: rest.data.lineCode}};
-                                this.toNextPage(isReplace, router);
-                            });
-                        } else {
-                            this.setLocalRoute(`${UrlConfig.trainingPlatform.prodDetail}/${obj.id}?mapId=${this.mapId}`);
-                            router = { path: `${UrlConfig.trainingPlatform.prodDetail}/${obj.id}`, query: { mapId: this.mapId}};
-                            this.toNextPage(isReplace, router);
-                        }
-                        break;
-                    }
-                }).catch((error) => {
-                    if (error.code === '40004') {
-                        this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail'));
-                    }
-                });
-            }
-        },
-        toNextPage(isReplace, router) {
-            isReplace ? this.$router.replace(router) : this.$router.push(router);
-        },
-        setLocalRoute(path) {
-            localStore.set('trainingPlatformRoute' + this.userId + this.project, path);
-        },
-        forTree(item) {
-            item.children && item.children.forEach(childrenItem => {
-                childrenItem.key = item.key + '-' + childrenItem.id;
-                if (childrenItem.children && childrenItem.children.length) {
-                    this.forTree(childrenItem);
-                }
-            });
-        },
-        async refresh(filterSelect) {
-            this.loading = true;
-            this.treeList = [];
-            this.filterSelect = filterSelect;
-            try {
-                let res = {};
-                if (this.IsProject) {
-                    res = await getSubSystemByProjectCode();
-                } else {
-                    res = await getTrainingSystemList(filterSelect);
-                }
-                this.$emit('goRoutePath', res.data);
-                res.data && res.data.forEach(item =>{
-                    item.key = item.id;
-                    this.forTree(item);
-                });
-                if (this.project === 'cgy') {
-                    this.treeList = [];
-                    res.data.forEach(item => {
-                        const childList = [];
-                        if (item && item.children && item.children.length > 3) {
-                            item.children.forEach(elem => {
-                                if (elem.id === 'Lesson') {
-                                    childList[0] = elem;
-                                } else if (elem.id === 'Exam') {
-                                    childList[3] = elem;
-                                } else if (elem.id === 'Simulation') {
-                                    childList[1] = elem;
-                                } else {
-                                    childList[2] = elem;
-                                }
-                            });
-                            item.children = childList;
-                        }
-                    });
-                }
-                this.treeList = res.data;
-                this.getExpandList(filterSelect);
-                this.$nextTick(() => {
-                    let checkId = localStore.get('trainingPlatformCheckId' + filterSelect + this.userId + this.project) || null;
-                    checkId = checkId && checkId.includes('-') ? checkId : null;
-                    if (!this.$route.query.thirdJump) {
-                        this.$refs.tree && this.$refs.tree.setCurrentKey(checkId);
-                    }
-                    if (!this.$route.path.includes('result') && !this.$route.path.includes('/trainingPlatform/teach/') && !this.$route.query.thirdJump) {
-                        checkId && this.findTree(this.treeList, checkId);
-                        !checkId && this.treeList && this.treeList.length && this.clickEvent(this.treeList[0], {data: this.treeList[0]});
-                    }
-                    setTimeout(()=> {
-                        if (checkId) {
-                            const checkIdDom = document.getElementById(checkId);
-                            const mapTreeDom = document.getElementById('trainingMapTree');
-                            if (checkIdDom && mapTreeDom) {
-                                mapTreeDom.scrollTop = checkIdDom.offsetTop;
-                            }
-                        }
-                        this.loading = false;
-                    }, 200);
-                });
-            } catch (error) {
-                this.loading = false;
-                this.$message.error(this.$t('error.refreshFailed'));
-            }
-        },
-        /* 根据localstorage缓存的trainingPlatformCheckId跳转右侧显示页面 */
-        findTree(treeList, checkId, data) {
-            treeList && treeList.length && treeList.forEach(item =>{
-                if (item.type === 'Map') {
-                    data = item;
-                }
-                if (checkId === item.key) {
-                    this.clickEvent(item, {data: data}, null, true);
-                } else {
-                    this.findTree(item.children, checkId, data);
-                }
-            });
-        },
-        nodeExpand(obj, node, ele) {
-            const key = obj.key;
-            this.expandList = this.expandList.filter(item => item !== key);
-            this.expandList.push(key);
-            localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId + this.project, this.expandList);
-        },
-        nodeCollapse(obj, node, ele) {
-            const key = obj.key;
-            this.expandList = this.expandList.filter(item => (item !== key && !item.startsWith(`${key}-`)));
-            localStore.set('trainIngPlatformExpandList' + this.filterSelect + this.userId + this.project, this.expandList);
-        },
-        getExpandList(filterSelect) {
-            this.expandList = [];
-            let expand = localStore.get('trainIngPlatformExpandList' + filterSelect + this.userId + this.project);
-            expand = expand ? (expand + '').split(',') : '';
-            if (expand instanceof Array) {
-                this.expandList = expand;
+        gotoPath(map, isReplace) {
+            const path = `/trainingPlatform/simulation/${map.id}?lineCode=${map.lineCode}`;
+            this.defaultIndex = map.id;
+            if (isReplace) {
+                this.$router.replace(path);
+            } else {
+                this.$router.push(path);
             }
         }
     }
@@ -258,26 +87,32 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
     .mapListName{
-        padding: 15px 0px 15px 17px;
+        padding: 10px 0 10px 17px;
+		color: #fff;
+		background: #545c64;
+		display: flex;
+		justify-content: left;
+		align-items: center;
+		position: sticky;
+		position: -webkit-sticky;
+		border-bottom: 3px solid #8c8a89;
+		top: 0;
+		z-index: 9;
     }
     .left-map-list{
         width: 100%;
+		height: 100%;
         flex: 1;
-        overflow: auto;
+        overflow: scroll;
         padding-bottom: 10px;
-        padding-top: 5px;
+		background: #545c64;
     }
     .map-list-main{
         height: 100%;
         display:flex;
         flex-direction:column;
     }
-</style>
-<style>
-    .el-tree {
-        overflow-x: hidden;
-    }
-    .el-tree-node.is-current>.el-tree-node__content {
-        background-color: #e4e3e3 !important;
-    }
+	/deep/.el-menu{
+		border-right-width: 0;
+	}
 </style>
diff --git a/src/views/trainingPlatform/index.vue b/src/views/trainingPlatform/index.vue
index 87c203676..c97f9b701 100644
--- a/src/views/trainingPlatform/index.vue
+++ b/src/views/trainingPlatform/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="trainingPlatform" :style="'padding-left:'+(widthLeft)+'px'">
     <div class="trainingPubMapList" :style="{width: widthLeft+'px'}">
-      <demon-list ref="demonList" @goRoutePath="goRoutePath" />
+      <demon-list ref="demonList" />
       <drap-left :width-left="widthLeft" @drapWidth="drapWidth" />
     </div>
     <transition>
@@ -14,7 +14,7 @@
 import demonList from './demonList';
 import drapLeft from '@/views/components/drapLeft/index';
 import localStore from 'storejs';
-import { getSessionStorage, setSessionStorage } from '@/utils/auth';
+// import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 
 export default {
     name: 'TrainingPlatform',
@@ -38,22 +38,14 @@ export default {
     methods: {
         drapWidth(width) {
             this.widthLeft = Number(width);
-        },
-        goRoutePath(data) {
-            const againEnter = getSessionStorage('againEnter') || null;
-            if (!againEnter && !this.$route.query.thirdJump) {
-                const project = getSessionStorage('project');
-                const userId = this.$store.state.user.id;
-                const path = localStore.get('trainingPlatformRoute' + userId + project);
-                if (path && path.startsWith('/trainingPlatform')) {
-                    localStore.set('orignalTrainingPlatformRoute' + userId + project, `/trainingPlatform/permission/${data[0].id}`);
-                    this.$router.push(path);
-                } else if (data && data[0]) {
-                    this.$router.push(`/trainingPlatform/permission/${data[0].id}`);
-                }
-                setSessionStorage('againEnter', true);
-            }
         }
+        // goRoutePath(data) {
+        //     const againEnter = getSessionStorage('againEnter') || null;
+        //     if (!againEnter && !this.$route.query.thirdJump) {
+        //         this.$router.push(`/trainingPlatform/simulation/${data[0].id}?lineCode=${data[0].lineCode}`);
+        //         setSessionStorage('againEnter', true);
+        //     }
+        // }
     }
 };
 </script>
diff --git a/src/views/package/selectRole/list.vue b/src/views/trainingPlatform/selectRole/list.vue
similarity index 100%
rename from src/views/package/selectRole/list.vue
rename to src/views/trainingPlatform/selectRole/list.vue
diff --git a/src/views/trainingPlatform/simulation.vue b/src/views/trainingPlatform/simulation.vue
new file mode 100644
index 000000000..889731743
--- /dev/null
+++ b/src/views/trainingPlatform/simulation.vue
@@ -0,0 +1,352 @@
+<template>
+  <div style="height: 100%;width: 100%;padding-bottom: 20px;">
+    <div style="height: 50px;text-align: center;line-height: 50px;font-size: 26px;font-weight: bolder;">{{ mapName }}</div>
+    <el-tabs v-model="activeName" style="height: calc(100% - 30px);margin: 0 10px;overflow-y: auto;" type="border-card">
+      <el-tab-pane label="功能" name="first" style="height: 100%;">
+        <el-collapse v-model="collapse" accordion>
+          <template v-for="item in subsetList">
+            <el-collapse-item :key="item" :title="item" :name="item" class="function-box">
+              <div style="display: flex;flex-wrap:wrap;  justify-content:center;padding-bottom:30px">
+                <template>
+                  <el-card v-for="system in subsetMap[item]" :key="system.id" class="box-card">
+                    <div style="text-align: center;font-size: 26px;font-weight: bolder;color: #0C161A;">{{ system.name }}</div>
+                    <div class="content-box">{{ system.desc }}</div>
+                    <el-button style="position: absolute;bottom: 15px;left: 0;right: 0;margin: 0 auto;width: 60px;" size="small" type="primary" @click="enterSimulation(system)">进入</el-button>
+                  </el-card>
+                </template>
+              </div>
+            </el-collapse-item>
+          </template>
+        </el-collapse>
+      </el-tab-pane>
+      <el-tab-pane label="联机" name="second">
+        <el-form ref="ruleForm" v-loading="loading" :model="ruleForm" :rules="rules" label-width="100px">
+          <el-form-item label="仿真号" prop="inputGroup">
+            <el-input v-model="ruleForm.inputGroup" placeholder="请输入仿真号" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="joinSimulation">立即加入</el-button>
+            <el-button @click="resetGroup">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="权限" name="third">
+        <div style="height: 100%; overflow: auto;">
+          <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+          <select-role ref="selectRole" @reloadTable="reloadTable" />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getMapIdPermisson } from '@/api/userRulesManage';
+import { queryMapFunctionList } from '@/api/trainingPlatform';
+import selectRole from './selectRole/list';
+import { launchFullscreen } from '@/utils/screen';
+import { createSimulation } from '@/api/simulation';
+import { getSessionStorage } from '@/utils/auth';
+import { jointSimulationByPermission } from '@/api/jointSimulation';
+export default {
+    name: 'Simulation',
+    components: {
+        selectRole
+    },
+    data() {
+        return {
+            loading: false,
+            param: '',
+            collapse: '1',
+            subsetList: [],
+            subsetMap: {},
+            loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts', 'hlsdrts', 'designhlsdrts', 'teaching', 'designteaching'],
+            activeName: 'first',
+            WhetherTypeList: [],
+            activeNames: ['1', '2'],
+            systemList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            rules: {
+                inputGroup: [
+                    { required: true, message: '请输入仿真号', trigger: 'blur' }
+                ]
+            },
+            ruleForm: {
+                inputGroup: ''
+            },
+            queryForm: {
+                show: false,
+                labelWidth: '140px',
+                reset: true,
+                leftSpan: 18,
+                queryObject: {
+                    'subjectType': {
+                        type: 'select',
+                        label: '主体类型',
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                paginationHiden: true,
+                columns: [
+                    {
+                        title: this.$t('permission.permissionName'),
+                        prop: 'permissionName'
+                    },
+                    {
+                        title: '权限类型',
+                        prop: 'permissionType',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.permissionType, 'permissionTypeList'); },
+                        tagType: (row) => { return ''; }
+                    },
+                    // {
+                    //     title: '主体类型',
+                    //     prop: 'subjectType',
+                    //     width: '80',
+                    //     type: 'tag',
+                    //     columnValue: (row) => { return this.$ConstSelect.translate(row.subjectType, 'subTypeList'); },
+                    //     tagType: (row) => { return ''; }
+                    // },
+                    {
+                        title: '功能',
+                        prop: 'systemAbilityList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getAbilityList(row.systemAbilityList); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('permission.isForever'),
+                        width: '80',
+                        prop: 'forever',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.forever) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('permission.permissionTotal'),
+                        width: '80',
+                        prop: 'amount'
+                    },
+                    {
+                        title: this.$t('permission.permissionRemains'),
+                        width: '80',
+                        prop: 'remains'
+                    },
+                    {
+                        title:this.$t('global.startTime'),
+                        prop: 'startTime',
+                        width: '160'
+
+                    },
+                    {
+                        title: this.$t('permission.endTime'),
+                        prop: 'endTime',
+                        width: '160'
+                    },
+                    {
+                        title: this.$t('permission.permissionStatus'),
+                        prop: 'status',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.status, 'EffectiveTypeList'); },
+                        tagType: (row) => {
+                            switch (row.status) {
+                            case '1': return 'success';
+                            default: return 'danger';
+                            }
+                        }
+                    }
+                    // {
+                    //     title: this.$t('permission.belonger'),
+                    //     prop: 'named',
+                    //     width: '80',
+                    //     isShow: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0 || this.$store.state.user.roles.indexOf(admin) > 0; }
+                    // },
+                    // {
+                    //     type: 'button',
+                    //     title: this.$t('global.operate'),
+                    //     width: '300',
+                    //     hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0 || this.$store.state.user.roles.indexOf(admin) < 0; },
+                    //     buttons: [
+                    //         {
+                    //             name: this.$t('permission.setBelonger'),
+                    //             handleClick: this.handleRoleVest,
+                    //             type: ''
+                    //         }
+                    //     ]
+                    // }
+                ]
+            }
+        };
+    },
+    computed: {
+        project() {
+            return getSessionStorage('project');
+        },
+        mapList() {
+            return this.$store.state.lineList.lineList;
+        },
+        mapName() {
+            let name = '';
+            const map = this.mapList.find(map => map.id === this.$route.params.mapId);
+            if (map) {
+                name = map.name;
+            }
+            return name;
+        }
+    },
+    watch: {
+        '$route.params.mapId': function (val) {
+            this.$refs.queryListPage.refresh(true);
+            this.subsetList = [];
+            this.subsetMap = {};
+            this.initMapSystem(true);
+        }
+    },
+    mounted() {
+        this.loadInitData();
+        this.initMapSystem();
+    },
+    methods: {
+        getAbilityList(list) {
+            const arr = [];
+            list && list.forEach(item => {
+                arr.push(item.abilityName);
+            });
+            return arr;
+        },
+        handleRoleVest(index, row) {
+            this.$refs.selectRole.doShow(row.id);
+        },
+        initMapSystem() {
+            queryMapFunctionList({mapId: this.$route.params.mapId}).then(resp => {
+                this.systemList = resp.data;
+                this.systemList.forEach(item => {
+                    if (item.subset && this.subsetList.includes(item.subset)) {
+                        this.subsetMap[item.subset].push(item);
+                    } else if (item.subset) {
+                        this.subsetList.push(item.subset);
+                        this.subsetMap[item.subset] = [item];
+                    } else {
+                        if (!this.subsetList.includes('默认')) {
+                            this.subsetList.push('默认');
+                            this.subsetMap['默认'] = [];
+                            console.log('***/');
+                        }
+                        this.subsetMap['默认'].push(item);
+                    }
+                });
+                this.collapse = this.subsetList[0];
+            }).catch(() => {
+                this.$message.error('获取地图子系统列表失败！');
+            });
+        },
+        loadInitData() {
+            this.queryForm.queryObject.subjectType.config.data = this.$ConstSelect.subTypeList;
+        },
+        formatterDate(row, porpInfo) {
+            return row[porpInfo.property] ? row[porpInfo.property] : this.$t('global.perpetual');
+        },
+        queryFunction(params) {
+            return getMapIdPermisson(this.$route.params.mapId);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        enterSimulation(system) {
+            createSimulation(system.id).then(resp => {
+                const query = {
+                    lineCode: this.$route.query.lineCode,
+                    group: resp.data,
+                    mapId: system.mapId,
+                    simType: system.simType,
+                    project: this.project
+                };
+                if (system.paramVO && system.paramVO.domConfig && system.paramVO.domConfig.client) {
+                    query.client = system.paramVO.domConfig.client;
+                }
+                if (system.paramVO && system.paramVO.domConfig && system.paramVO.domConfig.singleClient) {
+                    query.singleClient = system.paramVO.domConfig.singleClient;
+                }
+                if (this.loadingProjectList.includes(this.project)) {
+                    this.$store.dispatch('app/transitionAnimations');
+                }
+                this.$router.push({ path: `/display/demon`, query: query });
+                launchFullscreen();
+            }).catch(error=>{
+                if (error.code == 10003) {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + '：您的仿真权限不足！');
+                } else {
+                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
+                }
+                this.disabled = false;
+            });
+        },
+        async joinSimulation() {
+            this.$refs.ruleForm.validate((valid) => {
+                if (valid) {
+                    this.loading = true;
+                    jointSimulationByPermission(this.ruleForm.inputGroup).then(resp => {
+                        this.loading = false;
+                        const query = {
+                            lineCode: resp.data.map.lineCode,
+                            group: resp.data.group,
+                            mapId: resp.data.map.id,
+                            simType: resp.data.paramVO.type,
+                            project: this.project
+                        };
+                        this.$router.push({ path: `/display/demon`, query: query });
+                    }).catch(() => {
+                        this.loading = false;
+                        const errorMessage = this.isShow ? this.$t('tip.failedToAddNewRoom') : this.$t('error.scanningError');
+                        this.$messageBox(`${errorMessage}:请稍后再试`);
+                    });
+                }
+            });
+        },
+        resetGroup() {
+            this.ruleForm.inputGroup = '';
+            this.$refs.ruleForm.resetFields();
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.box-card {
+	width: 30%;
+	padding: 10px;
+	height: 220px;
+	margin: 20px;
+	position: relative;
+}
+.content-box {
+	font-size: 14px;
+	color: #0C161A;
+	text-indent: 28px;
+	height: 100px;
+	overflow-y: hidden;
+	text-overflow: ellipsis;
+	word-break:break-all;
+	display:-webkit-box;
+	-webkit-line-clamp:4;
+	-webkit-box-orient:vertical;
+}
+</style>
diff --git a/src/views/userRulesManage/index.vue b/src/views/userRulesManage/index.vue
new file mode 100644
index 000000000..7893fcf5f
--- /dev/null
+++ b/src/views/userRulesManage/index.vue
@@ -0,0 +1,208 @@
+<template>
+  <div>
+    <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    <PermissionList ref="list" />
+  </div>
+</template>
+
+<script>
+import { listPermision, setPermissonInValid } from '@/api/userRulesManage';
+import PermissionList from './permissionList';
+
+export default {
+    name: 'UserRulesManage',
+    components: {
+        PermissionList
+    },
+    data() {
+        return {
+            belongForm: {},
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '120px',
+                reset: true,
+                queryObject: {
+                    named: {
+                        type: 'text',
+                        label: '主体名称'
+                    },
+                    subType: {
+                        type: 'select',
+                        label: '主体类型',
+                        config: {
+                            data: []
+                        }
+                    },
+                    status: {
+                        type: 'select',
+                        label: this.$t('permission.statusType'),
+                        config: {
+                            data: []
+                        }
+                    }
+
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                indexShow: true,
+                defaultSort:{prop:'sortOrder', order:''},
+                columns: [
+                    {
+                        title: '主体名称',
+                        prop: 'named'
+                    },
+                    {
+                        title: this.$t('permission.nickName'),
+                        prop: 'nickName'
+                    },
+                    {
+                        title: this.$t('permission.permissionName'),
+                        prop: 'permissionName'
+                    },
+                    {
+                        title: '主体类型',
+                        prop: 'subjectType',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.subjectType, 'subTypeList'); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: '功能',
+                        prop: 'systemAbilityList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getAbilityList(row.systemAbilityList); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('permission.isForever'),
+                        width: '80',
+                        prop: 'forever',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.forever) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('permission.permissionTotal'),
+                        width: '80',
+                        prop: 'amount'
+                    },
+                    {
+                        title: this.$t('permission.permissionRemains'),
+                        width: '80',
+                        prop: 'remains'
+                    },
+                    {
+                        title:this.$t('global.startTime'),
+                        prop: 'startTime',
+                        width: '160'
+
+                    },
+                    {
+                        title: this.$t('permission.endTime'),
+                        prop: 'endTime',
+                        width: '160'
+                    },
+                    {
+                        title: this.$t('permission.permissionStatus'),
+                        prop: 'status',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.status, 'EffectiveTypeList'); },
+                        tagType: (row) => {
+                            switch (row.status) {
+                            case '1': return 'success';
+                            default: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '200',
+                        buttons: [
+                            {
+                                name: this.$t('orderAuthor.setupFailure'), // 设置失效
+                                handleClick: this.handleEfficacy,
+                                showControl: (row) => { return row.status === '1'; },
+                                type: 'warning'
+                            },
+                            {
+                                name: '权限流向',
+                                handleClick: this.handleRestoreList,
+                                showControl: (row) => { return row.amount !== row.remains; },
+                                type: ''
+                            }
+                        ]
+                    }
+                ],
+                actions: [
+                ]
+            }
+        };
+    },
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        getAbilityList(list) {
+            const arr = [];
+            list && list.forEach(item => {
+                arr.push(item.abilityName);
+            });
+            return arr;
+        },
+        loadInitData() {
+            this.$ConstSelect.EffectiveTypeList.forEach(elem => {
+                this.queryForm.queryObject.status.config.data.push(elem);
+            });
+            this.$ConstSelect.subTypeList.forEach(elem => {
+                this.queryForm.queryObject.subType.config.data.push(elem);
+            });
+        },
+        formatterDate(row, porpInfo) {
+            return row[porpInfo.property] ? row[porpInfo.property] : this.$t('global.perpetual');
+        },
+        handleRestoreList(index, row) {
+            this.$refs.list.doShow(index, row);
+        },
+        queryFunction(params) {
+            // params.distributeId = this.$route.query.distributeId;
+            return listPermision(params);
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        },
+        handleEfficacy(index, row) {
+            this.$confirm(this.$t('tip.modifyTheUserPermissionStatus'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                setPermissonInValid(row.id).then(res => {
+                    this.$message.success(this.$t('tip.operationSuccessfully'));
+                    this.reloadTable();
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.operationFailed'));
+                    this.reloadTable();
+                });
+            }).catch(() => { });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/userRulesManage/permissionList.vue b/src/views/userRulesManage/permissionList.vue
new file mode 100644
index 000000000..4d5a9a3ff
--- /dev/null
+++ b/src/views/userRulesManage/permissionList.vue
@@ -0,0 +1,188 @@
+<template>
+  <el-dialog v-dialogDrag title="权限流向" :visible.sync="dialogShow" width="1000px" :before-close="close">
+    <div>
+      <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="close">{{ $t('map.cancel') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getPermissonInDistribute } from '@/api/userRulesManage';
+
+export default {
+    name: 'PermissionList',
+    components: {
+    },
+    props: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            id: '',
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '140px',
+                reset: true,
+                show: false,
+                queryObject: {
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                paginationHiden: true,
+                indexShow: true,
+                columns: [
+                    {
+                        title: '主体名称',
+                        prop: 'named'
+                    },
+                    {
+                        title: this.$t('permission.nickName'),
+                        prop: 'nickName'
+                    },
+                    {
+                        title: this.$t('permission.permissionName'),
+                        prop: 'permissionName'
+                    },
+                    {
+                        title: '主体类型',
+                        prop: 'subjectType',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.subjectType, 'subTypeList'); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: '功能',
+                        prop: 'systemAbilityList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getAbilityList(row.systemAbilityList); },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('permission.isForever'),
+                        prop: 'forever',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.forever, 'Whether'); },
+                        tagType: (row) => {
+                            switch (row.forever) {
+                            case true: return 'success';
+                            case false: return 'danger';
+                            }
+                        }
+                    },
+                    {
+                        title: this.$t('permission.permissionTotal'),
+                        width: '80',
+                        prop: 'amount'
+                    },
+                    {
+                        title: this.$t('permission.permissionRemains'),
+                        width: '80',
+                        prop: 'remains'
+                    },
+                    {
+                        title:this.$t('global.startTime'),
+                        prop: 'startTime',
+                        width: '160'
+
+                    },
+                    {
+                        title: this.$t('permission.endTime'),
+                        prop: 'endTime',
+                        width: '160'
+                    },
+                    {
+                        title: this.$t('permission.permissionStatus'),
+                        prop: 'status',
+                        width: '80',
+                        type: 'tag',
+                        columnValue: (row) => { return this.$ConstSelect.translate(row.status, 'EffectiveTypeList'); },
+                        tagType: (row) => {
+                            switch (row.status) {
+                            case '1': return 'success';
+                            default: return 'danger';
+                            }
+                        }
+                    }
+
+                    // {
+                    //     type: 'button',
+                    //     title: this.$t('global.operate'),
+                    //     buttons: [
+                    //         {
+                    //             name: '权限回收',
+                    //             handleClick: this.handleRestore,
+                    //             type: 'danger',
+                    //             showControl: (row) => {
+                    //                 return row.status === '1';
+                    //             }
+                    //         }
+                    //     ]
+                    // }
+                ],
+                actions: [
+                ]
+            }
+        };
+    },
+    methods: {
+        getAbilityList(list) {
+            const arr = [];
+            list && list.forEach(item => {
+                arr.push(item.abilityName);
+            });
+            return arr;
+        },
+        doShow(index, row) {
+            if (!row.id) { return; }
+            this.id = row.id;
+            this.dialogShow = true;
+            this.reloadTable();
+        },
+        close() {
+            this.id = '';
+            this.dialogShow = false;
+        },
+        // handleRestore(index, row) {
+        //     this.$confirm('是否回收该用户的权限', this.$t('global.tips'), {
+        //         confirmButtonText: this.$t('global.confirm'),
+        //         cancelButtonText: this.$t('global.cancel'),
+        //         type: 'warning'
+        //     }).then(() => {
+        //         putUserPermissionBackUser(row.id).then(resp => {
+        //             this.reloadTable();
+        //             this.$message.success(this.$t('tip.recoveryPrivilegesSuccessful'));
+        //         }).catch(() => {
+        //             this.$messageBox(this.$t('tip.recoveryPrivilegesFailed'));
+        //         });
+        //     }).catch(() => { });
+        // },
+        queryFunction() {
+            if (this.id) {
+                return getPermissonInDistribute(this.id);
+            }
+        },
+        reloadTable() {
+            if (this.queryList && this.queryList.reload) {
+                this.queryList.reload();
+            }
+        }
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+    .draft {
+        width: 400px;
+        text-align: center;
+        margin: 20px auto;
+    }
+</style>
diff --git a/static/theoryTemplate/理论试题导入模板.xlsx b/static/theoryTemplate/理论试题导入模板.xlsx
new file mode 100644
index 000000000..e79d72545
Binary files /dev/null and b/static/theoryTemplate/理论试题导入模板.xlsx differ